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

Forward declaration of TCollection instances as classes are replaced by inclusion of corresponding header.
Cyclic dependencies between declaration of collection class and its item are resolved by forward declaring a class in collection header.

diff --git a/src/AIS/AIS.cdl b/src/AIS/AIS.cdl
index 9d14a7482ed2510985ac5c9053237fc81198020e..025f604f430eb5e139eca0b9e4208483c63f4119 100644 (file)
--- a/src/AIS/AIS.cdl
+++ b/src/AIS/AIS.cdl
@@ -334,9 +334,9 @@ is
                             
     class LocalContext;    
 
-    private class LocalStatus;
+    class LocalStatus;
 
-    private class GlobalStatus;
+    class GlobalStatus;
  
     deferred class InteractiveObject;
 

diff --git a/src/AIS/AIS_GlobalStatus.cdl b/src/AIS/AIS_GlobalStatus.cdl
index c36e6b351c4bb1a024a9480855f173b6291f703e..d4c6e7ece4c1ab7b19dfb8879c54788c78f44f6b 100644 (file)
--- a/src/AIS/AIS_GlobalStatus.cdl
+++ b/src/AIS/AIS_GlobalStatus.cdl
@@ -14,7 +14,7 @@
 -- Alternatively, this file may be used under the terms of Open CASCADE
 -- commercial license or contractual agreement.
 
-private class GlobalStatus from AIS inherits TShared from MMgt
+class GlobalStatus from AIS inherits TShared from MMgt
 
        ---Purpose: Stores  information  about objects in graphic context:
        --          - Status Of Display : in the main viewer 

diff --git a/src/AIS/AIS_LocalContext.cdl b/src/AIS/AIS_LocalContext.cdl
index 5a9b10424fd57e55980c38bfd2bcff83e521f478..6462590514c0fed66bdefbfd7671d12366103591 100644 (file)
--- a/src/AIS/AIS_LocalContext.cdl
+++ b/src/AIS/AIS_LocalContext.cdl
@@ -476,10 +476,10 @@ is
                             ---Category: INTERNAL METHODS;
 
 
-    Status(me) returns AsciiString from TCollection is private;
+    Status(me) returns AsciiString from TCollection;
     
     Status(me;anObject : InteractiveObject from AIS)
-    returns any LocalStatus from AIS is private;
+    returns any LocalStatus from AIS;
     ---C++: return const&
 
 
@@ -593,10 +593,6 @@ fields
     -- This variable is used by following functions:
     -- InitDetected(), MoreDetected(), NextDetected(), DetectedCurrentShape(), DetectedCurrentObject().
     
-friends 
-
-    KeepTemporary from  InteractiveContext from AIS(me:mutable;anIObj:InteractiveObject from AIS;WhichMode  :  Integer  from  Standard  =  -1) 
-
 end LocalContext;
 
 

diff --git a/src/AIS/AIS_LocalStatus.cdl b/src/AIS/AIS_LocalStatus.cdl
index 41c1d61fa1f0427a782c28ad6a7ad3b4cced4cfd..a7823b81b258dc89897be8cd0bc1302bb2a912e8 100644 (file)
--- a/src/AIS/AIS_LocalStatus.cdl
+++ b/src/AIS/AIS_LocalStatus.cdl
@@ -14,7 +14,7 @@
 -- Alternatively, this file may be used under the terms of Open CASCADE
 -- commercial license or contractual agreement.
 
-private class LocalStatus from AIS inherits TShared from MMgt
+class LocalStatus from AIS inherits TShared from MMgt
 
        ---Purpose: Stored Info about temporary objects.
 uses 

diff --git a/src/AdvApp2Var/AdvApp2Var.cdl b/src/AdvApp2Var/AdvApp2Var.cdl
index b4efe20e857a54184f0444d317ff15c2d7190a64..d8bc11f561a1f537c8c90df2d2a678b8ee7a9fc0 100644 (file)
--- a/src/AdvApp2Var/AdvApp2Var.cdl
+++ b/src/AdvApp2Var/AdvApp2Var.cdl
@@ -40,7 +40,6 @@ uses
      TColStd, 
      TColgp,
      TColGeom,
-     TCollection,
      AdvApprox,
      Standard
  

diff --git a/src/AdvApprox/AdvApprox.cdl b/src/AdvApprox/AdvApprox.cdl
index 9d759bb43ddb001a2d3d27fec88b2869d72acf0b..5cd47817359e0f746ec02d42b78a82f1bb993cc1 100644 (file)
--- a/src/AdvApprox/AdvApprox.cdl
+++ b/src/AdvApprox/AdvApprox.cdl
@@ -26,8 +26,6 @@ uses gp,
      GeomAbs,
      TColStd, 
      TColgp, 
-     TCollection, 
-     Standard,
      StdFail, 
      PLib
 

diff --git a/src/BOPAlgo/BOPAlgo_BOP.cdl b/src/BOPAlgo/BOPAlgo_BOP.cdl
index 71404a83ff13fa8d7564377a17f91d3eeb27f408..97646d045d2efccb87f8caaabb4b654b6fe516f7 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_BOP.cdl
+++ b/src/BOPAlgo/BOPAlgo_BOP.cdl
@@ -51,10 +51,6 @@ is
     ---Purpose:  Adds Tool argument of the operation                
         is virtual;  
         
-    SetTools (me:out;
-            theShapes: ListOfShape from TopTools)
-        is virtual;  
-         
     SetTools (me:out;
             theShapes: ListOfShape from BOPCol)
         is virtual; 

diff --git a/src/BOPAlgo/BOPAlgo_BOP.cxx b/src/BOPAlgo/BOPAlgo_BOP.cxx
index ec88eab219b22d95172a93826047fa07125129c2..53f9c41a4eb5de644e267e31d8e88dfdd8e3458c 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_BOP.cxx
+++ b/src/BOPAlgo/BOPAlgo_BOP.cxx
@@ -133,21 +133,6 @@ void BOPAlgo_BOP::AddTool(const TopoDS_Shape& theShape)
 //function : SetTools
 //purpose  : 
 //=======================================================================
-void BOPAlgo_BOP::SetTools(const TopTools_ListOfShape& theShapes)
-{
-  TopTools_ListIteratorOfListOfShape aIt;
-  //
-  myTools.Clear();
-  aIt.Initialize(theShapes);
-  for (; aIt.More(); aIt.Next()) {
-    const TopoDS_Shape& aS = aIt.Value();
-    AddTool(aS);
-  }
-}
-//=======================================================================
-//function : SetTools
-//purpose  : 
-//=======================================================================
 void BOPAlgo_BOP::SetTools(const BOPCol_ListOfShape& theShapes)
 {
   BOPCol_ListIteratorOfListOfShape aIt;

diff --git a/src/BOPAlgo/BOPAlgo_Builder.cdl b/src/BOPAlgo/BOPAlgo_Builder.cdl
index 4eb2798688e13b16409138a4c64b9bcaae0c7024..5f7d974ae761baca135aff20f88568dd22463493 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_Builder.cdl
+++ b/src/BOPAlgo/BOPAlgo_Builder.cdl
@@ -62,9 +62,6 @@ is
             theShape: Shape from TopoDS) 
         is virtual; 
  
-    SetArguments(me:out; 
-            theLS:ListOfShape from TopTools);  
-
     SetArguments (me:out;
             theLS: ListOfShape from BOPCol)
         is virtual;

diff --git a/src/BOPAlgo/BOPAlgo_Builder.cxx b/src/BOPAlgo/BOPAlgo_Builder.cxx
index 8e7bb8f66c1f0599ef904444616c1bf2eefce931..6a979d789f585dd95101c5cb6437a823d5c315ef 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_Builder.cxx
+++ b/src/BOPAlgo/BOPAlgo_Builder.cxx
@@ -107,22 +107,6 @@ void BOPAlgo_Builder::AddArgument(const TopoDS_Shape& theShape)
 //function : SetArguments
 //purpose  : 
 //=======================================================================
-void BOPAlgo_Builder::SetArguments(const TopTools_ListOfShape& theShapes)
-{
-  TopTools_ListIteratorOfListOfShape aIt;
-  //
-  myArguments.Clear();
-  //
-  aIt.Initialize(theShapes);
-  for (; aIt.More(); aIt.Next()) {
-    const TopoDS_Shape& aS = aIt.Value();
-    AddArgument(aS);
-  }
-}
-//=======================================================================
-//function : SetArguments
-//purpose  : 
-//=======================================================================
 void BOPAlgo_Builder::SetArguments(const BOPCol_ListOfShape& theShapes)
 {
   BOPCol_ListIteratorOfListOfShape aIt;

diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller.cdl b/src/BOPAlgo/BOPAlgo_PaveFiller.cdl
index 237f49d1fe1e4d828a21ba196c82027597596bf9..7b40eee7a054b2a0ba9a811f1802ea25ab1c6afe 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_PaveFiller.cdl
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller.cdl
@@ -86,9 +86,6 @@ is
     SetArguments(me:out; 
             theLS:ListOfShape from BOPCol);   
             
-    SetArguments(me:out; 
-            theLS:ListOfShape from TopTools);  
-
     Arguments(me) 
       returns ListOfShape from BOPCol; 
     ---C++: return const & 

diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller.cxx
index b5fe4c6110e4e1c5325d68190c994dcf4670a1f4..94e1788845f4ba6ec721b71689fac558de270155 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_PaveFiller.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller.cxx
@@ -113,21 +113,6 @@ void BOPAlgo_PaveFiller::SetSectionAttribute
 //function : SetArguments
 //purpose  : 
 //=======================================================================
-void BOPAlgo_PaveFiller::SetArguments(const TopTools_ListOfShape& theLS)
-{
-  TopTools_ListIteratorOfListOfShape aItLS;
-  //
-  myArguments.Clear();
-  aItLS.Initialize(theLS);
-  for (; aItLS.More(); aItLS.Next()) {
-    const TopoDS_Shape& aS=aItLS.Value();
-    myArguments.Append(aS);
-  }
-}
-//=======================================================================
-//function : SetArguments
-//purpose  : 
-//=======================================================================
 void BOPAlgo_PaveFiller::SetArguments(const BOPCol_ListOfShape& theLS)
 {
   myArguments=theLS;

diff --git a/src/BRepAlgo/BRepAlgo_DSAccess.cxx b/src/BRepAlgo/BRepAlgo_DSAccess.cxx
index 63de9d3d72578d3edacbb98c14d1fb0dd3a7de9b..cd41cda7dfee55c16ae7d28a078c838fd0eb9383 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_DSAccess.cxx
+++ b/src/BRepAlgo/BRepAlgo_DSAccess.cxx
@@ -455,7 +455,7 @@ const TopTools_ListOfShape& BRepAlgo_DSAccess::SectionVertex
   Standard_Integer goodIndex = 0;
   TopOpeBRepDS_Kind goodKind;
   for(;II.More();II.Next()) {
-    Handle(TopOpeBRepDS_Interference)& I = II.Value();
+    const Handle(TopOpeBRepDS_Interference)& I = II.Value();
     const TopOpeBRepDS_Transition& T = I->Transition();
     if((T.ONAfter() == TopAbs_FACE) &&
        (T.IndexAfter()  == iF)) {

diff --git a/src/BRepAlgo/BRepAlgo_Loop.cxx b/src/BRepAlgo/BRepAlgo_Loop.cxx
index 521758b395053f37eab06126ad86a77750c9a8ca..1d3ca3d7943d2bf813d293e0f8c6f9c624b2166c 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Loop.cxx
+++ b/src/BRepAlgo/BRepAlgo_Loop.cxx
@@ -559,8 +559,7 @@ void BRepAlgo_Loop::Perform()
   {
     const TopoDS_Edge& anEdge = TopoDS::Edge(itl.Value());
     TopTools_ListOfShape LCE;
-    const TopTools_ListOfShape* pVertices = 
-      static_cast<TopTools_ListOfShape*>(myVerOnEdges.Find1(anEdge));
+    const TopTools_ListOfShape* pVertices = myVerOnEdges.Seek (anEdge);
     if (pVertices)
     {
       CutEdge (anEdge, *pVertices, LCE);
@@ -575,8 +574,7 @@ void BRepAlgo_Loop::Perform()
   // add cut edges.
   for (itl.Initialize(myEdges); itl.More(); itl.Next())
   {
-    const TopTools_ListOfShape* pLCE = 
-      static_cast<TopTools_ListOfShape*>(myCutEdges.Find1(itl.Value()));
+    const TopTools_ListOfShape* pLCE = myCutEdges.Seek (itl.Value());
     if (pLCE)
     {
       for (itl1.Initialize(*pLCE); itl1.More(); itl1.Next()) {

diff --git a/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx b/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx
index 8d5ff062eea9583b262f766e8bbbc4fd99162acc..78a8322fc581e7e1477ae49abb48196d41fe823d 100644 (file)
--- a/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx
+++ b/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx
@@ -25,10 +25,7 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_DefineAlloc.hxx>
-
-class TopoDS_Shape;
-class TopTools_IndexedMapOfShape;
-
+#include <TopTools_IndexedMapOfShape.hxx>
 
 //! This class  provides tools to compute minimum distance <br>
 //! between two Shapes (Compound,CompSolid, Solid, Shell, Face, Wire, Edge, Vertex). <br>

diff --git a/src/BRepLib/BRepLib_FuseEdges.cxx b/src/BRepLib/BRepLib_FuseEdges.cxx
index d77db1fc076dcaf90f43eb4ecb5818ff8e0123be..00eb9299494c1baf7cfff144ae54316d823dc929 100644 (file)
--- a/src/BRepLib/BRepLib_FuseEdges.cxx
+++ b/src/BRepLib/BRepLib_FuseEdges.cxx
@@ -443,7 +443,7 @@ void BRepLib_FuseEdges::BuildListResultEdges()
       const Standard_Integer& iLst = itLstEdg.Key();
       const TopTools_ListOfShape& LmapEdg = myMapLstEdg.Find(iLst);
 
-      TopoDS_Edge& OldEdge = TopoDS::Edge(LmapEdg.First());
+      TopoDS_Edge OldEdge = TopoDS::Edge(LmapEdg.First());
 
       // the first edge of the list will be replaced by the result fusion edge
       if (OldEdge.Orientation()==TopAbs_REVERSED) {
@@ -575,8 +575,7 @@ void BRepLib_FuseEdges::Perform()
       TopTools_ListIteratorOfListOfShape itEdg; 
 
       EdgeToSubs.Clear();
-      TopoDS_Edge& OldEdge = TopoDS::Edge(LmapEdg.First());
-
+      TopoDS_Edge OldEdge = TopoDS::Edge(LmapEdg.First());
 
       EdgeToSubs.Append(myMapEdg(iLst));
       Bsub.Substitute(OldEdge,EdgeToSubs);

diff --git a/src/BRepMesh/BRepMesh_Delaun.hxx b/src/BRepMesh/BRepMesh_Delaun.hxx
index b3f7765c22cf3276bdd1ac768b722bdd1b15260d..d2bc70ce1e28714234092a1fc53ecd54f6400d76 100755 (executable)
--- a/src/BRepMesh/BRepMesh_Delaun.hxx
+++ b/src/BRepMesh/BRepMesh_Delaun.hxx
@@ -26,10 +26,12 @@
 #include <BRepMesh.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 #include <BRepMesh_GeomTool.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_SequenceOfInteger.hxx>
+#include <TColStd_MapOfInteger.hxx>
 
 class Bnd_B2d;
 class Bnd_Box2d;
-class BRepMesh_Array1OfVertexOfDelaun;
 class BRepMesh_Vertex;
 
 //! Compute the Delaunay's triangulation with the algorithm of Watson.

diff --git a/src/BRepMesh/BRepMesh_DiscretFactory.hxx b/src/BRepMesh/BRepMesh_DiscretFactory.hxx
index 57ddcec1e62f676243468eff6301b372e71f7c6d..dc47c791b2e89cea815b4d1f2dab8caf4f6d9341 100644 (file)
--- a/src/BRepMesh/BRepMesh_DiscretFactory.hxx
+++ b/src/BRepMesh/BRepMesh_DiscretFactory.hxx
@@ -24,9 +24,6 @@
 #include <Plugin_MapOfFunctions.hxx>
 #include <BRepMesh_DiscretRoot.hxx>
 
-class TColStd_MapOfAsciiString;
-class TCollection_AsciiString;
-class BRepMesh_DiscretRoot;
 class TopoDS_Shape;
 
 //! This class intended to setup / retrieve default triangulation algorithm. <br>

diff --git a/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx b/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
index 1a250db71f3c4e4037a93534ba6e883846584d49..d1699f44bb4fd4f8ddb427320d254f2c5103eadf 100644 (file)
--- a/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
@@ -19,7 +19,7 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Extrema_LocateExtPC.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
+#include <TColStd_HArray1OfReal.hxx>
 
 class gp_Pnt;
 class TopoDS_Edge;

diff --git a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
index dcf595d043541c70a0150e04a398a457b82e5406..7ab0d492bc74b7fb7cae0b427d13245350ed599e 100644 (file)
--- a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
@@ -26,12 +26,12 @@
 #include <Handle_Geom2d_Curve.hxx>
 #include <Handle_BRepAdaptor_HSurface.hxx>
 #include <BRepAdaptor_Curve.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
 class Geom_Surface;
 class Geom2d_Curve;
 class TopoDS_Edge;
 class BRepAdaptor_HSurface;
-class TopTools_IndexedDataMapOfShapeListOfShape;
 
 //! Auxiliary class implements functionality producing tessellated
 //! representation of an edge based on edge geometry.

diff --git a/src/BRepMesh/BRepMesh_FastDiscretFace.hxx b/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
index 1badfec32a34e30006a8982e79b540f76288d243..bacf6ac15bd39adf858f41dcd8b81812c3b5f62c 100644 (file)
--- a/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
+++ b/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
@@ -22,6 +22,7 @@
 #include <BRepMesh_FaceAttribute.hxx>
 #include <Standard_Transient.hxx>
 #include <TopTools_MutexForShapeProvider.hxx>
+#include <TopTools_DataMapOfShapeReal.hxx>
 #include <Handle_BRepAdaptor_HSurface.hxx>
 #include <Handle_Poly_Triangulation.hxx>
 #include <BRepMesh_Delaun.hxx>
@@ -32,7 +33,6 @@
 class BRepMesh_DataStructureOfDelaun;
 class BRepMesh_FaceAttribute;
 class TopoDS_Face;
-class TopTools_DataMapOfShapeReal;
 class TopoDS_Vertex;
 class BRepAdaptor_HSurface;
 class TopoDS_Edge;

diff --git a/src/BRepMesh/BRepMesh_WireChecker.hxx b/src/BRepMesh/BRepMesh_WireChecker.hxx
index 2f77330833dc76e1bfb7bdeac26eb5319bf10ffb..b0a0adae4c69c3d09bb78b84266c62b8629068cc 100644 (file)
--- a/src/BRepMesh/BRepMesh_WireChecker.hxx
+++ b/src/BRepMesh/BRepMesh_WireChecker.hxx
@@ -22,6 +22,7 @@
 #include <BRepMesh_Status.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 #include <BRepMesh.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopoDS_Edge.hxx>
 #include <Bnd_Box2d.hxx>
 #include <gp_Pnt2d.hxx>
@@ -29,8 +30,6 @@
 
 #include <vector>
 
-class BRepMesh_DataMapOfShapePairOfPolygon;
-class TColStd_IndexedMapOfInteger;
 
 //! Auxilary class intended to check correctness of discretized face.
 //! In particular, checks boundaries of discretized face for self 

diff --git a/src/BRepTools/BRepTools_ReShape.cxx b/src/BRepTools/BRepTools_ReShape.cxx
index 3ca3db4e1c6da3543d1bb4c43bb6c8016f058457..8bc3ce3deb7421a5f9ef9d147e242140f717535e 100644 (file)
--- a/src/BRepTools/BRepTools_ReShape.cxx
+++ b/src/BRepTools/BRepTools_ReShape.cxx
@@ -38,26 +38,14 @@
 #include <TopoDS_Edge.hxx>
 
 
-static void CopyRanges (const TopoDS_Edge& toedge, 
-                                 const TopoDS_Edge& fromedge,
-                                 const Standard_Real alpha,
-                                 const Standard_Real beta) 
+static void CopyRanges (const TopoDS_Shape& toedge, const TopoDS_Shape& fromedge,
+                       const Standard_Real alpha, const Standard_Real beta) 
 {
-/*  BRep_Builder B;
-    for (BRep_ListIteratorOfListOfCurveRepresentation itcr
-    ((*((Handle(BRep_TEdge)*)&fromedge.TShape()))->ChangeCurves()); itcr.More(); itcr.Next()) {
-    Handle(BRep_GCurve) GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
-    if ( GC.IsNull() ) continue;
-    Standard_Real first, last;
-    GC->Range ( first, last );
-    if ( GC->IsCurve3D() ) 
-      B.Range ( toedge, first, last );
-    else if ( GC->IsCurveOnSurface() )
-      B.Range ( toedge, GC->Surface(), fromedge.Location().Multiplied (GC->Location()), first, last);
-  }
-*/
-  for (BRep_ListIteratorOfListOfCurveRepresentation fromitcr
-       ((*((Handle(BRep_TEdge)*)&fromedge.TShape()))->ChangeCurves()); fromitcr.More(); fromitcr.Next()) {
+  Handle(BRep_TEdge) aTEdgeFrom = Handle(BRep_TEdge)::DownCast(fromedge.TShape());
+  Handle(BRep_TEdge) aTEdgeTo   = Handle(BRep_TEdge)::DownCast(toedge.TShape());
+  BRep_ListOfCurveRepresentation& tolist = aTEdgeTo->ChangeCurves();
+  BRep_ListIteratorOfListOfCurveRepresentation fromitcr (aTEdgeFrom->ChangeCurves());
+  for (; fromitcr.More(); fromitcr.Next()) {
     Handle(BRep_GCurve) fromGC = Handle(BRep_GCurve)::DownCast(fromitcr.Value());
     if ( fromGC.IsNull() ) continue;
     Standard_Boolean isC3d = fromGC->IsCurve3D();
@@ -75,7 +63,6 @@ static void CopyRanges (const TopoDS_Edge& toedge,
       L = fromGC->Location();
     } 
 
-    BRep_ListOfCurveRepresentation& tolist = (*((Handle(BRep_TEdge)*)&toedge.TShape()))->ChangeCurves();
     Handle(BRep_GCurve) toGC;
     for (BRep_ListIteratorOfListOfCurveRepresentation toitcr (tolist); toitcr.More(); toitcr.Next()) {
       toGC = Handle(BRep_GCurve)::DownCast(toitcr.Value());
@@ -536,8 +523,7 @@ TopoDS_Shape BRepTools_ReShape::Apply (const TopoDS_Shape& shape,
 
   // restore Range on edge broken by EmptyCopied()
   if ( st == TopAbs_EDGE ) {
-    //BRepTools_Edge sbe;
-    CopyRanges ( TopoDS::Edge ( result ), TopoDS::Edge ( shape ),0,1 );
+    CopyRanges (result, shape, 0, 1);
   }
   else if (st == TopAbs_FACE)  {
     TopoDS_Face face = TopoDS::Face ( shape );

diff --git a/src/BSplCLib/BSplCLib_Cache.hxx b/src/BSplCLib/BSplCLib_Cache.hxx
index ab64d464f55cc9aac240f7c22313d669f12f3742..e74c8dbb90dc701b8f8990643cdcaf8ad96ed5f3 100644 (file)
--- a/src/BSplCLib/BSplCLib_Cache.hxx
+++ b/src/BSplCLib/BSplCLib_Cache.hxx
@@ -27,10 +27,11 @@
 #include <gp_Vec2d.hxx>
 #include <gp_Vec.hxx>
 
-class Handle(BSplCLib_Cache);
-class TColStd_Array1OfReal;
-class TColgp_Array1OfPnt;
-class TColgp_Array1OfPnt2d;
+#include <TColStd_HArray2OfReal.hxx>
+#include <TColStd_HArray1OfReal.hxx>
+#include <TColStd_Array1OfReal.hxx>
+#include <TColgp_Array1OfPnt.hxx>
+#include <TColgp_Array1OfPnt2d.hxx>
 
 #ifndef NOWEIGHTS_CURVE
 #define NOWEIGHTS_CURVE (*((TColStd_Array1OfReal*) NULL))

diff --git a/src/BSplSLib/BSplSLib_Cache.hxx b/src/BSplSLib/BSplSLib_Cache.hxx
index dfb9d92955817efc756d2644acecef9ece689621..59e677bb2acc08ab12581ba179311e61d831252e 100644 (file)
--- a/src/BSplSLib/BSplSLib_Cache.hxx
+++ b/src/BSplSLib/BSplSLib_Cache.hxx
@@ -19,17 +19,15 @@
 #include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
 
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray2OfReal.hxx>
-
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 
-class Handle(BSplSLib_Cache);
-class TColgp_Array2OfPnt;
-class TColStd_Array1OfInteger;
-class TColStd_Array1OfReal;
-class TColStd_Array2OfReal;
+#include <TColgp_Array2OfPnt.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_HArray2OfReal.hxx>
+#include <TColStd_HArray1OfReal.hxx>
+#include <TColStd_Array1OfReal.hxx>
+#include <TColStd_Array2OfReal.hxx>
 
 #ifndef NOWEIGHTS_SURF
 #define NOWEIGHTS_SURF (*((TColStd_Array2OfReal*) NULL))

diff --git a/src/Bisector/Bisector_BisecPC.cxx b/src/Bisector/Bisector_BisecPC.cxx
index 011b955f5ad90a2a4d256a5609b97dfe2c60e5c9..d98d2b34ec1f94f92140b361c56541c5d92bb87a 100644 (file)
--- a/src/Bisector/Bisector_BisecPC.cxx
+++ b/src/Bisector/Bisector_BisecPC.cxx
@@ -634,7 +634,7 @@ void Bisector_BisecPC::CuspFilter()
 void Bisector_BisecPC::ComputeIntervals ()
 {
   Standard_Real U1 =0.,U2 =0.,UProj =0.;
-  Standard_Real UStart,UEnd;
+  Standard_Real UStart = 0., UEnd = 0.;
   Standard_Real Dist1,Dist2,DistProj;
   isEmpty        = Standard_False;     
   shiftParameter = 0.;

diff --git a/src/CDM/CDM_MetaDataLookUpTable.hxx b/src/CDM/CDM_MetaDataLookUpTable.hxx
index 8b054d420fcd0eb27759f7e8ac4af76dcd4eb710..a04d5d79744251de3e47d9ba47ec0fab18f31897 100644 (file)
--- a/src/CDM/CDM_MetaDataLookUpTable.hxx
+++ b/src/CDM/CDM_MetaDataLookUpTable.hxx
@@ -17,11 +17,11 @@
 #ifndef CDM_MetaDataLookUpTable_HeaderFile
 #define CDM_MetaDataLookUpTable_HeaderFile
 
-#include <TCollection_ExtendedString.hxx>
-#include <CDM_MetaData.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <NCollection_DataMap.hxx>
 
+class Handle(CDM_MetaData);
+
 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;
 

diff --git a/src/DDF/DDF_IOStream.hxx b/src/DDF/DDF_IOStream.hxx
index 38fc0a1b9d42bbe1750f75deff14e20b3c4fe05b..8fe47f2da8b3791e6779761541b37b2d4bd912d9 100644 (file)
--- a/src/DDF/DDF_IOStream.hxx
+++ b/src/DDF/DDF_IOStream.hxx
@@ -36,20 +36,9 @@ class Storage_StreamFormatError;
 class Storage_StreamWriteError;
 class Storage_StreamExtCharParityError;
 
-class TColStd_SequenceOfExtendedString;
+#include <TColStd_SequenceOfExtendedString.hxx>
 
-#ifndef Standard_EXPORT
-#ifdef WNT
-#define Standard_EXPORT __declspec(dllexport)
-#else
-#define Standard_EXPORT
-#endif
-#endif
-#ifdef WNT
-#pragma warning (disable : 4275)
-#endif
-
-class Standard_EXPORT DDF_IOStream  : public Storage_BaseDriver {
+class DDF_IOStream  : public Storage_BaseDriver {
 
 public:
 

diff --git a/src/Expr/Expr_Array1OfNamedUnknown.hxx b/src/Expr/Expr_Array1OfNamedUnknown.hxx
index 23746ed49960f317439b1b67cdec6701c9f4d04b..2bb95b1feb3f71d537661d20554f4fa0933391f7 100644 (file)
--- a/src/Expr/Expr_Array1OfNamedUnknown.hxx
+++ b/src/Expr/Expr_Array1OfNamedUnknown.hxx
@@ -17,7 +17,7 @@
 #ifndef Expr_Array1OfNamedUnknown_HeaderFile
 #define Expr_Array1OfNamedUnknown_HeaderFile
 
-#include <Expr_NamedUnknown.hxx>
+#include <Handle_Expr_NamedUnknown.hxx>
 #include <NCollection_Array1.hxx>
 
 typedef NCollection_Array1<Handle(Expr_NamedUnknown)> Expr_Array1OfNamedUnknown;

diff --git a/src/MeshTest/MeshTest_DrawableMesh.hxx b/src/MeshTest/MeshTest_DrawableMesh.hxx
index ba9f1740a80a404e1aebd7cbcb596cd2d8a4514b..9d84918957a5809333a1cb595793821138b38cba 100644 (file)
--- a/src/MeshTest/MeshTest_DrawableMesh.hxx
+++ b/src/MeshTest/MeshTest_DrawableMesh.hxx
@@ -19,14 +19,11 @@
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <Draw_Drawable3D.hxx>
-#include <Handle_Draw_Drawable3D.hxx>
 #include <Standard_OStream.hxx>
 #include <Draw_Interpretor.hxx>
 
 class TopoDS_Shape;
-class TColStd_SequenceOfInteger;
 class Draw_Display;
-class Draw_Drawable3D;
 
 //! A drawable mesh. 
 //! Provides a mesh object inherited from Drawable3d to draw a triangulation.

diff --git a/src/MeshVS/MeshVS_SensitiveFace.hxx b/src/MeshVS/MeshVS_SensitiveFace.hxx
index ff4f6c7a99bdc36312187670a1d463c5116ed261..07da34551d2b0794bb2ecbdded71138ef8bd377f 100644 (file)
--- a/src/MeshVS/MeshVS_SensitiveFace.hxx
+++ b/src/MeshVS/MeshVS_SensitiveFace.hxx
@@ -25,8 +25,6 @@
 #include <Select3D_TypeOfSensitivity.hxx>
 
 class SelectBasics_EntityOwner;
-class TColgp_Array1OfPnt;
-
 
 //! This class provides custom sensitive face, which will be selected if it center is in rectangle.
 class MeshVS_SensitiveFace : public Select3D_SensitiveFace

diff --git a/src/MeshVS/MeshVS_SensitivePolyhedron.hxx b/src/MeshVS/MeshVS_SensitivePolyhedron.hxx
index 287f031bf4b97a139252a1c322274177d0ede50a..0adaa8cc05be1eeb81d8d347feacab3105ef67cb 100644 (file)
--- a/src/MeshVS/MeshVS_SensitivePolyhedron.hxx
+++ b/src/MeshVS/MeshVS_SensitivePolyhedron.hxx
@@ -19,9 +19,9 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Handle_TColgp_HArray1OfPnt.hxx>
-#include <Handle_TColgp_HArray1OfPnt2d.hxx>
-#include <Handle_MeshVS_HArray1OfSequenceOfInteger.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
+#include <TColgp_HArray1OfPnt2d.hxx>
+#include <MeshVS_HArray1OfSequenceOfInteger.hxx>
 #include <gp_XY.hxx>
 #include <NCollection_List.hxx>
 #include <Select3D_SensitiveEntity.hxx>
@@ -29,16 +29,10 @@
 #include <Select3D_SensitiveEntity.hxx>
 #include <Select3D_BndBox3d.hxx>
 
-class TColgp_HArray1OfPnt;
-class TColgp_HArray1OfPnt2d;
-class MeshVS_HArray1OfSequenceOfInteger;
 class SelectBasics_EntityOwner;
-class TColgp_Array1OfPnt;
 class Select3D_SensitiveEntity;
 class TopLoc_Location;
-class TColgp_Array1OfPnt2d;
 class Bnd_Box2d;
-class TColStd_SequenceOfInteger;
 class gp_Lin;
 class SelectBasics_ListOfBox2d;
 

diff --git a/src/MoniTool/MoniTool_DataMapOfTimer.hxx b/src/MoniTool/MoniTool_DataMapOfTimer.hxx
index 0d008f6ce0d1660a8a8bb2ed021d4de0298a196e..f00aaa41802b116ce4129a808c2b7ee61278f58f 100644 (file)
--- a/src/MoniTool/MoniTool_DataMapOfTimer.hxx
+++ b/src/MoniTool/MoniTool_DataMapOfTimer.hxx
@@ -18,10 +18,10 @@
 #define MoniTool_DataMapOfTimer_HeaderFile
 
 #include <Standard_CString.hxx>
-#include <MoniTool_Timer.hxx>
 #include <MoniTool_MTHasher.hxx>
 #include <NCollection_DataMap.hxx>
 
+class Handle(MoniTool_Timer);
 typedef NCollection_DataMap<Standard_CString,Handle(MoniTool_Timer),MoniTool_MTHasher> MoniTool_DataMapOfTimer;
 typedef NCollection_DataMap<Standard_CString,Handle(MoniTool_Timer),MoniTool_MTHasher>::Iterator MoniTool_DataMapIteratorOfDataMapOfTimer;
 

diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx
index 1a4ba3214e93dd9ec4678317f26d427e5ab221eb..adb4cbc3d03afbe07ea9a80f38ac49b9f7e0bc53 100644 (file)
--- a/src/OpenGl/OpenGl_GraphicDriver.hxx
+++ b/src/OpenGl/OpenGl_GraphicDriver.hxx
@@ -23,8 +23,8 @@
 
 #include <Standard_CString.hxx>
 
-#include <Handle_TColStd_HArray1OfByte.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
+#include <TColStd_HArray1OfByte.hxx>
+#include <TColStd_HArray1OfReal.hxx>
 #include <Quantity_PlaneAngle.hxx>
 #include <Quantity_NameOfColor.hxx>
 #include <Handle_OpenGl_View.hxx>
@@ -56,16 +56,16 @@
 #include <Graphic3d_BufferType.hxx>
 #include <NCollection_DataMap.hxx>
 
-class TColStd_Array1OfInteger;
-class TColStd_Array1OfReal;
-class TColStd_Array2OfReal;
-class TColStd_HArray1OfByte;
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_HArray1OfReal.hxx>
+#include <TColStd_Array2OfReal.hxx>
+#include <TColStd_HArray1OfByte.hxx>
+
 class Graphic3d_Vector;
 class Quantity_Color;
 class Graphic3d_Vertex;
 class TCollection_ExtendedString;
 class Image_PixMap;
-class TColStd_HArray1OfReal;
 class Handle(OpenGl_Workspace);
 class OpenGl_Element;
 class OpenGl_Structure;

diff --git a/src/Prs3d/Prs3d_WFShape.hxx b/src/Prs3d/Prs3d_WFShape.hxx
index 32d6b12023c2ee365368b6e61ee9a8869653de3a..67d4911b745863235aaef3b79384efafa0c711dc 100755 (executable)
--- a/src/Prs3d/Prs3d_WFShape.hxx
+++ b/src/Prs3d/Prs3d_WFShape.hxx
@@ -22,7 +22,6 @@
 class Adaptor3d_Curve;
 class TopoDS_Edge;
 class TopoDS_Shape;
-class TColgp_SequenceOfPnt;
 class Handle(BRepAdaptor_HSurface);
 class Handle(Prs3d_Drawer);
 

diff --git a/src/QADraw/QADraw.cxx b/src/QADraw/QADraw.cxx
index 5020a2be9539e4a2426553b80b13457f2fd4ad93..d3385c838958cb83ebef189d1cab4fca54974560 100644 (file)
--- a/src/QADraw/QADraw.cxx
+++ b/src/QADraw/QADraw.cxx
@@ -40,19 +40,16 @@
 #include <Draw_PluginMacro.hxx>
 
 //=======================================================================
-#if ! defined(WNT)
-extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
-extern Handle(AIS_InteractiveContext)& TheAISContext();
-#else
-Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
-Standard_EXPORT Handle(AIS_InteractiveContext)& TheAISContext();
-#endif
+
 #include <ViewerTest_DoubleMapOfInteractiveAndName.hxx>
 #include <AIS_Trihedron.hxx>
 #include <AIS_Axis.hxx>
 #include <Geom_Line.hxx>
 #include <AIS_Line.hxx>
 
+Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
+Standard_EXPORT Handle(AIS_InteractiveContext)& TheAISContext();
+
 //==============================================================================
 // function : VTrihedronOrigins
 // author   : ota

diff --git a/src/QANCollection/FILES b/src/QANCollection/FILES
index 4ec0f8b5e40aec74b7821dc03d641cf20f1854ab..2a05c996f4d5e4879bb03a85ee356650f4e4c626 100755 (executable)
--- a/src/QANCollection/FILES
+++ b/src/QANCollection/FILES
@@ -1,7 +1,6 @@
 FILES
 QANCollection.cdl
 QANCollection.cxx
-QANCollection_Simple.cxx
 QANCollection_Test.cxx
 QANCollection_Perf.cxx
 QANCollection_Alloc.cxx

diff --git a/src/QANCollection/QANCollection.cdl b/src/QANCollection/QANCollection.cdl
index 4f1a70a3a6f34b43be3315ec6a6f6bb640208559..a1dc7231a6c6229b612cd0598948843a31a5b2ef 100644 (file)
--- a/src/QANCollection/QANCollection.cdl
+++ b/src/QANCollection/QANCollection.cdl
@@ -31,7 +31,6 @@ is
     imported DoubleMapIteratorOfDoubleMapOfRealInteger;
 
     Commands(DI : in out Interpretor from Draw);
-    CommandsSimple(DI : in out Interpretor from Draw);
     CommandsTest(DI : in out Interpretor from Draw);
     CommandsPerf(DI : in out Interpretor from Draw);
     CommandsAlloc(DI : in out Interpretor from Draw);

diff --git a/src/QANCollection/QANCollection.cxx b/src/QANCollection/QANCollection.cxx
index 11eb65dd91e848e789d3c5857a41f3c6277b7f3e..9424e79573328e44722174b999a68dcc9652c68b 100644 (file)
--- a/src/QANCollection/QANCollection.cxx
+++ b/src/QANCollection/QANCollection.cxx
@@ -20,7 +20,6 @@
 
 void QANCollection::Commands (Draw_Interpretor& theCommands)
 {
-  QANCollection::CommandsSimple (theCommands);
   QANCollection::CommandsTest (theCommands);
   QANCollection::CommandsPerf (theCommands);
   QANCollection::CommandsAlloc (theCommands);

diff --git a/src/QANCollection/QANCollection_Simple.cxx b/src/QANCollection/QANCollection_Simple.cxx
deleted file mode 100644 (file)
index d168a76..0000000
--- a/src/QANCollection/QANCollection_Simple.cxx
+++ /dev/null
@@ -1,225 +0,0 @@
-// Created on: 2004-03-05
-// Created by: Mikhail KUZMITCHEV
-// Copyright (c) 2004-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.
-
-#include <QANCollection.hxx>
-#include <Draw_Interpretor.hxx>
-
-#include <OSD_PerfMeter.hxx>
-
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_SequenceOfPnt.hxx>
-
-#include <NCollection_Sequence.hxx>
-#include <NCollection_Array1.hxx>
-#include <NCollection_IncAllocator.hxx>
-
-typedef NCollection_Array1<gp_Pnt> MyArray1;
-typedef NCollection_Sequence<gp_Pnt> MySequence;
-
-const Standard_Integer REPEAT = 100;
-
-static void printAllMeters (Draw_Interpretor& theDI)
-{
-  char buffer[25600];
-  perf_sprint_all_meters (buffer, 25600 - 1, 1);
-  theDI << buffer;
-}
-
-static void createArray (TColgp_Array1OfPnt& anArrPnt)
-{
-  OSD_PerfMeter aPerfMeter("Create array");
-
-  for (Standard_Integer j = 0; j < 2*REPEAT; j++) {
-    PERF_START_METER("Create array")
-      for (Standard_Integer i = anArrPnt.Lower(); i <= anArrPnt.Upper(); i++)
-        anArrPnt(i).SetCoord ((double)i, (double)(i+1), (double)(i+2));
-    PERF_STOP_METER("Create array")
-  }
-}
-
-static void createSequence (TColgp_SequenceOfPnt& aSeq)
-{
-  for (Standard_Integer j = 0; j < REPEAT; j++) {
-    PERF_START_METER("Clear sequence")
-    aSeq.Clear();
-    PERF_STOP_METER("Clear sequence")
-    PERF_START_METER("Create sequence")
-    for (Standard_Integer i = 0; i < 100000; i++)
-      aSeq.Append (gp_Pnt((double)i, (double)(i+1), (double)(i+2)));
-    PERF_STOP_METER("Create sequence")
-  }
-}
-
-static void createSequence (MySequence& aSeq)
-{
-  for (Standard_Integer j = 0; j < REPEAT; j++) {
-    PERF_START_METER("Clear sequence")
-    aSeq.Clear();
-    PERF_STOP_METER("Clear sequence")
-    PERF_START_METER("Create sequence")
-    for (Standard_Integer i = 0; i < 100000; i++)
-      aSeq.Append (gp_Pnt((double)i, (double)(i+1), (double)(i+2)));
-    PERF_STOP_METER("Create sequence")
-  }
-}
-
-static void assignSequence (TColgp_SequenceOfPnt& aDest,
-                            const TColgp_SequenceOfPnt& aSrc)
-{
-  for (Standard_Integer i = 0; i < REPEAT; i++) {
-    PERF_START_METER("Assign sequence to sequence")
-    aDest = aSrc;
-    PERF_STOP_METER("Assign sequence to sequence")
-  }
-}
-
-static void assignSequence (MySequence& aDest, const MySequence& aSrc)
-{
-  for (Standard_Integer i = 0; i < REPEAT; i++) {
-    PERF_START_METER("Assign sequence to sequence")
-    aDest = aSrc;
-    PERF_STOP_METER("Assign sequence to sequence")
-  }
-}
-
-static void createArray (MyArray1& anArrPnt)
-{
-  for (Standard_Integer j = 0; j < 2*REPEAT; j++) {
-    PERF_START_METER("Create array")
-      for (Standard_Integer i = anArrPnt.Lower(); i <= anArrPnt.Upper(); i++)
-        anArrPnt(i).SetCoord ((double)i, (double)(i+1), (double)(i+2));
-    PERF_STOP_METER("Create array")
-  }
-}
-
-static void assignArray (TColgp_Array1OfPnt& aDest, const TColgp_Array1OfPnt& aSrc)
-{
-  for (Standard_Integer i = 0; i < 2*REPEAT; i++) {
-    PERF_START_METER("Assign array to array")
-    aDest = aSrc;
-    PERF_STOP_METER("Assign array to array")
-  }
-}
-
-template <class MyBaseCollPnt>
-void assignCollection (MyBaseCollPnt&           aDest,
-                       const MyBaseCollPnt&     aSrc,
-                       const char               * MeterName)
-{
-  for (Standard_Integer i = 0; i < REPEAT; i++) {
-    perf_start_meter (MeterName);
-    aDest.Assign(aSrc);
-    perf_stop_meter (MeterName);
-  }
-}
-
-static void assignArray (MyArray1& aDest, const MyArray1& aSrc)
-{
-  for (Standard_Integer i = 0; i < 2*REPEAT; i++) {
-    PERF_START_METER("Assign array to array")
-    aDest = aSrc;
-    PERF_STOP_METER("Assign array to array")
-  }
-}
-
-static void checkArray (Draw_Interpretor& theDI, const Standard_Boolean isNewColl)
-{
-  if (isNewColl) {
-    MyArray1 anArrPnt (1, 100000), anArrPnt1 (1, 100000);
-    createArray (anArrPnt);
-    assignArray (anArrPnt1, anArrPnt);
-    assignCollection (anArrPnt1, anArrPnt, "Assign collect to array");
-  } else {
-    TColgp_Array1OfPnt anArrPnt (1,100000), anArrPnt1 (1, 100000);
-    createArray (anArrPnt);
-    assignArray (anArrPnt1, anArrPnt);
-  }
-  printAllMeters (theDI);
-}
-
-static void checkSequence (Draw_Interpretor& theDI, 
-                           const Standard_Boolean isNewColl,
-                           const Standard_Boolean isIncr)
-{
-  if (isNewColl) {
-    Handle(NCollection_BaseAllocator) anAlloc[2];
-    if (isIncr) {
-      anAlloc[0] = new NCollection_IncAllocator;
-      anAlloc[1] = new NCollection_IncAllocator;
-    }
-    MySequence aSeqPnt (anAlloc[0]), aSeqPnt1(anAlloc[1]);
-    createSequence (aSeqPnt);
-    assignSequence (aSeqPnt1, aSeqPnt);
-    assignCollection (aSeqPnt1, aSeqPnt, "Assign collect to sequence");
-  } else {
-    TColgp_SequenceOfPnt aSeqPnt, aSeqPnt1;
-    createSequence (aSeqPnt);
-    assignSequence (aSeqPnt1, aSeqPnt);
-  }
-  printAllMeters (theDI);
-}
-
-//=======================================================================
-//function : QANColCheckArray1
-//purpose  : 
-//=======================================================================
-static Standard_Integer QANColCheckArray1(Draw_Interpretor& di, Standard_Integer argc, const char ** argv)
-{
-  if ( argc > 2) {
-    di << "Usage : " << argv[0] << " [-n]" << "\n";
-    return 1;
-  }
-
-  Standard_Boolean isNewColl = Standard_False;
-  if (argc > 1) {
-    if (strcmp (argv[1], "-n") == 0) isNewColl = Standard_True;
-  }
-  checkArray (di, isNewColl);
-  return 0;
-}
-
-//=======================================================================
-//function : QANColCheckSequence
-//purpose  : 
-//=======================================================================
-static Standard_Integer QANColCheckSequence(Draw_Interpretor& di, Standard_Integer argc, const char ** argv)
-{
-  if ( argc > 2) {
-    di << "Usage : " << argv[0] << " [-n]/[-ni]/[-in]" << "\n";
-    return 1;
-  }
-
-  Standard_Boolean isNewColl = Standard_False, isIncr = Standard_False;
-  if (argc > 1) {
-    if (strcmp (argv[1], "-n") == 0) isNewColl = Standard_True;
-    if (strcmp (argv[1], "-ni") == 0 || strcmp (argv[1], "-in") == 0)
-    {
-      isNewColl = Standard_True;
-      isIncr = Standard_True;
-    }
-  }
-  checkSequence (di, isNewColl, isIncr);
-  return 0;
-}
-
-void QANCollection::CommandsSimple(Draw_Interpretor& theCommands) {
-  const char *group = "QANCollection";
-
-  // from agvCollTest/src/AgvColEXE/TestEXE.cxx
-  theCommands.Add("QANColCheckArray1",   "QANColCheckArray1 [-n]",               __FILE__, QANColCheckArray1,   group);  
-  theCommands.Add("QANColCheckSequence", "QANColCheckSequence [-n]/[-ni]/[-in]", __FILE__, QANColCheckSequence, group);  
-
-  return;
-}

diff --git a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx
index f8b0575ad62871f2b76b96be7e8824f8f5ac84ce..8742a5d7575586231c7a01f489d7f3f5ccf83a40 100644 (file)
--- a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx
+++ b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx
@@ -19,17 +19,14 @@
 #include <NCollection_Vector.hxx>
 
 #include <Handle_SelectBasics_EntityOwner.hxx>
-#include <Handle_TColgp_HArray1OfPnt.hxx>
-#include <Handle_TColStd_HArray1OfInteger.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
 
 #include <Select3D_SensitivePoly.hxx>
 #include <Select3D_SensitiveSet.hxx>
 
 class gp_Pnt;
 class SelectBasics_EntityOwner;
-class TColgp_Array1OfPnt;
-class TColgp_HArray1OfPnt;
-class TColStd_HArray1OfInteger;
 
 typedef NCollection_Vector<Handle(Select3D_SensitivePoly)> Select3D_VectorOfHPoly;
 

diff --git a/src/Select3D/Select3D_SensitiveCircle.hxx b/src/Select3D/Select3D_SensitiveCircle.hxx
index 6b109fa957a345512e331f716bf3aa8f71ef139f..97ba0f724c5591b99522c3df49663e59220bdb30 100644 (file)
--- a/src/Select3D/Select3D_SensitiveCircle.hxx
+++ b/src/Select3D/Select3D_SensitiveCircle.hxx
@@ -27,7 +27,7 @@
 #include <Select3D_Pnt.hxx>
 #include <Handle_Geom_Circle.hxx>
 #include <Handle_SelectBasics_EntityOwner.hxx>
-#include <Handle_TColgp_HArray1OfPnt.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <Select3D_TypeOfSensitivity.hxx>
 
@@ -35,8 +35,6 @@ class Geom_Circle;
 class Standard_ConstructionError;
 class Standard_OutOfRange;
 class SelectBasics_EntityOwner;
-class TColgp_HArray1OfPnt;
-class TColgp_Array1OfPnt;
 class gp_Pnt;
 class TopLoc_Location;
 

diff --git a/src/Select3D/Select3D_SensitiveCurve.hxx b/src/Select3D/Select3D_SensitiveCurve.hxx
index 30d45075f36ec5d00d8937a3878f5049347a169c..866e7b8fe04a236bc5ec1a7f1169c7229d1bede1 100644 (file)
--- a/src/Select3D/Select3D_SensitiveCurve.hxx
+++ b/src/Select3D/Select3D_SensitiveCurve.hxx
@@ -25,7 +25,7 @@
 #include <Handle_Geom_Curve.hxx>
 #include <Select3D_SensitivePoly.hxx>
 #include <Handle_SelectBasics_EntityOwner.hxx>
-#include <Handle_TColgp_HArray1OfPnt.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
 #include <Standard_Boolean.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <Standard_Real.hxx>
@@ -35,8 +35,6 @@ class Geom_Curve;
 class Standard_ConstructionError;
 class Standard_OutOfRange;
 class SelectBasics_EntityOwner;
-class TColgp_HArray1OfPnt;
-class TColgp_Array1OfPnt;
 class Select3D_SensitiveEntity;
 class TopLoc_Location;
 

diff --git a/src/Select3D/Select3D_SensitiveFace.hxx b/src/Select3D/Select3D_SensitiveFace.hxx
index 0a7e6f8751ddb188e8b9d894c87b61dc6dcaec5f..9aa6c277d3c2b2525bb5acc52e86ff2981267703 100644 (file)
--- a/src/Select3D/Select3D_SensitiveFace.hxx
+++ b/src/Select3D/Select3D_SensitiveFace.hxx
@@ -26,7 +26,7 @@
 #include <Select3D_TypeOfSensitivity.hxx>
 #include <Select3D_SensitiveSet.hxx>
 #include <Handle_SelectBasics_EntityOwner.hxx>
-#include <Handle_TColgp_HArray1OfPnt.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
 #include <Standard_Boolean.hxx>
 #include <SelectBasics_SelectingVolumeManager.hxx>
 #include <Standard_Real.hxx>
@@ -35,8 +35,6 @@
 class Standard_ConstructionError;
 class Standard_OutOfRange;
 class SelectBasics_EntityOwner;
-class TColgp_Array1OfPnt;
-class TColgp_HArray1OfPnt;
 class TopLoc_Location;
 
 

diff --git a/src/Select3D/Select3D_SensitivePoly.hxx b/src/Select3D/Select3D_SensitivePoly.hxx
index ca2eb14b18dfe61fc8fe4094474101c9bb209ba3..54db03cdb63314fdf29b8e133f6763841061b5df 100644 (file)
--- a/src/Select3D/Select3D_SensitivePoly.hxx
+++ b/src/Select3D/Select3D_SensitivePoly.hxx
@@ -21,8 +21,7 @@
 #include <Standard_Type.hxx>
 
 #include <TColStd_HArray1OfInteger.hxx>
-#include <Handle_TColgp_HArray1OfPnt.hxx>
-#include <Handle_TColStd_HArray1OfInteger.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
 
 #include <Select3D_PointData.hxx>
 #include <Select3D_Pnt.hxx>
@@ -34,8 +33,6 @@
 class Standard_ConstructionError;
 class Standard_OutOfRange;
 class SelectBasics_EntityOwner;
-class TColgp_Array1OfPnt;
-class TColgp_HArray1OfPnt;
 
 //! Sensitive Entity to make a face selectable.
 //! In some cases this class can raise Standard_ConstructionError and

diff --git a/src/Select3D/Select3D_SensitiveSegment.hxx b/src/Select3D/Select3D_SensitiveSegment.hxx
index e610ef91323a34857b7b34edc004f3387b80c1fe..48882a7777674f7f8538c87557c4368a91be1f4b 100644 (file)
--- a/src/Select3D/Select3D_SensitiveSegment.hxx
+++ b/src/Select3D/Select3D_SensitiveSegment.hxx
@@ -32,8 +32,6 @@
 class SelectBasics_EntityOwner;
 class gp_Pnt;
 class TopLoc_Location;
-class TColgp_Array1OfPnt2d;
-
 
 //! A framework to define sensitive zones along a segment
 //!          One gives the 3D start and end point

diff --git a/src/Select3D/Select3D_SensitiveTriangle.hxx b/src/Select3D/Select3D_SensitiveTriangle.hxx
index 5d9fff11d7b54c53080342a1633624d02601be78..2a63c1f05212fbd9188940c8469b4a259643ff15 100644 (file)
--- a/src/Select3D/Select3D_SensitiveTriangle.hxx
+++ b/src/Select3D/Select3D_SensitiveTriangle.hxx
@@ -32,7 +32,6 @@ class Standard_ConstructionError;
 class Standard_OutOfRange;
 class SelectBasics_EntityOwner;
 class gp_Pnt;
-class TColgp_Array1OfPnt2d;
 class Select3D_SensitiveEntity;
 class TopLoc_Location;
 

diff --git a/src/Select3D/Select3D_SensitiveTriangulation.hxx b/src/Select3D/Select3D_SensitiveTriangulation.hxx
index 9bff3a146e0f19e14d6e8783796b8617b32c2c95..4b3b16410c3b790179f2174aba90b074f9fdf82e 100644 (file)
--- a/src/Select3D/Select3D_SensitiveTriangulation.hxx
+++ b/src/Select3D/Select3D_SensitiveTriangulation.hxx
@@ -30,7 +30,7 @@
 #include <gp_Trsf.hxx>
 #include <gp_Pnt.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
-#include <Handle_TColStd_HArray1OfInteger.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
 #include <Standard_Boolean.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <Select3D_SensitiveEntity.hxx>
@@ -41,13 +41,11 @@
 #include <NCollection_Handle.hxx>
 
 class Poly_Triangulation;
-class TColStd_HArray1OfInteger;
 class SelectBasics_EntityOwner;
 class TopLoc_Location;
 class gp_Pnt;
 class Select3D_SensitiveEntity;
 class Handle(Select3D_SensitiveEntity);
-class TColgp_Array1OfPnt2d;
 
 //! A framework to define selection of a sensitive entity made of a set of triangles.
 class Select3D_SensitiveTriangulation : public Select3D_SensitiveSet

diff --git a/src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx b/src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx
index df795b5e34fbc714767eddfa55a458a3a175349a..316714f42d5f4edc894a19f0c4a4308ac758818c 100644 (file)
--- a/src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx
+++ b/src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx
@@ -22,7 +22,6 @@
 
 class Bnd_Box;
 class gp_Pnt;
-class TColgp_Array1OfPnt;
 
 //! This class provides an interface for selecting volume manager,
 //! which is responsible for all overlap detection methods and

diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.hxx b/src/SelectMgr/SelectMgr_ViewerSelector.hxx
index 89b8c03c945fdc19833424979f2578828ec597e5..93a8209210259490535699e9b1aca231e008ad9f 100644 (file)
--- a/src/SelectMgr/SelectMgr_ViewerSelector.hxx
+++ b/src/SelectMgr/SelectMgr_ViewerSelector.hxx
@@ -26,7 +26,7 @@
 #include <NCollection_DataMap.hxx>
 #include <OSD_Chronometer.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
-#include <Handle_TColStd_HArray1OfInteger.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
 
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
@@ -41,12 +41,10 @@
 #include <Standard_OStream.hxx>
 #include <Handle_SelectBasics_SensitiveEntity.hxx>
 
-class TColStd_HArray1OfInteger;
 class SelectMgr_SelectionManager;
 class SelectMgr_Selection;
 class SelectMgr_SensitiveEntitySet;
 class SelectMgr_EntityOwner;
-class TColStd_ListOfInteger;
 class TCollection_AsciiString;
 class SelectBasics_SensitiveEntity;
 class SelectMgr_SelectableObjectSet;

diff --git a/src/ShapeFix/ShapeFix_FixSmallSolid.cxx b/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
index 70a82bcd42138cbf61d31300aa20e22d9cffdd1a..cfa44f70c41304b2fb67eb4e3ee5a30d34ec420d 100644 (file)
--- a/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
+++ b/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
@@ -157,7 +157,7 @@ static void AddToMap (TopTools_DataMapOfShapeListOfShape& theMap,
                       const TopoDS_Shape& theKey,
                       const TopoDS_Shape& theItem)
 {
-  Standard_Address aListPtr = theMap.ChangeFind1 (theKey);
+  TopTools_ListOfShape* aListPtr = theMap.ChangeSeek (theKey);
   if (aListPtr == NULL)
   {
     TopTools_ListOfShape aList;
@@ -165,7 +165,7 @@ static void AddToMap (TopTools_DataMapOfShapeListOfShape& theMap,
     theMap.Bind (theKey, aList);
   }
   else
-    ((TopTools_ListOfShape*)aListPtr)->Append (theItem);
+    aListPtr->Append (theItem);
 }
 
 //=======================================================================
@@ -179,11 +179,11 @@ static void AddToMap (TopTools_DataMapOfShapeListOfShape& theMap,
 {
   if (theItems.IsEmpty()) return;
 
-  Standard_Address aListPtr = theMap.ChangeFind1 (theKey);
+  TopTools_ListOfShape* aListPtr = theMap.ChangeSeek (theKey);
   if (aListPtr == NULL)
     theMap.Bind (theKey, theItems);
   else
-    ((TopTools_ListOfShape*)aListPtr)->Append (theItems);
+    aListPtr->Append (theItems);
 }
 
 //=======================================================================
@@ -247,17 +247,17 @@ static Standard_Boolean FindMostSharedShell (
       if (aFace.ShapeType() != TopAbs_FACE) continue;
     
       // find an outer shell that shares the current face
-      Standard_Address anOuterShellPtr = theMapFacesToOuterShells.Find1 (aFace);
+      const TopoDS_Shape* anOuterShellPtr = theMapFacesToOuterShells.Seek (aFace);
       if (anOuterShellPtr == NULL) continue;
-      const TopoDS_Shape& anOuterShell = *(TopoDS_Shape*)anOuterShellPtr;
+      const TopoDS_Shape& anOuterShell = *anOuterShellPtr;
     
       // add the face area to the sum shared area for the outer shell
       Standard_Real anArea = ShapeArea (aFace);
-      Standard_Address aSharedAreaPtr = aSharedAreas.ChangeFind1 (anOuterShell);
+      Standard_Real* aSharedAreaPtr = aSharedAreas.ChangeSeek (anOuterShell);
       if (aSharedAreaPtr == NULL)
         aSharedAreas.Bind (anOuterShell, anArea);
       else
-        anArea = *(Standard_Real*)aSharedAreaPtr += anArea;
+        anArea = (*aSharedAreaPtr) += anArea;
     
       // if this outer shell currently has maximum shared area,
       // remember it and the current solid's shell
@@ -328,10 +328,10 @@ static TopoDS_Shape MergeShells (
       }
 
       // classify the face
-      Standard_Address anOuterShellPtr = theMapFacesToOuterShells.Find1 (aFace);
+      const TopoDS_Shape* anOuterShellPtr = theMapFacesToOuterShells.Seek (aFace);
       if (anOuterShellPtr != NULL)
       {
-        if (((TopoDS_Shape*)anOuterShellPtr)->IsSame (theBaseShell))
+        if (anOuterShellPtr->IsSame (theBaseShell))
           aRemoveFaces.Add (aFace);        // face shared with the base shell
         else
           aBuilder.Add (aNewShell, aFace); // face shared with another outer shell
@@ -478,7 +478,7 @@ TopoDS_Shape ShapeFix_FixSmallSolid::Merge (
       TopTools_ListOfShape& aShellsToBeMerged =
         (TopTools_ListOfShape&)aShellIter.Value();
       TopTools_ListOfShape* aShellsToBeAddedPtr =
-        (TopTools_ListOfShape*)aShellsToAdd.ChangeFind1 (aBaseShell);
+        aShellsToAdd.ChangeSeek (aBaseShell);
 
       // merge needed shells
       TopoDS_Shape aNewShell = MergeShells (aBaseShell, aShellsToBeMerged,

diff --git a/src/StdPrs/StdPrs_ToolShadedShape.hxx b/src/StdPrs/StdPrs_ToolShadedShape.hxx
index 44a9922510add3059093e193eaa6770f37824893..650db6bd3c23ba889fc510fb8738f4af572a71f0 100644 (file)
--- a/src/StdPrs/StdPrs_ToolShadedShape.hxx
+++ b/src/StdPrs/StdPrs_ToolShadedShape.hxx
@@ -18,13 +18,13 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Macro.hxx>
 #include <Handle_Poly_Triangulation.hxx>
+#include <TColgp_Array1OfDir.hxx>
 
 class TopoDS_Shape;
 class Poly_Triangulation;
 class TopoDS_Face;
 class TopLoc_Location;
 class Poly_Connect;
-class TColgp_Array1OfDir;
 
 class StdPrs_ToolShadedShape
 {

diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.hxx b/src/StdSelect/StdSelect_ViewerSelector3d.hxx
index ee74c21fded18f1093f0912546962f2af95425ae..5dbe23e670394d1a6de39865aa4562179dcdda0b 100644 (file)
--- a/src/StdSelect/StdSelect_ViewerSelector3d.hxx
+++ b/src/StdSelect/StdSelect_ViewerSelector3d.hxx
@@ -33,7 +33,6 @@
 class Graphic3d_Group;
 class Graphic3d_Structure;
 class V3d_View;
-class TColgp_Array1OfPnt2d;
 class SelectMgr_EntityOwner;
 class SelectMgr_SelectableObjectSet;
 

diff --git a/src/TDF/TDF_AttributeIndexedMap.hxx b/src/TDF/TDF_AttributeIndexedMap.hxx
index 45c54f9b0698f0e0089bf75300ef8c24b93c1299..b6e99d9e01ad0e480449ea2f91761dbb9a214bb3 100644 (file)
--- a/src/TDF/TDF_AttributeIndexedMap.hxx
+++ b/src/TDF/TDF_AttributeIndexedMap.hxx
@@ -16,7 +16,7 @@
 #ifndef TDF_AttributeIndexedMap_HeaderFile
 #define TDF_AttributeIndexedMap_HeaderFile
 
-#include <TDF_Attribute.hxx>
+#include <Handle_TDF_Attribute.hxx>
 #include <TColStd_MapTransientHasher.hxx>
 #include <NCollection_IndexedMap.hxx>
 

diff --git a/src/TNaming/TNaming.cdl b/src/TNaming/TNaming.cdl
index 079acc5e7de51b026a2495a9b9862cd504d18438..176c55a8563d4e7ad7a764ad668ab5e902b8deb7 100644 (file)
--- a/src/TNaming/TNaming.cdl
+++ b/src/TNaming/TNaming.cdl
@@ -227,11 +227,7 @@ is
     imported DataMapOfShapePtrRefShape;
        
     imported DataMapIteratorOfDataMapOfShapePtrRefShape;
-    
-
-    pointer PtrDataMapOfShapePtrRefShape to DataMapOfShapePtrRefShape from TNaming;
 
-   
     ---Category: private classes for ANaming
     --           ===========================
 

diff --git a/src/TNaming/TNaming_NamedShape.cxx b/src/TNaming/TNaming_NamedShape.cxx
index 0ecbc208df0e4c690dd0a821452f59d7d1c9e8ad..2d0930b1186d3c0ddd8af9c2e450c9f08c2231b2 100644 (file)
--- a/src/TNaming/TNaming_NamedShape.cxx
+++ b/src/TNaming/TNaming_NamedShape.cxx
@@ -24,7 +24,6 @@
 #include <TNaming_PtrNode.hxx>
 #include <TNaming_PtrRefShape.hxx>
 #include <TNaming_RefShape.hxx>
-#include <TNaming_PtrDataMapOfShapePtrRefShape.hxx>
 #include <TNaming_UsedShapes.hxx>
 #include <TNaming_Tool.hxx>
 #include <TNaming_Iterator.hxx>

diff --git a/src/TObj/TObj_Application.hxx b/src/TObj/TObj_Application.hxx
index caa84a83ab865cec999271ba6dbb90988d1be06e..ee3eac6596ebc21ee7754c6a455a0de829a500cc 100644 (file)
--- a/src/TObj/TObj_Application.hxx
+++ b/src/TObj/TObj_Application.hxx
@@ -22,9 +22,9 @@
 #include <TObj_Common.hxx>
 #include <Message_Gravity.hxx>
 #include <Message_Messenger.hxx>
+#include <TColStd_SequenceOfExtendedString.hxx>
 
 class Handle(TObj_Application);
-class TColStd_SequenceOfExtendedString;
 
 //!
 //! This is a base class for OCAF based TObj models

diff --git a/src/TObj/TObj_Assistant.hxx b/src/TObj/TObj_Assistant.hxx
index 9d67ddd89378883daae209668a1570f97af8c894..faaaf9d5722b6d0257db27bc06370edf8327bcd8 100644 (file)
--- a/src/TObj/TObj_Assistant.hxx
+++ b/src/TObj/TObj_Assistant.hxx
@@ -19,11 +19,11 @@
 #define TObj_Assistant_HeaderFile
 
 #include <TObj_Common.hxx>
+#include <TColStd_SequenceOfTransient.hxx>
+#include <TColStd_SequenceOfAsciiString.hxx>
+#include <TColStd_IndexedMapOfTransient.hxx>
 
 class Handle(TObj_Model);
-class TColStd_SequenceOfTransient;
-class TColStd_SequenceOfAsciiString;
-class TColStd_IndexedMapOfTransient;
 
 //! This class provides interface to the static data
 //! to be used during save or load models.

diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceIterator.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceIterator.cdl
index 8842c91a4d326c83dd8d29ffc0f992a6fe164267..18b0e678db194eca57bfba71d289d54f8b7fb619 100644 (file)
--- a/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceIterator.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceIterator.cdl
@@ -88,10 +88,10 @@ is
     ---Purpose: Move to the next Interference.
     is static;
 
-    Value(me) returns any Interference from TopOpeBRepDS
+    Value(me) returns Interference from TopOpeBRepDS
     ---Purpose: Returns   the   current   Interference,   matching   the
     --          conditions  (if defined).
-    ---C++: return &
+    ---C++: return const &
     is static;
 
     ChangeIterator(me : in out)

diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceIterator.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceIterator.cxx
index 548b69201e61475793e5062e52c4b69eaaa67159..eead1ced4ce2a18dec7fb1a184e8e4bcf3c5868d 100644 (file)
--- a/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceIterator.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceIterator.cxx
@@ -171,7 +171,7 @@ void TopOpeBRepDS_InterferenceIterator::Next()
 //purpose  : 
 //=======================================================================
 
-Handle(TopOpeBRepDS_Interference)& TopOpeBRepDS_InterferenceIterator::Value() const 
+const Handle(TopOpeBRepDS_Interference)& TopOpeBRepDS_InterferenceIterator::Value() const 
 {
   return myIterator.Value();
 }

diff --git a/src/TopOpeBRepTool/FILES b/src/TopOpeBRepTool/FILES
index 49e1e8e9f439b6e8ee5f16a4c99f2fa047f9b837..33fe3b06f3a33c6e03bce39c494ca0f965ba1e97 100755 (executable)
--- a/src/TopOpeBRepTool/FILES
+++ b/src/TopOpeBRepTool/FILES
@@ -42,3 +42,4 @@ TopOpeBRepTool_IndexedDataMapOfShapeBox.hxx
 TopOpeBRepTool_IndexedDataMapOfShapeconnexity.hxx
 TopOpeBRepTool_DataMapOfShapeface.hxx
 TopOpeBRepTool_DataMapIteratorOfDataMapOfShapeface.hxx
+TopOpeBRepTool_Plos.hxx

diff --git a/src/TopOpeBRepTool/TopOpeBRepTool.cdl b/src/TopOpeBRepTool/TopOpeBRepTool.cdl
index e1c303feab97a9d20f3c8fbe9265a2f70496d2e2..25892e792a36a3eda57229729417227ba17bf8dc 100644 (file)
--- a/src/TopOpeBRepTool/TopOpeBRepTool.cdl
+++ b/src/TopOpeBRepTool/TopOpeBRepTool.cdl
@@ -67,7 +67,7 @@ is
     
     imported IndexedDataMapOfSolidClassifier;
         
-    pointer Plos to ListOfShape from TopTools;
+    imported Plos;
     class SolidClassifier;
     
     class CurveTool;

diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx
index 35707098ff3e46832308cd4d1d7605f53a6210d2..2d0ed32735f48ded3ee637d1e7fe33856576b789 100644 (file)
--- a/src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx
@@ -308,7 +308,7 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges()
       TopTools_ListIteratorOfListOfShape itEdg; 
 #endif
 
-      TopoDS_Edge& OldEdge = TopoDS::Edge(LmapEdg.First());
+      const TopoDS_Edge& OldEdge = TopoDS::Edge(LmapEdg.First());
 
       // the first edge of the list will be replaced by the result fusion edge
       if (OldEdge.Orientation()==TopAbs_REVERSED) {
@@ -407,7 +407,7 @@ void TopOpeBRepTool_FuseEdges::Perform()
       TopTools_ListIteratorOfListOfShape itEdg; 
 
       EdgeToSubs.Clear();
-      TopoDS_Edge& OldEdge = TopoDS::Edge(LmapEdg.First());
+      const TopoDS_Edge& OldEdge = TopoDS::Edge(LmapEdg.First());
 
 
       EdgeToSubs.Append(myMapEdg(iLst));

diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_Plos.hxx b/src/TopOpeBRepTool/TopOpeBRepTool_Plos.hxx
new file mode 100644 (file)
index 0000000..d4c3bf8
--- /dev/null
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_Plos.hxx
@@ -0,0 +1,24 @@
+// Created on: 1994-03-10
+// Created by: Jean Yves LEBEY
+// Copyright (c) 1994-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 _TopOpeBRepTool_Plos_HeaderFile
+#define _TopOpeBRepTool_Plos_HeaderFile
+
+#include <TopTools_ListOfShape.hxx>
+
+typedef TopTools_ListOfShape* TopOpeBRepTool_Plos;
+
+#endif // _TopOpeBRepTool_Plos_HeaderFile

diff --git a/src/TopoDS/TopoDS_ListOfShape.hxx b/src/TopoDS/TopoDS_ListOfShape.hxx
index be26901b42d475130d01b3baaf7dac4ce2e8513d..817d90ac4973d2cc02baf149ae0df4d8458b1daa 100644 (file)
--- a/src/TopoDS/TopoDS_ListOfShape.hxx
+++ b/src/TopoDS/TopoDS_ListOfShape.hxx
@@ -17,9 +17,9 @@
 #ifndef TopoDS_ListOfShape_HeaderFile
 #define TopoDS_ListOfShape_HeaderFile
 
-#include <TopoDS_Shape.hxx>
 #include <NCollection_List.hxx>
 
+class TopoDS_Shape;
 typedef NCollection_List<TopoDS_Shape> TopoDS_ListOfShape;
 typedef NCollection_List<TopoDS_Shape>::Iterator TopoDS_ListIteratorOfListOfShape;
 

diff --git a/src/ViewerTest/ViewerTest.hxx b/src/ViewerTest/ViewerTest.hxx
index 2e7cc4e3b33e0d9b65046993bf18307d43ed6ae5..96800dfabadefbeac7f6981595230b42543805da 100644 (file)
--- a/src/ViewerTest/ViewerTest.hxx
+++ b/src/ViewerTest/ViewerTest.hxx
@@ -26,10 +26,10 @@
 #include <Standard_Boolean.hxx>
 #include <Handle_MMgt_TShared.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-#include <Handle_TopTools_HArray1OfShape.hxx>
+#include <TopTools_HArray1OfShape.hxx>
 #include <Handle_AIS_InteractiveObject.hxx>
 #include <AIS_KindOfInteractive.hxx>
-#include <Handle_TColStd_HArray1OfTransient.hxx>
+#include <TColStd_HArray1OfTransient.hxx>
 #include <Handle_V3d_Viewer.hxx>
 #include <Handle_AIS_InteractiveContext.hxx>
 #include <Handle_ViewerTest_EventManager.hxx>
@@ -39,16 +39,11 @@ class TCollection_AsciiString;
 class V3d_View;
 class MMgt_TShared;
 class TopoDS_Shape;
-class TopTools_HArray1OfShape;
 class AIS_InteractiveObject;
-class TColStd_HArray1OfTransient;
 class V3d_Viewer;
 class AIS_InteractiveContext;
 class ViewerTest_EventManager;
 class ViewerTest_EventManager;
-class ViewerTest_DoubleMapOfInteractiveAndName;
-class ViewerTest_DoubleMapNodeOfDoubleMapOfInteractiveAndName;
-class ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName;
 class Quantity_Color;
 
 class ViewerTest
@@ -207,12 +202,6 @@ private:
   //! This method is relevant for MS Windows only and respectively
   //! returns WNT_WClass handle.
   Standard_EXPORT static const Handle(MMgt_TShared)& WClass();
-
-friend class ViewerTest_EventManager;
-friend class ViewerTest_DoubleMapOfInteractiveAndName;
-friend class ViewerTest_DoubleMapNodeOfDoubleMapOfInteractiveAndName;
-friend class ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName;
-
 };
 
 #endif // _ViewerTest_HeaderFile

diff --git a/src/math/math_FunctionAllRoots.cxx b/src/math/math_FunctionAllRoots.cxx
index c2b13913c7b9d3610b9656ccfaf795eda8e067b8..7815ce495d5d3e3922c744a9d7f9520420e06a33 100644 (file)
--- a/src/math/math_FunctionAllRoots.cxx
+++ b/src/math/math_FunctionAllRoots.cxx
@@ -37,8 +37,8 @@ math_FunctionAllRoots::math_FunctionAllRoots (
 
 
     Standard_Boolean Nul, PNul, InterNul, Nuld, Nulf;
-    Standard_Real DebNul,FinNul;
-    Standard_Integer Indd,Indf;
+    Standard_Real DebNul = 0., FinNul = 0.;
+    Standard_Integer Indd = 0, Indf = 0;
     Standard_Real cst,val,valsav=0,valbid;
     Standard_Boolean fini;
     Standard_Integer Nbp,i;