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

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

src/FEmTool/FEmTool.cdl

@@ -48,22 +48,19 @@ is
     --           which gives Index  of Freedom's degree in the
     --           assembly problem.
    
-    class  AssemblyTable
-    instantiates Array2 from TCollection (HArray1OfInteger from  TColStd);     
-    class  HAssemblyTable   
-    instantiates HArray2 from TCollection (HArray1OfInteger from  TColStd,
-    	    	    	                   AssemblyTable  from  FEmTool); 
+    imported AssemblyTable;     
+    imported transient class HAssemblyTable; 
 					    
     ---Purpose:  To  define  list  of  segments with  non-zero  coefficients   
     --           of constraint 
         
-    class  ListOfVectors  
-    instantiates  List  from  TCollection  (HArray1OfReal  from  TColStd); 
+    imported ListOfVectors;
+        
+    imported ListIteratorOfListOfVectors; 
 
     ---Purpose:  To  define  sequence  of  constraints 
     
-    class  SeqOfLinConstr  
-    instantiates  Sequence  from  TCollection  (ListOfVectors  from  FEmTool); 
+    imported SeqOfLinConstr; 
       
      
 end FEmTool;

src/FEmTool/FEmTool_AssemblyTable.hxx

@@ -0,0 +1,26 @@
+// Created on: 1997-10-29
+// Created by: Roman BORISOV
+// 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 FEmTool_AssemblyTable_HeaderFile
+#define FEmTool_AssemblyTable_HeaderFile
+
+#include <TColStd_HArray1OfInteger.hxx>
+#include <NCollection_Array2.hxx>
+
+typedef NCollection_Array2<Handle(TColStd_HArray1OfInteger)> FEmTool_AssemblyTable;
+
+
+#endif

src/FEmTool/FEmTool_HAssemblyTable.hxx

@@ -0,0 +1,27 @@
+// Created on: 1997-10-29
+// Created by: Roman BORISOV
+// 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 FEmTool_HAssemblyTable_HeaderFile
+#define FEmTool_HAssemblyTable_HeaderFile
+
+#include <TColStd_HArray1OfInteger.hxx>
+#include <FEmTool_AssemblyTable.hxx>
+#include <NCollection_DefineHArray2.hxx>
+
+DEFINE_HARRAY2(FEmTool_HAssemblyTable, FEmTool_AssemblyTable)
+
+
+#endif

src/FEmTool/FEmTool_ListIteratorOfListOfVectors.hxx

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

src/FEmTool/FEmTool_ListOfVectors.hxx

@@ -0,0 +1,27 @@
+// Created on: 1997-10-29
+// Created by: Roman BORISOV
+// 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 FEmTool_ListOfVectors_HeaderFile
+#define FEmTool_ListOfVectors_HeaderFile
+
+#include <TColStd_HArray1OfReal.hxx>
+#include <NCollection_List.hxx>
+
+typedef NCollection_List<Handle(TColStd_HArray1OfReal)> FEmTool_ListOfVectors;
+typedef NCollection_List<Handle(TColStd_HArray1OfReal)>::Iterator FEmTool_ListIteratorOfListOfVectors;
+
+
+#endif

src/FEmTool/FEmTool_SeqOfLinConstr.hxx

@@ -0,0 +1,26 @@
+// Created on: 1997-10-29
+// Created by: Roman BORISOV
+// 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 FEmTool_SeqOfLinConstr_HeaderFile
+#define FEmTool_SeqOfLinConstr_HeaderFile
+
+#include <FEmTool_ListOfVectors.hxx>
+#include <NCollection_Sequence.hxx>
+
+typedef NCollection_Sequence<FEmTool_ListOfVectors> FEmTool_SeqOfLinConstr;
+
+
+#endif

src/FEmTool/FILES

@@ -0,0 +1,5 @@
+FEmTool_AssemblyTable.hxx
+FEmTool_HAssemblyTable.hxx
+FEmTool_ListOfVectors.hxx
+FEmTool_ListIteratorOfListOfVectors.hxx
+FEmTool_SeqOfLinConstr.hxx