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

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

src/TColGeom/FILES

@@ -0,0 +1,16 @@
+TColGeom_Array1OfCurve.hxx
+TColGeom_Array1OfBezierCurve.hxx
+TColGeom_Array1OfBSplineCurve.hxx
+TColGeom_Array1OfSurface.hxx
+TColGeom_HArray1OfCurve.hxx
+TColGeom_HArray1OfBezierCurve.hxx
+TColGeom_HArray1OfBSplineCurve.hxx
+TColGeom_HArray1OfSurface.hxx
+TColGeom_Array2OfSurface.hxx
+TColGeom_Array2OfBezierSurface.hxx
+TColGeom_HArray2OfSurface.hxx
+TColGeom_SequenceOfCurve.hxx
+TColGeom_SequenceOfBoundedCurve.hxx
+TColGeom_SequenceOfSurface.hxx
+TColGeom_HSequenceOfCurve.hxx
+TColGeom_HSequenceOfBoundedCurve.hxx

src/TColGeom/TColGeom.cdl

@@ -26,49 +26,26 @@ is
 
 
 
-    class Array1OfCurve 
-    	instantiates Array1 from TCollection (Curve from Geom);
-    class Array1OfBezierCurve 
-    	instantiates Array1 from TCollection (BezierCurve from Geom);
-    class Array1OfBSplineCurve 
-    	instantiates Array1 from TCollection (BSplineCurve from Geom);
-    class Array1OfSurface 
-    	instantiates Array1 from TCollection (Surface from Geom);
+    imported Array1OfCurve;
+    imported Array1OfBezierCurve;
+    imported Array1OfBSplineCurve;
+    imported Array1OfSurface;
 
-    class HArray1OfCurve
-    	instantiates HArray1 from TCollection (Curve from Geom,
-    	    	    	    	Array1OfCurve from TColGeom);
-    class HArray1OfBezierCurve  
-    	instantiates HArray1 from TCollection (BezierCurve from Geom,
-    	    	    	    	Array1OfBezierCurve from TColGeom);
-    class HArray1OfBSplineCurve 
-    	instantiates HArray1 from TCollection (BSplineCurve from Geom,
-    	    	    	    	Array1OfBSplineCurve from TColGeom);
-    class HArray1OfSurface  
-    	instantiates HArray1 from TCollection (Surface from Geom,
-    	    	    	    	Array1OfSurface from TColGeom);
+    imported transient class HArray1OfCurve;
+    imported transient class HArray1OfBezierCurve;
+    imported transient class HArray1OfBSplineCurve;
+    imported transient class HArray1OfSurface;
 
-    class Array2OfSurface 
-    	instantiates Array2 from TCollection (Surface from Geom);
-    class Array2OfBezierSurface 
-    	instantiates Array2 from TCollection (BezierSurface from Geom);
+    imported Array2OfSurface;
+    imported Array2OfBezierSurface;
 
-    class HArray2OfSurface        
-    	instantiates HArray2 from TCollection (Surface from Geom,
-    	    	    	    	Array2OfSurface from TColGeom);
+    imported transient class HArray2OfSurface;
 
-    class SequenceOfCurve  
-    	instantiates Sequence from TCollection (Curve from Geom);
-    class SequenceOfBoundedCurve  
-    	instantiates Sequence from TCollection (BoundedCurve from Geom);
-    class SequenceOfSurface 
-    	instantiates Sequence from TCollection (Surface from Geom);
+    imported SequenceOfCurve;
+    imported SequenceOfBoundedCurve;
+    imported SequenceOfSurface;
 
-    class HSequenceOfCurve  
-    	instantiates HSequence from TCollection (Curve from Geom,
-    	    	    	    	SequenceOfCurve from TColGeom);
-    class HSequenceOfBoundedCurve  
-    	instantiates HSequence from TCollection (BoundedCurve from Geom,
-    	    	    	    	SequenceOfBoundedCurve from TColGeom);
+    imported transient class HSequenceOfCurve;
+    imported transient class HSequenceOfBoundedCurve;
 
 end TColGeom;

src/TColGeom/TColGeom_Array1OfBSplineCurve.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_Array1OfBSplineCurve_HeaderFile
+#define TColGeom_Array1OfBSplineCurve_HeaderFile
+
+#include <Geom_BSplineCurve.hxx>
+#include <NCollection_Array1.hxx>
+
+typedef NCollection_Array1<Handle(Geom_BSplineCurve)> TColGeom_Array1OfBSplineCurve;
+
+
+#endif

src/TColGeom/TColGeom_Array1OfBezierCurve.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_Array1OfBezierCurve_HeaderFile
+#define TColGeom_Array1OfBezierCurve_HeaderFile
+
+#include <Geom_BezierCurve.hxx>
+#include <NCollection_Array1.hxx>
+
+typedef NCollection_Array1<Handle(Geom_BezierCurve)> TColGeom_Array1OfBezierCurve;
+
+
+#endif

src/TColGeom/TColGeom_Array1OfCurve.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_Array1OfCurve_HeaderFile
+#define TColGeom_Array1OfCurve_HeaderFile
+
+#include <Geom_Curve.hxx>
+#include <NCollection_Array1.hxx>
+
+typedef NCollection_Array1<Handle(Geom_Curve)> TColGeom_Array1OfCurve;
+
+
+#endif

src/TColGeom/TColGeom_Array1OfSurface.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_Array1OfSurface_HeaderFile
+#define TColGeom_Array1OfSurface_HeaderFile
+
+#include <Geom_Surface.hxx>
+#include <NCollection_Array1.hxx>
+
+typedef NCollection_Array1<Handle(Geom_Surface)> TColGeom_Array1OfSurface;
+
+
+#endif

src/TColGeom/TColGeom_Array2OfBezierSurface.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_Array2OfBezierSurface_HeaderFile
+#define TColGeom_Array2OfBezierSurface_HeaderFile
+
+#include <Geom_BezierSurface.hxx>
+#include <NCollection_Array2.hxx>
+
+typedef NCollection_Array2<Handle(Geom_BezierSurface)> TColGeom_Array2OfBezierSurface;
+
+
+#endif

src/TColGeom/TColGeom_Array2OfSurface.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_Array2OfSurface_HeaderFile
+#define TColGeom_Array2OfSurface_HeaderFile
+
+#include <Geom_Surface.hxx>
+#include <NCollection_Array2.hxx>
+
+typedef NCollection_Array2<Handle(Geom_Surface)> TColGeom_Array2OfSurface;
+
+
+#endif

src/TColGeom/TColGeom_HArray1OfBSplineCurve.hxx

@@ -0,0 +1,27 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_HArray1OfBSplineCurve_HeaderFile
+#define TColGeom_HArray1OfBSplineCurve_HeaderFile
+
+#include <Geom_BSplineCurve.hxx>
+#include <TColGeom_Array1OfBSplineCurve.hxx>
+#include <NCollection_DefineHArray1.hxx>
+
+DEFINE_HARRAY1(TColGeom_HArray1OfBSplineCurve, TColGeom_Array1OfBSplineCurve)
+
+
+#endif

src/TColGeom/TColGeom_HArray1OfBezierCurve.hxx

@@ -0,0 +1,27 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_HArray1OfBezierCurve_HeaderFile
+#define TColGeom_HArray1OfBezierCurve_HeaderFile
+
+#include <Geom_BezierCurve.hxx>
+#include <TColGeom_Array1OfBezierCurve.hxx>
+#include <NCollection_DefineHArray1.hxx>
+
+DEFINE_HARRAY1(TColGeom_HArray1OfBezierCurve, TColGeom_Array1OfBezierCurve)
+
+
+#endif

src/TColGeom/TColGeom_HArray1OfCurve.hxx

@@ -0,0 +1,27 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_HArray1OfCurve_HeaderFile
+#define TColGeom_HArray1OfCurve_HeaderFile
+
+#include <Geom_Curve.hxx>
+#include <TColGeom_Array1OfCurve.hxx>
+#include <NCollection_DefineHArray1.hxx>
+
+DEFINE_HARRAY1(TColGeom_HArray1OfCurve, TColGeom_Array1OfCurve)
+
+
+#endif

src/TColGeom/TColGeom_HArray1OfSurface.hxx

@@ -0,0 +1,27 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_HArray1OfSurface_HeaderFile
+#define TColGeom_HArray1OfSurface_HeaderFile
+
+#include <Geom_Surface.hxx>
+#include <TColGeom_Array1OfSurface.hxx>
+#include <NCollection_DefineHArray1.hxx>
+
+DEFINE_HARRAY1(TColGeom_HArray1OfSurface, TColGeom_Array1OfSurface)
+
+
+#endif

src/TColGeom/TColGeom_HArray2OfSurface.hxx

@@ -0,0 +1,27 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_HArray2OfSurface_HeaderFile
+#define TColGeom_HArray2OfSurface_HeaderFile
+
+#include <Geom_Surface.hxx>
+#include <TColGeom_Array2OfSurface.hxx>
+#include <NCollection_DefineHArray2.hxx>
+
+DEFINE_HARRAY2(TColGeom_HArray2OfSurface, TColGeom_Array2OfSurface)
+
+
+#endif

src/TColGeom/TColGeom_HSequenceOfBoundedCurve.hxx

@@ -0,0 +1,27 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_HSequenceOfBoundedCurve_HeaderFile
+#define TColGeom_HSequenceOfBoundedCurve_HeaderFile
+
+#include <Geom_BoundedCurve.hxx>
+#include <TColGeom_SequenceOfBoundedCurve.hxx>
+#include <NCollection_DefineHSequence.hxx>
+
+DEFINE_HSEQUENCE(TColGeom_HSequenceOfBoundedCurve, TColGeom_SequenceOfBoundedCurve)
+
+
+#endif

src/TColGeom/TColGeom_HSequenceOfCurve.hxx

@@ -0,0 +1,27 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_HSequenceOfCurve_HeaderFile
+#define TColGeom_HSequenceOfCurve_HeaderFile
+
+#include <Geom_Curve.hxx>
+#include <TColGeom_SequenceOfCurve.hxx>
+#include <NCollection_DefineHSequence.hxx>
+
+DEFINE_HSEQUENCE(TColGeom_HSequenceOfCurve, TColGeom_SequenceOfCurve)
+
+
+#endif

src/TColGeom/TColGeom_SequenceOfBoundedCurve.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_SequenceOfBoundedCurve_HeaderFile
+#define TColGeom_SequenceOfBoundedCurve_HeaderFile
+
+#include <Geom_BoundedCurve.hxx>
+#include <NCollection_Sequence.hxx>
+
+typedef NCollection_Sequence<Handle(Geom_BoundedCurve)> TColGeom_SequenceOfBoundedCurve;
+
+
+#endif

src/TColGeom/TColGeom_SequenceOfCurve.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_SequenceOfCurve_HeaderFile
+#define TColGeom_SequenceOfCurve_HeaderFile
+
+#include <Geom_Curve.hxx>
+#include <NCollection_Sequence.hxx>
+
+typedef NCollection_Sequence<Handle(Geom_Curve)> TColGeom_SequenceOfCurve;
+
+
+#endif

src/TColGeom/TColGeom_SequenceOfSurface.hxx

@@ -0,0 +1,26 @@
+// Created on: 1993-03-09
+// Created by: Philippe DAUTRY
+// Copyright (c) 1993-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 TColGeom_SequenceOfSurface_HeaderFile
+#define TColGeom_SequenceOfSurface_HeaderFile
+
+#include <Geom_Surface.hxx>
+#include <NCollection_Sequence.hxx>
+
+typedef NCollection_Sequence<Handle(Geom_Surface)> TColGeom_SequenceOfSurface;
+
+
+#endif