0024750: Replace instantiations of TCollection generic classes by NCollection templat...

[occt.git] / src / MAT2d / MAT2d.cdl

diff --git a/src/MAT2d/MAT2d.cdl b/src/MAT2d/MAT2d.cdl
index 71ec72c..a317e96 100644 (file)
--- a/src/MAT2d/MAT2d.cdl
+++ b/src/MAT2d/MAT2d.cdl
@@ -47,57 +47,47 @@ is
 
     class CutCurve;   
 
-    class SequenceOfConnexion instantiates Sequence  from TCollection
-                                                    (Connexion from  MAT2d); 
+    imported SequenceOfConnexion; 
 
-    class DataMapOfIntegerSequenceOfConnexion instantiates DataMap 
-                   from TCollection (Integer              from Standard,
-                                    SequenceOfConnexion  from MAT2d,
-                                    MapIntegerHasher     from TColStd);
+    imported DataMapOfIntegerSequenceOfConnexion;
+
+    imported DataMapIteratorOfDataMapOfIntegerSequenceOfConnexion;
                                          
-    class Array2OfConnexion  instantiates Array2 from TCollection
-                                                    (Connexion from  MAT2d); 
+    imported Array2OfConnexion; 
+               
+
+    imported DataMapOfIntegerBisec;
                
 
-    class DataMapOfIntegerBisec  instantiates DataMap from TCollection 
-                                          (Integer          from Standard,
-                                           Bisec            from Bisector,
-                                           MapIntegerHasher from TColStd); 
+    imported DataMapIteratorOfDataMapOfIntegerBisec; 
+                                           
+    imported DataMapOfIntegerPnt2d;
                                            
-    class DataMapOfIntegerPnt2d  instantiates DataMap from TCollection 
-                                          (Integer          from Standard,
-                                           Pnt2d            from gp,
-                                           MapIntegerHasher from TColStd);  
+    imported DataMapIteratorOfDataMapOfIntegerPnt2d;  
            
-    class DataMapOfIntegerVec2d  instantiates DataMap from TCollection 
-                                          (Integer          from Standard,
-                                           Vec2d            from gp,
-                                           MapIntegerHasher from TColStd); 
+    imported DataMapOfIntegerVec2d;
+           
+    imported DataMapIteratorOfDataMapOfIntegerVec2d; 
 
-    class SequenceOfSequenceOfCurve  instantiates Sequence from TCollection 
-                                           (SequenceOfCurve from TColGeom2d); 
+    imported SequenceOfSequenceOfCurve; 
                                            
-    class SequenceOfSequenceOfGeometry instantiates Sequence from TCollection
-                                       (SequenceOfGeometry from  TColGeom2d); 
+    imported SequenceOfSequenceOfGeometry; 
+
+    imported DataMapOfIntegerConnexion;
 
-    class DataMapOfIntegerConnexion instantiates DataMap from TCollection 
-                                          (Integer          from Standard,
-                                           Connexion        from MAT2d,
-                                           MapIntegerHasher from TColStd);
+    imported DataMapIteratorOfDataMapOfIntegerConnexion;
 
     class BiInt;
        
     class MapBiIntHasher;
     
-    class DataMapOfBiIntSequenceOfInteger instantiates DataMap 
-         from TCollection (BiInt               from MAT2d,
-                          SequenceOfInteger   from TColStd,
-                          MapBiIntHasher      from MAT2d);
+    imported DataMapOfBiIntSequenceOfInteger;
+    
+    imported DataMapIteratorOfDataMapOfBiIntSequenceOfInteger;
+        
+    imported DataMapOfBiIntInteger;
         
-    class DataMapOfBiIntInteger instantiates DataMap 
-         from TCollection (BiInt               from MAT2d,
-                          Integer             from Standard,
-                          MapBiIntHasher      from MAT2d);
+    imported DataMapIteratorOfDataMapOfBiIntInteger;
 end MAT2d;