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

Automatic upgrade of code by command "occt_upgrade . -tcollection"
2025-08-09 13:22:24 +03:00 · 2015-06-28 15:16:42 +03:00
parent 4f953fa991
commit df8d39700d
1424 changed files with 28413 additions and 2013 deletions
--- a/src/CDM/CDM.cdl
+++ b/src/CDM/CDM.cdl
@@ -43,25 +43,30 @@ is
    private alias NamesDirectory is DataMapOfStringInteger from TColStd;
    ---Purpose: this map will allows to get a directory object from a name.

-    private class PresentationDirectory instantiates DataMap from TCollection 
-        (ExtendedString from TCollection,
-         Document from CDM,
-         ExtendedString from TCollection);
+    imported PresentationDirectory;
+
+    imported DataMapIteratorOfPresentationDirectory;
    ---Purpose: this map will allows to get a directory object from a name.
         
    private pointer DocumentPointer to Document from CDM;
    private class Reference;    

-    private class ListOfReferences instantiates List from TCollection(Reference from CDM);
+    imported ListOfReferences;
+
+    imported ListIteratorOfListOfReferences;
    deferred class Application;
    
-    private class MetaDataLookUpTable instantiates DataMap from TCollection(ExtendedString from TCollection, MetaData from CDM, ExtendedString from TCollection);
+    imported MetaDataLookUpTable;
+    
+    imported DataMapIteratorOfMetaDataLookUpTable;
         
         
 ---Category: reusable classes

-    class DocumentHasher instantiates MapHasher from TCollection(Document from CDM);
-    class MapOfDocument instantiates Map from TCollection(Document from CDM, DocumentHasher from CDM);
-    class ListOfDocument instantiates List from TCollection(Document from CDM);
+    imported DocumentHasher;
+    imported MapOfDocument;
+    imported MapIteratorOfMapOfDocument;
+    imported ListOfDocument;
+    imported ListIteratorOfListOfDocument;

 end CDM;
--- a/src/CDM/CDM_DataMapIteratorOfMetaDataLookUpTable.hxx
+++ b/src/CDM/CDM_DataMapIteratorOfMetaDataLookUpTable.hxx
@@ -0,0 +1,8 @@
+
+
+#ifndef CDM_DataMapIteratorOfMetaDataLookUpTable_HeaderFile
+#define CDM_DataMapIteratorOfMetaDataLookUpTable_HeaderFile
+
+#include <CDM_MetaDataLookUpTable.hxx>
+
+#endif
--- a/src/CDM/CDM_DataMapIteratorOfPresentationDirectory.hxx
+++ b/src/CDM/CDM_DataMapIteratorOfPresentationDirectory.hxx
@@ -0,0 +1,8 @@
+
+
+#ifndef CDM_DataMapIteratorOfPresentationDirectory_HeaderFile
+#define CDM_DataMapIteratorOfPresentationDirectory_HeaderFile
+
+#include <CDM_PresentationDirectory.hxx>
+
+#endif
--- a/src/CDM/CDM_DocumentHasher.hxx
+++ b/src/CDM/CDM_DocumentHasher.hxx
@@ -0,0 +1,26 @@
+// Created on: 1997-05-06
+// Created by: Jean-Louis Frenkel, Remi Lequette
+// 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 CDM_DocumentHasher_HeaderFile
+#define CDM_DocumentHasher_HeaderFile
+
+#include <CDM_Document.hxx>
+#include <NCollection_DefaultHasher.hxx>
+
+typedef NCollection_DefaultHasher<Handle(CDM_Document)> CDM_DocumentHasher;
+
+
+#endif
--- a/src/CDM/CDM_ListIteratorOfListOfDocument.hxx
+++ b/src/CDM/CDM_ListIteratorOfListOfDocument.hxx
@@ -0,0 +1,8 @@
+
+
+#ifndef CDM_ListIteratorOfListOfDocument_HeaderFile
+#define CDM_ListIteratorOfListOfDocument_HeaderFile
+
+#include <CDM_ListOfDocument.hxx>
+
+#endif
--- a/src/CDM/CDM_ListIteratorOfListOfReferences.hxx
+++ b/src/CDM/CDM_ListIteratorOfListOfReferences.hxx
@@ -0,0 +1,8 @@
+
+
+#ifndef CDM_ListIteratorOfListOfReferences_HeaderFile
+#define CDM_ListIteratorOfListOfReferences_HeaderFile
+
+#include <CDM_ListOfReferences.hxx>
+
+#endif
--- a/src/CDM/CDM_ListOfDocument.hxx
+++ b/src/CDM/CDM_ListOfDocument.hxx
@@ -0,0 +1,27 @@
+// Created on: 1997-05-06
+// Created by: Jean-Louis Frenkel, Remi Lequette
+// 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 CDM_ListOfDocument_HeaderFile
+#define CDM_ListOfDocument_HeaderFile
+
+#include <CDM_Document.hxx>
+#include <NCollection_List.hxx>
+
+typedef NCollection_List<Handle(CDM_Document)> CDM_ListOfDocument;
+typedef NCollection_List<Handle(CDM_Document)>::Iterator CDM_ListIteratorOfListOfDocument;
+
+
+#endif
--- a/src/CDM/CDM_ListOfReferences.hxx
+++ b/src/CDM/CDM_ListOfReferences.hxx
@@ -0,0 +1,27 @@
+// Created on: 1997-05-06
+// Created by: Jean-Louis Frenkel, Remi Lequette
+// 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 CDM_ListOfReferences_HeaderFile
+#define CDM_ListOfReferences_HeaderFile
+
+#include <CDM_Reference.hxx>
+#include <NCollection_List.hxx>
+
+typedef NCollection_List<Handle(CDM_Reference)> CDM_ListOfReferences;
+typedef NCollection_List<Handle(CDM_Reference)>::Iterator CDM_ListIteratorOfListOfReferences;
+
+
+#endif
--- a/src/CDM/CDM_MapIteratorOfMapOfDocument.hxx
+++ b/src/CDM/CDM_MapIteratorOfMapOfDocument.hxx
@@ -0,0 +1,8 @@
+
+
+#ifndef CDM_MapIteratorOfMapOfDocument_HeaderFile
+#define CDM_MapIteratorOfMapOfDocument_HeaderFile
+
+#include <CDM_MapOfDocument.hxx>
+
+#endif
--- a/src/CDM/CDM_MapOfDocument.hxx
+++ b/src/CDM/CDM_MapOfDocument.hxx
@@ -0,0 +1,28 @@
+// Created on: 1997-05-06
+// Created by: Jean-Louis Frenkel, Remi Lequette
+// 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 CDM_MapOfDocument_HeaderFile
+#define CDM_MapOfDocument_HeaderFile
+
+#include <CDM_Document.hxx>
+#include <CDM_DocumentHasher.hxx>
+#include <NCollection_Map.hxx>
+
+typedef NCollection_Map<Handle(CDM_Document),CDM_DocumentHasher> CDM_MapOfDocument;
+typedef NCollection_Map<Handle(CDM_Document),CDM_DocumentHasher>::Iterator CDM_MapIteratorOfMapOfDocument;
+
+
+#endif
--- a/src/CDM/CDM_MetaDataLookUpTable.hxx
+++ b/src/CDM/CDM_MetaDataLookUpTable.hxx
@@ -0,0 +1,29 @@
+// Created on: 1997-05-06
+// Created by: Jean-Louis Frenkel, Remi Lequette
+// 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 CDM_MetaDataLookUpTable_HeaderFile
+#define CDM_MetaDataLookUpTable_HeaderFile
+
+#include <TCollection_ExtendedString.hxx>
+#include <CDM_MetaData.hxx>
+#include <TCollection_ExtendedString.hxx>
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<TCollection_ExtendedString,Handle(CDM_MetaData),TCollection_ExtendedString> CDM_MetaDataLookUpTable;
+typedef NCollection_DataMap<TCollection_ExtendedString,Handle(CDM_MetaData),TCollection_ExtendedString>::Iterator CDM_DataMapIteratorOfMetaDataLookUpTable;
+
+
+#endif
--- a/src/CDM/CDM_PresentationDirectory.hxx
+++ b/src/CDM/CDM_PresentationDirectory.hxx
@@ -0,0 +1,29 @@
+// Created on: 1997-05-06
+// Created by: Jean-Louis Frenkel, Remi Lequette
+// 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 CDM_PresentationDirectory_HeaderFile
+#define CDM_PresentationDirectory_HeaderFile
+
+#include <TCollection_ExtendedString.hxx>
+#include <CDM_Document.hxx>
+#include <TCollection_ExtendedString.hxx>
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<TCollection_ExtendedString,Handle(CDM_Document),TCollection_ExtendedString> CDM_PresentationDirectory;
+typedef NCollection_DataMap<TCollection_ExtendedString,Handle(CDM_Document),TCollection_ExtendedString>::Iterator CDM_DataMapIteratorOfPresentationDirectory;
+
+
+#endif
--- a/src/CDM/FILES
+++ b/src/CDM/FILES
@@ -0,0 +1,11 @@
+CDM_PresentationDirectory.hxx
+CDM_DataMapIteratorOfPresentationDirectory.hxx
+CDM_ListOfReferences.hxx
+CDM_ListIteratorOfListOfReferences.hxx
+CDM_MetaDataLookUpTable.hxx
+CDM_DataMapIteratorOfMetaDataLookUpTable.hxx
+CDM_DocumentHasher.hxx
+CDM_MapOfDocument.hxx
+CDM_MapIteratorOfMapOfDocument.hxx
+CDM_ListOfDocument.hxx
+CDM_ListIteratorOfListOfDocument.hxx