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

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

src/HLRAlgo/FILES

@@ -0,0 +1,12 @@
+HLRAlgo_ListOfBPoint.hxx
+HLRAlgo_ListIteratorOfListOfBPoint.hxx
+HLRAlgo_Array1OfPHDat.hxx
+HLRAlgo_HArray1OfPHDat.hxx
+HLRAlgo_Array1OfPISeg.hxx
+HLRAlgo_HArray1OfPISeg.hxx
+HLRAlgo_Array1OfPINod.hxx
+HLRAlgo_HArray1OfPINod.hxx
+HLRAlgo_Array1OfTData.hxx
+HLRAlgo_HArray1OfTData.hxx
+HLRAlgo_InterferenceList.hxx
+HLRAlgo_ListIteratorOfInterferenceList.hxx

src/HLRAlgo/HLRAlgo.cdl

@@ -57,8 +57,9 @@ uses
 is
     class BiPoint;
     
-    class ListOfBPoint             instantiates List         from TCollection
-    	(BiPoint from HLRAlgo);
+    imported ListOfBPoint;
+    
+    imported ListIteratorOfListOfBPoint;
 
     class PolyShellData;
 
@@ -74,33 +75,21 @@ is
 
     class TriangleData;
 
-    class Array1OfPHDat            instantiates Array1       from TCollection
-    	(PolyHidingData from HLRAlgo);
+    imported Array1OfPHDat;
 	
-    class HArray1OfPHDat           instantiates HArray1      from TCollection
-    	(PolyHidingData from HLRAlgo,
-         Array1OfPHDat  from HLRAlgo);
+    imported transient class HArray1OfPHDat;
 	
-    class Array1OfPISeg            instantiates Array1       from TCollection
-    	(PolyInternalSegment from HLRAlgo);
+    imported Array1OfPISeg;
 	
-    class HArray1OfPISeg           instantiates HArray1      from TCollection
-    	(PolyInternalSegment from HLRAlgo,
-         Array1OfPISeg       from HLRAlgo);
+    imported transient class HArray1OfPISeg;
 	
-    class Array1OfPINod            instantiates Array1       from TCollection
-    	(PolyInternalNode from HLRAlgo);
+    imported Array1OfPINod;
 	
-    class HArray1OfPINod           instantiates HArray1      from TCollection
-    	(PolyInternalNode from HLRAlgo,
-         Array1OfPINod    from HLRAlgo);
+    imported transient class HArray1OfPINod;
 	
-    class Array1OfTData            instantiates Array1       from TCollection
-    	(TriangleData from HLRAlgo);
+    imported Array1OfTData;
 	
-    class HArray1OfTData           instantiates HArray1      from TCollection
-    	(TriangleData  from HLRAlgo,
-         Array1OfTData from HLRAlgo);
+    imported transient class HArray1OfTData;
 	
     class PolyAlgo;
 
@@ -116,8 +105,9 @@ is
     	(Intersection from HLRAlgo, 
 	 Coincidence  from HLRAlgo);
 
-    class InterferenceList         instantiates List         from TCollection
-    	(Interference from HLRAlgo);
+    imported InterferenceList;
+
+    imported ListIteratorOfInterferenceList;
 	
     class EdgesBlock;
 

src/HLRAlgo/HLRAlgo_Array1OfPHDat.hxx

@@ -0,0 +1,26 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_Array1OfPHDat_HeaderFile
+#define HLRAlgo_Array1OfPHDat_HeaderFile
+
+#include <HLRAlgo_PolyHidingData.hxx>
+#include <NCollection_Array1.hxx>
+
+typedef NCollection_Array1<HLRAlgo_PolyHidingData> HLRAlgo_Array1OfPHDat;
+
+
+#endif

src/HLRAlgo/HLRAlgo_Array1OfPINod.hxx

@@ -0,0 +1,26 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_Array1OfPINod_HeaderFile
+#define HLRAlgo_Array1OfPINod_HeaderFile
+
+#include <HLRAlgo_PolyInternalNode.hxx>
+#include <NCollection_Array1.hxx>
+
+typedef NCollection_Array1<Handle(HLRAlgo_PolyInternalNode)> HLRAlgo_Array1OfPINod;
+
+
+#endif

src/HLRAlgo/HLRAlgo_Array1OfPISeg.hxx

@@ -0,0 +1,26 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_Array1OfPISeg_HeaderFile
+#define HLRAlgo_Array1OfPISeg_HeaderFile
+
+#include <HLRAlgo_PolyInternalSegment.hxx>
+#include <NCollection_Array1.hxx>
+
+typedef NCollection_Array1<HLRAlgo_PolyInternalSegment> HLRAlgo_Array1OfPISeg;
+
+
+#endif

src/HLRAlgo/HLRAlgo_Array1OfTData.hxx

@@ -0,0 +1,26 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_Array1OfTData_HeaderFile
+#define HLRAlgo_Array1OfTData_HeaderFile
+
+#include <HLRAlgo_TriangleData.hxx>
+#include <NCollection_Array1.hxx>
+
+typedef NCollection_Array1<HLRAlgo_TriangleData> HLRAlgo_Array1OfTData;
+
+
+#endif

src/HLRAlgo/HLRAlgo_HArray1OfPHDat.hxx

@@ -0,0 +1,27 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_HArray1OfPHDat_HeaderFile
+#define HLRAlgo_HArray1OfPHDat_HeaderFile
+
+#include <HLRAlgo_PolyHidingData.hxx>
+#include <HLRAlgo_Array1OfPHDat.hxx>
+#include <NCollection_DefineHArray1.hxx>
+
+DEFINE_HARRAY1(HLRAlgo_HArray1OfPHDat, HLRAlgo_Array1OfPHDat)
+
+
+#endif

src/HLRAlgo/HLRAlgo_HArray1OfPINod.hxx

@@ -0,0 +1,27 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_HArray1OfPINod_HeaderFile
+#define HLRAlgo_HArray1OfPINod_HeaderFile
+
+#include <HLRAlgo_PolyInternalNode.hxx>
+#include <HLRAlgo_Array1OfPINod.hxx>
+#include <NCollection_DefineHArray1.hxx>
+
+DEFINE_HARRAY1(HLRAlgo_HArray1OfPINod, HLRAlgo_Array1OfPINod)
+
+
+#endif

src/HLRAlgo/HLRAlgo_HArray1OfPISeg.hxx

@@ -0,0 +1,27 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_HArray1OfPISeg_HeaderFile
+#define HLRAlgo_HArray1OfPISeg_HeaderFile
+
+#include <HLRAlgo_PolyInternalSegment.hxx>
+#include <HLRAlgo_Array1OfPISeg.hxx>
+#include <NCollection_DefineHArray1.hxx>
+
+DEFINE_HARRAY1(HLRAlgo_HArray1OfPISeg, HLRAlgo_Array1OfPISeg)
+
+
+#endif

src/HLRAlgo/HLRAlgo_HArray1OfTData.hxx

@@ -0,0 +1,27 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_HArray1OfTData_HeaderFile
+#define HLRAlgo_HArray1OfTData_HeaderFile
+
+#include <HLRAlgo_TriangleData.hxx>
+#include <HLRAlgo_Array1OfTData.hxx>
+#include <NCollection_DefineHArray1.hxx>
+
+DEFINE_HARRAY1(HLRAlgo_HArray1OfTData, HLRAlgo_Array1OfTData)
+
+
+#endif

src/HLRAlgo/HLRAlgo_InterferenceList.hxx

@@ -0,0 +1,27 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_InterferenceList_HeaderFile
+#define HLRAlgo_InterferenceList_HeaderFile
+
+#include <HLRAlgo_Interference.hxx>
+#include <NCollection_List.hxx>
+
+typedef NCollection_List<HLRAlgo_Interference> HLRAlgo_InterferenceList;
+typedef NCollection_List<HLRAlgo_Interference>::Iterator HLRAlgo_ListIteratorOfInterferenceList;
+
+
+#endif

src/HLRAlgo/HLRAlgo_ListIteratorOfInterferenceList.hxx

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

src/HLRAlgo/HLRAlgo_ListIteratorOfListOfBPoint.hxx

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

src/HLRAlgo/HLRAlgo_ListOfBPoint.hxx

@@ -0,0 +1,27 @@
+// Created on: 1992-02-18
+// Created by: Christophe MARION
+// Copyright (c) 1992-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 HLRAlgo_ListOfBPoint_HeaderFile
+#define HLRAlgo_ListOfBPoint_HeaderFile
+
+#include <HLRAlgo_BiPoint.hxx>
+#include <NCollection_List.hxx>
+
+typedef NCollection_List<HLRAlgo_BiPoint> HLRAlgo_ListOfBPoint;
+typedef NCollection_List<HLRAlgo_BiPoint>::Iterator HLRAlgo_ListIteratorOfListOfBPoint;
+
+
+#endif