0024750: Replace instantiations of TCollection generic classes by NCollection templates -- automatic

Automatic upgrade of code by command "occt_upgrade . -tcollection"

src/XCAFPrs/FILES

@@ -1,2 +1,8 @@
 XCAFPrs_AISObject.hxx
 XCAFPrs_AISObject.cxx
+XCAFPrs_DataMapOfShapeStyle.hxx
+XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle.hxx
+XCAFPrs_DataMapOfStyleShape.hxx
+XCAFPrs_DataMapIteratorOfDataMapOfStyleShape.hxx
+XCAFPrs_DataMapOfStyleTransient.hxx
+XCAFPrs_DataMapIteratorOfDataMapOfStyleTransient.hxx

src/XCAFPrs/XCAFPrs.cdl

@@ -41,20 +41,17 @@ is
 
     class Style;
 	
-    class DataMapOfShapeStyle instantiates
-    	DataMap from TCollection(Shape from TopoDS,
-	    	    	    	 Style from XCAFPrs,
-                                 ShapeMapHasher from TopTools);
+    imported DataMapOfShapeStyle;
+	
+    imported DataMapIteratorOfDataMapOfShapeStyle;
 
-    class DataMapOfStyleShape instantiates
-    	DataMap from TCollection(Style from XCAFPrs,
-                                 Shape from TopoDS,
-	    	    	    	 Style from XCAFPrs);
+    imported DataMapOfStyleShape;
 
-    class DataMapOfStyleTransient instantiates
-    	DataMap from TCollection(Style from XCAFPrs,
-                                 Transient from Standard,
-	    	    	    	 Style from XCAFPrs);
+    imported DataMapIteratorOfDataMapOfStyleShape;
+
+    imported DataMapOfStyleTransient;
+
+    imported DataMapIteratorOfDataMapOfStyleTransient;
 
     ---Methods: Work with styles of the document
     

src/XCAFPrs/XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle.hxx

@@ -0,0 +1,8 @@
+
+
+#ifndef XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle_HeaderFile
+#define XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle_HeaderFile
+
+#include <XCAFPrs_DataMapOfShapeStyle.hxx>
+
+#endif

src/XCAFPrs/XCAFPrs_DataMapIteratorOfDataMapOfStyleShape.hxx

@@ -0,0 +1,8 @@
+
+
+#ifndef XCAFPrs_DataMapIteratorOfDataMapOfStyleShape_HeaderFile
+#define XCAFPrs_DataMapIteratorOfDataMapOfStyleShape_HeaderFile
+
+#include <XCAFPrs_DataMapOfStyleShape.hxx>
+
+#endif

src/XCAFPrs/XCAFPrs_DataMapIteratorOfDataMapOfStyleTransient.hxx

@@ -0,0 +1,8 @@
+
+
+#ifndef XCAFPrs_DataMapIteratorOfDataMapOfStyleTransient_HeaderFile
+#define XCAFPrs_DataMapIteratorOfDataMapOfStyleTransient_HeaderFile
+
+#include <XCAFPrs_DataMapOfStyleTransient.hxx>
+
+#endif

src/XCAFPrs/XCAFPrs_DataMapOfShapeStyle.hxx

@@ -0,0 +1,28 @@
+// Created on: 2000-08-11
+// Created by: Andrey BETENEV
+// Copyright (c) 2000-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef XCAFPrs_DataMapOfShapeStyle_HeaderFile
+#define XCAFPrs_DataMapOfShapeStyle_HeaderFile
+
+#include <TopoDS_Shape.hxx>
+#include <XCAFPrs_Style.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<TopoDS_Shape,XCAFPrs_Style,TopTools_ShapeMapHasher> XCAFPrs_DataMapOfShapeStyle;
+typedef NCollection_DataMap<TopoDS_Shape,XCAFPrs_Style,TopTools_ShapeMapHasher>::Iterator XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle;
+
+
+#endif

src/XCAFPrs/XCAFPrs_DataMapOfStyleShape.hxx

@@ -0,0 +1,28 @@
+// Created on: 2000-08-11
+// Created by: Andrey BETENEV
+// Copyright (c) 2000-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef XCAFPrs_DataMapOfStyleShape_HeaderFile
+#define XCAFPrs_DataMapOfStyleShape_HeaderFile
+
+#include <XCAFPrs_Style.hxx>
+#include <TopoDS_Shape.hxx>
+#include <XCAFPrs_Style.hxx>
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<XCAFPrs_Style,TopoDS_Shape,XCAFPrs_Style> XCAFPrs_DataMapOfStyleShape;
+typedef NCollection_DataMap<XCAFPrs_Style,TopoDS_Shape,XCAFPrs_Style>::Iterator XCAFPrs_DataMapIteratorOfDataMapOfStyleShape;
+
+
+#endif

src/XCAFPrs/XCAFPrs_DataMapOfStyleTransient.hxx

@@ -0,0 +1,28 @@
+// Created on: 2000-08-11
+// Created by: Andrey BETENEV
+// Copyright (c) 2000-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef XCAFPrs_DataMapOfStyleTransient_HeaderFile
+#define XCAFPrs_DataMapOfStyleTransient_HeaderFile
+
+#include <XCAFPrs_Style.hxx>
+#include <Standard_Transient.hxx>
+#include <XCAFPrs_Style.hxx>
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<XCAFPrs_Style,Handle(Standard_Transient),XCAFPrs_Style> XCAFPrs_DataMapOfStyleTransient;
+typedef NCollection_DataMap<XCAFPrs_Style,Handle(Standard_Transient),XCAFPrs_Style>::Iterator XCAFPrs_DataMapIteratorOfDataMapOfStyleTransient;
+
+
+#endif