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

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

src/DNaming/DNaming.cdl

@@ -59,10 +59,9 @@ is
      
     class  Line3DDriver;
     
-    class DataMapOfShapeOfName instantiates
-    	DataMap from TCollection(Shape          from TopoDS,
-	    	    	    	 AsciiString    from TCollection,
-                                 ShapeMapHasher from TopTools);  	 
+    imported DataMapOfShapeOfName;
+    
+    imported DataMapIteratorOfDataMapOfShapeOfName;  	 
 				  
 
     GetReal  (theFunction : Function from TFunction; thePosition : Integer from Standard) 

src/DNaming/DNaming_DataMapIteratorOfDataMapOfShapeOfName.hxx

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

src/DNaming/DNaming_DataMapOfShapeOfName.hxx

@@ -0,0 +1,29 @@
+// Created on: 1997-01-08
+// Created by: VAUTHIER Jean-Claude
+// Copyright (c) 1997-1999 Matra Datavision
+// Copyright (c) 1999-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 DNaming_DataMapOfShapeOfName_HeaderFile
+#define DNaming_DataMapOfShapeOfName_HeaderFile
+
+#include <TopoDS_Shape.hxx>
+#include <TCollection_AsciiString.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<TopoDS_Shape,TCollection_AsciiString,TopTools_ShapeMapHasher> DNaming_DataMapOfShapeOfName;
+typedef NCollection_DataMap<TopoDS_Shape,TCollection_AsciiString,TopTools_ShapeMapHasher>::Iterator DNaming_DataMapIteratorOfDataMapOfShapeOfName;
+
+
+#endif

src/DNaming/FILES

@@ -4,3 +4,5 @@ DNaming_SelectionCommands.cxx
 DNaming_ModelingCommands.cxx
 DNaming_Selection.tcl
 ModelDefinitions.hxx
+DNaming_DataMapOfShapeOfName.hxx
+DNaming_DataMapIteratorOfDataMapOfShapeOfName.hxx