0025609: Clean up the duplicate classes in TKBO project

1. The package BOPCol has been fully removed:
- *BOPCol_BaseAllocator* is replaced with *Handle(NCollection_BaseAllocator)*;
- *BOPCol_BoxBndTree* is replaced with *BOPTools_BoxBndTree*;
- *BOPCol_Box2DBndTree* is removed as unused;
- *BOPCol_DataMapOfIntegerInteger* is replaced with *TColStd_DataMapOfIntegerInteger*;
- *BOPCol_DataMapOfIntegerListOfInteger* is replaced with *TColStd_DataMapOfIntegerListOfInteger*;
- *BOPCol_DataMapOfIntegerListOfShape* is replaced with *TopTools_DataMapOfIntegerListOfShape*;
- *BOPCol_DataMapOfIntegerMapOfInteger.hxx* is removed as unused;
- *BOPCol_DataMapOfIntegerReal* is replaced with *TColStd_DataMapOfIntegerReal*;
- *BOPCol_DataMapOfIntegerShape* is replaced with *TopTools_DataMapOfIntegerShape*;
- *BOPCol_DataMapOfShapeBox* is replaced with *TopTools_DataMapOfShapeBox*;
- *BOPCol_DataMapOfShapeInteger* is replaced with *TopTools_DataMapOfShapeInteger*;
- *BOPCol_DataMapOfShapeListOfShape* is replaced with *TopTools_DataMapOfShapeListOfShape*;
- *BOPCol_DataMapOfShapeReal* is replaced with *TopTools_DataMapOfShapeReal*;
- *BOPCol_DataMapOfShapeShape* is replaced with *TopTools_DataMapOfShapeShape*;
- *BOPCol_DataMapOfTransientAddress* is removed as unused;
- *BOPCol_IndexedDataMapOfIntegerListOfInteger* is removed as unused;
- *BOPCol_IndexedDataMapOfShapeBox* is removed as unused;
- *BOPCol_IndexedDataMapOfShapeInteger* is removed as unused;
- *BOPCol_IndexedDataMapOfShapeListOfShape* is replaced with *TopTools_IndexedDataMapOfShapeListOfShape*;
- *BOPCol_IndexedDataMapOfShapeReal* is removed as unused;
- *BOPCol_IndexedDataMapOfShapeShape* is replaced with *TopTools_IndexedDataMapOfShapeShape*;
- *BOPCol_IndexedMapOfInteger* is replaced with *TColStd_IndexedMapOfInteger*;
- *BOPCol_IndexedMapOfOrientedShape* is replaced with *TopTools_IndexedMapOfOrientedShape*;
- *BOPCol_IndexedMapOfShape* is replaced with *TopTools_IndexedMapOfShape*;
- *BOPCol_ListOfInteger* is replaced with *TColStd_ListOfInteger*;
- *BOPCol_ListOfListOfShape* is replaced with *TopTools_ListOfListOfShape*;
- *BOPCol_ListOfShape* is replaced with *TopTools_ListOfShape*;
- *BOPCol_MapOfInteger* is replaced with *TColStd_MapOfInteger*;
- *BOPCol_MapOfOrientedShape* is replaced with *TopTools_MapOfOrientedShape*;
- *BOPCol_MapOfShape* is replaced with *TopTools_MapOfShape*;
- *BOPCol_PListOfInteger* is removed as unused;
- *BOPCol_PInteger* is removed as unused
- *BOPCol_SequenceOfPnt2d* is replaced with *TColgp_SequenceOfPnt2d*;
- *BOPCol_SequenceOfReal* is replaced with *TColStd_SequenceOfReal*;
- *BOPCol_SequenceOfShape* is replaced with *TopTools_SequenceOfShape*;
- *BOPCol_Parallel* is replaced with *BOPTools_Parallel*;
- *BOPCol_NCVector* is replaced with *NCollection_Vector*;

2. The class *BOPDS_PassKey* and containers for it have been removed as unused;

3. The unused containers from *IntTools* package have been removed:
- *IntTools_DataMapOfShapeAddress* is removed as unused;
- *IntTools_IndexedDataMapOfTransientAddress* is removed as unused;

4. The container *BiTgte_DataMapOfShapeBox* is replaced with *TopTools_DataMapOfShapeBox*;

5. The class *BOPTools* has been removed as duplicate of the class *TopExp*;

src/BOPTest/BOPTest_APICommands.cxx

@@ -14,7 +14,6 @@
 
 
 #include <BOPAlgo_PaveFiller.hxx>
-#include <BOPCol_ListOfShape.hxx>
 #include <BOPTest.hxx>
 #include <BOPTest_Objects.hxx>
 #include <BRepAlgoAPI_BooleanOperation.hxx>
@@ -31,9 +30,6 @@
 
 #include <stdio.h>
 #include <string.h>
-static 
-  void ConvertList(const BOPCol_ListOfShape& aLSB,
-                   TopTools_ListOfShape& aLS);
 
 static Standard_Integer bapibuild(Draw_Interpretor&, Standard_Integer, const char**);
 static Standard_Integer bapibop  (Draw_Interpretor&, Standard_Integer, const char**);
@@ -108,12 +104,8 @@ Standard_Integer bapibop(Draw_Interpretor& di,
      break;
   }
   //
-  BOPCol_ListOfShape& aLSB=BOPTest_Objects::Shapes();
-  BOPCol_ListOfShape& aLTB=BOPTest_Objects::Tools();
-  //
-  TopTools_ListOfShape aLS, aLT;
-  ConvertList(aLSB, aLS);
-  ConvertList(aLTB, aLT);
+  TopTools_ListOfShape& aLS=BOPTest_Objects::Shapes();
+  TopTools_ListOfShape& aLT=BOPTest_Objects::Tools();
   //
   bRunParallel=BOPTest_Objects::RunParallel();
   aFuzzyValue=BOPTest_Objects::FuzzyValue();
@@ -177,13 +169,10 @@ Standard_Integer bapibuild(Draw_Interpretor& di,
   Standard_Real aFuzzyValue;
   BRepAlgoAPI_BuilderAlgo aBuilder;
   //
-  BOPCol_ListOfShape& aLSB=BOPTest_Objects::Shapes();
-  BOPCol_ListOfShape& aLTB=BOPTest_Objects::Tools();
-  //
-  TopTools_ListOfShape aLS;
-  ConvertList(aLSB, aLS);
-  ConvertList(aLTB, aLS);
+  TopTools_ListOfShape aLS = BOPTest_Objects::Shapes();
+  TopTools_ListOfShape aLT = BOPTest_Objects::Tools();
   //
+  aLS.Append(aLT);
   bRunParallel=BOPTest_Objects::RunParallel();
   aFuzzyValue=BOPTest_Objects::FuzzyValue();
   bNonDestructive = BOPTest_Objects::NonDestructive();
@@ -221,21 +210,6 @@ Standard_Integer bapibuild(Draw_Interpretor& di,
   DBRep::Set(a[1], aR);
   return 0;
 }
-//=======================================================================
-//function : ConvertLists
-//purpose  : 
-//=======================================================================
-void ConvertList(const BOPCol_ListOfShape& aLSB,
-                 TopTools_ListOfShape& aLS)
-{
-  BOPCol_ListIteratorOfListOfShape aItB;
-  //
-  aItB.Initialize(aLSB);
-  for (; aItB.More(); aItB.Next()) {
-    const TopoDS_Shape& aS=aItB.Value();
-    aLS.Append(aS);
-  }
-}
 
 //=======================================================================
 //function : bapisplit

src/BOPTest/BOPTest_BOPCommands.cxx

@@ -19,7 +19,6 @@
 #include <BOPAlgo_Operation.hxx>
 #include <BOPAlgo_PaveFiller.hxx>
 #include <BOPAlgo_Section.hxx>
-#include <BOPCol_ListOfShape.hxx>
 #include <BOPDS_DS.hxx>
 #include <BOPTest.hxx>
 #include <BOPTest_Objects.hxx>
@@ -42,6 +41,7 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
+#include <TopTools_ListOfShape.hxx>
 
 #include <stdio.h>
 //
@@ -122,7 +122,7 @@ Standard_Integer bop(Draw_Interpretor& di,
   Standard_Boolean bRunParallel, bNonDestructive;
   Standard_Real aTol;
   TopoDS_Shape aS1, aS2;
-  BOPCol_ListOfShape aLC;
+  TopTools_ListOfShape aLC;
   //
   if (n != 3) {
     di << " use bop s1 s2 \n";
@@ -233,7 +233,7 @@ Standard_Integer bopsmt(Draw_Interpretor& di,
   Standard_Integer aNb;
   BOPAlgo_BOP aBOP;
   //
-  const BOPCol_ListOfShape& aLC=pPF->Arguments();
+  const TopTools_ListOfShape& aLC=pPF->Arguments();
   aNb=aLC.Extent();
   if (aNb!=2) {
     Sprintf (buf, " wrong number of arguments %s\n", aNb);
@@ -295,7 +295,7 @@ Standard_Integer bopsection(Draw_Interpretor& di,
   Standard_Integer aNb;
   BOPAlgo_Section aBOP;
   //
-  const BOPCol_ListOfShape& aLC=pPF->Arguments();
+  const TopTools_ListOfShape& aLC=pPF->Arguments();
   aNb=aLC.Extent();
   if (aNb!=2) {
     Sprintf (buf, " wrong number of arguments %s\n", aNb);
@@ -462,7 +462,7 @@ Standard_Integer bsmt (Draw_Interpretor& di,
 {
   Standard_Boolean bRunParallel, bNonDestructive;
   TopoDS_Shape aS1, aS2;
-  BOPCol_ListOfShape aLC;
+  TopTools_ListOfShape aLC;
   Standard_Real aTol;
   //
   if (n != 4) {
@@ -756,7 +756,7 @@ Standard_Integer mkvolume(Draw_Interpretor& di, Standard_Integer n, const char**
   Standard_Integer i;
   Standard_Real aTol;
   TopoDS_Shape aS;
-  BOPCol_ListOfShape aLS;
+  TopTools_ListOfShape aLS;
   //
   aTol = BOPTest_Objects::FuzzyValue();
   bRunParallel = BOPTest_Objects::RunParallel();
@@ -793,8 +793,8 @@ Standard_Integer mkvolume(Draw_Interpretor& di, Standard_Integer n, const char**
   //
   // treat list of arguments for the case of compounds
   if (bToIntersect && bCompounds) {
-    BOPCol_ListOfShape aLSx;
-    BOPCol_ListIteratorOfListOfShape aItLS;
+    TopTools_ListOfShape aLSx;
+    TopTools_ListIteratorOfListOfShape aItLS;
     //
     aItLS.Initialize(aLS);
     for (; aItLS.More(); aItLS.Next()) {

src/BOPTest/BOPTest_CellsCommands.cxx

@@ -80,21 +80,21 @@ Standard_Integer bcbuild(Draw_Interpretor& di,
     return 1;
   }
   //
-  BOPCol_ListIteratorOfListOfShape aIt;
+  TopTools_ListIteratorOfListOfShape aIt;
   //
   BOPAlgo_PaveFiller& aPF = BOPTest_Objects::PaveFiller();
   //
   BOPAlgo_CellsBuilder& aCBuilder = BOPTest_Objects::CellsBuilder();
   aCBuilder.Clear();
   //
-  BOPCol_ListOfShape& aLSObj = BOPTest_Objects::Shapes();
+  TopTools_ListOfShape& aLSObj = BOPTest_Objects::Shapes();
   aIt.Initialize(aLSObj);
   for (; aIt.More(); aIt.Next()) {
     const TopoDS_Shape& aS = aIt.Value();
     aCBuilder.AddArgument(aS);
   }
   //
-  BOPCol_ListOfShape& aLSTool = BOPTest_Objects::Tools();
+  TopTools_ListOfShape& aLSTool = BOPTest_Objects::Tools();
   aIt.Initialize(aLSTool);
   for (; aIt.More(); aIt.Next()) {
     const TopoDS_Shape& aS = aIt.Value();
@@ -202,7 +202,7 @@ Standard_Integer bcadd(Draw_Interpretor& di,
     return 1;
   }
   //
-  BOPCol_ListOfShape aLSToTake, aLSToAvoid;
+  TopTools_ListOfShape aLSToTake, aLSToAvoid;
   Standard_Integer i, iMaterial, iTake, n1;
   Standard_Boolean bUpdate;
   //
@@ -266,7 +266,7 @@ Standard_Integer bcremove(Draw_Interpretor& di,
     return 1;
   }
   //
-  BOPCol_ListOfShape aLSToTake, aLSToAvoid;
+  TopTools_ListOfShape aLSToTake, aLSToAvoid;
   Standard_Integer i, iTake;
   //
   for (i = 2; i < n; i += 2) {

src/BOPTest/BOPTest_CheckCommands.cxx

@@ -16,7 +16,6 @@
 #include <BOPAlgo_ArgumentAnalyzer.hxx>
 #include <BOPAlgo_CheckerSI.hxx>
 #include <BOPAlgo_CheckResult.hxx>
-#include <BOPCol_ListOfShape.hxx>
 #include <BOPDS_DS.hxx>
 #include <BOPDS_MapOfPair.hxx>
 #include <BOPTest.hxx>
@@ -31,6 +30,7 @@
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Shape.hxx>
+#include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
 
@@ -41,7 +41,7 @@
 static 
   void MakeShapeForFullOutput (const TCollection_AsciiString&,
                                const Standard_Integer,
-                               const BOPCol_ListOfShape&,
+                               const TopTools_ListOfShape&,
                                Standard_Integer& ,
                                Draw_Interpretor&,
                                Standard_Boolean bCurveOnSurf = Standard_False,
@@ -206,7 +206,7 @@ Standard_Integer bopcheck (Draw_Interpretor& di,
   Standard_Integer iErr, iCnt, n1, n2, iT;
   TopAbs_ShapeEnum aType1, aType2;
   BOPAlgo_CheckerSI aChecker;
-  BOPCol_ListOfShape aLS;
+  TopTools_ListOfShape aLS;
   BOPDS_MapIteratorOfMapOfPair aItMPK;
   //
   if (aLevel < (aNbInterfTypes-1)) {
@@ -581,8 +581,8 @@ Standard_Integer bopargcheck (Draw_Interpretor& di,
         const BOPAlgo_CheckResult& aResult = anIt.Value();
         const TopoDS_Shape & aSS1 = aResult.GetShape1();
         const TopoDS_Shape & aSS2 = aResult.GetShape2();
-        const BOPCol_ListOfShape & aLS1 = aResult.GetFaultyShapes1();
-        const BOPCol_ListOfShape & aLS2 = aResult.GetFaultyShapes2();
+        const TopTools_ListOfShape & aLS1 = aResult.GetFaultyShapes1();
+        const TopTools_ListOfShape & aLS2 = aResult.GetFaultyShapes2();
         Standard_Boolean isL1 = !aLS1.IsEmpty();
         Standard_Boolean isL2 = !aLS2.IsEmpty();
 
@@ -977,7 +977,7 @@ Standard_Integer checkcurveonsurf(Draw_Interpretor& di,
   TopExp_Explorer aExpF, aExpE;
   char buf[200], aFName[10], anEName[10];
   NCollection_DataMap<TopoDS_Shape, Standard_Real, TopTools_ShapeMapHasher> aDMETol;
-  BOPCol_DataMapOfShapeInteger aMSI;
+  TopTools_DataMapOfShapeInteger aMSI;
   //
   anECounter = 0;
   aFCounter  = 0;
@@ -1077,7 +1077,7 @@ Standard_Integer checkcurveonsurf(Draw_Interpretor& di,
 //=======================================================================
 void MakeShapeForFullOutput (const TCollection_AsciiString & aBaseName,
                              const Standard_Integer          aIndex,
-                             const BOPCol_ListOfShape &      aList,
+                             const TopTools_ListOfShape &      aList,
                              Standard_Integer&               aCount,
                              Draw_Interpretor&               di,
                              Standard_Boolean                bCurveOnSurf,
@@ -1092,7 +1092,7 @@ void MakeShapeForFullOutput (const TCollection_AsciiString & aBaseName,
   BRep_Builder BB;
   BB.MakeCompound(cmp);
 
-  BOPCol_ListIteratorOfListOfShape anIt(aList);
+  TopTools_ListIteratorOfListOfShape anIt(aList);
   for(; anIt.More(); anIt.Next()) {
     const TopoDS_Shape & aS = anIt.Value();
     BB.Add(cmp, aS);

src/BOPTest/BOPTest_DebugCommands.cxx

@@ -36,9 +36,9 @@
 #include <BOPAlgo_BuilderFace.hxx>
 #include <BOPAlgo_BuilderSolid.hxx>
 
-#include <BOPCol_MapOfShape.hxx>
-#include <BOPCol_DataMapOfShapeShape.hxx>
-#include <BOPCol_DataMapOfShapeListOfShape.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
+#include <TopTools_DataMapOfShapeListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
 
 
 static
@@ -49,13 +49,13 @@ static
                      char* theName);
 
 template <class InterfType> static
-  void DumpInterfs(const BOPCol_NCVector<InterfType>& theVInterf,
+  void DumpInterfs(const NCollection_Vector<InterfType>& theVInterf,
                    Draw_Interpretor& di);
 
 template <class InterfType> static
   void SearchNewIndex(const char* theCType,
                       const Standard_Integer theInd,
-                      const BOPCol_NCVector<InterfType>& theVInterf,
+                      const NCollection_Vector<InterfType>& theVInterf,
                       Draw_Interpretor& di);
 static 
   Standard_Integer bopfinfo(Draw_Interpretor& di,
@@ -426,13 +426,13 @@ Standard_Integer bopwho (Draw_Interpretor& di,
   //
   bFound = Standard_False;
   BOPDS_VectorOfInterfFF& aFFs = pDS->InterfFF();
-  aNb = aFFs.Extent();
+  aNb = aFFs.Length();
   for (i = 0; i < aNb; ++i) {
     const BOPDS_InterfFF& anInt = aFFs(i);
     anInt.Indices(n1, n2);
     //
     const BOPDS_VectorOfCurve& aVNC = anInt.Curves();
-    aNbC = aVNC.Extent();
+    aNbC = aVNC.Length();
     for (k = 0; k < aNbC; ++k) {
       const BOPDS_Curve& aNC = aVNC(k);
       const BOPDS_ListOfPaveBlock& aLPB = aNC.PaveBlocks(); 
@@ -457,7 +457,7 @@ Standard_Integer bopwho (Draw_Interpretor& di,
     //
     bFound = Standard_False;
     const BOPDS_VectorOfPoint& aVNP = anInt.Points();
-    aNbP = aVNP.Extent();
+    aNbP = aVNP.Length();
     for (k = 0; k < aNbP; ++k) {
       const BOPDS_Point& aNP = aVNP(k);
       nV1 = aNP.Index();
@@ -664,7 +664,7 @@ Standard_Integer bopsc(Draw_Interpretor& di,
   //
   iCnt = 0;
   iPriz = 0;
-  aNb = aFFs.Extent();
+  aNb = aFFs.Length();
   for (j = 0; j < aNb; ++j) {
     const BOPDS_InterfFF& aFF = aFFs(j);
     if (n == 3) {
@@ -678,7 +678,7 @@ Standard_Integer bopsc(Draw_Interpretor& di,
     //
     iX = 0;
     const BOPDS_VectorOfCurve& aVNC = aFF.Curves();
-    aNbC = aVNC.Extent();
+    aNbC = aVNC.Length();
     for (k = 0; k < aNbC; ++k) {
       const BOPDS_Curve& aNC = aVNC(k);
       const BOPDS_ListOfPaveBlock& aLPB = aNC.PaveBlocks();
@@ -711,7 +711,7 @@ Standard_Integer bopsc(Draw_Interpretor& di,
     //
     iX = 0;
     const BOPDS_VectorOfPoint& aVNP = aFF.Points();
-    aNbP = aVNP.Extent();
+    aNbP = aVNP.Length();
     for (k = 0; k < aNbP; ++k) {
       const BOPDS_Point& aNP = aVNP(k);
       nSp = aNP.Index();
@@ -1018,7 +1018,7 @@ Standard_Integer bopfinfo(Draw_Interpretor& di,
   BOPDS_FaceInfo& aFI = pDS->ChangeFaceInfo(nF);
   //
   BOPDS_IndexedMapOfPaveBlock aMPB;
-  BOPCol_MapOfInteger aMI;
+  TColStd_MapOfInteger aMI;
   if (iPriz == 0) {
     strcpy(aText, "On");
     aMPB = aFI.ChangePaveBlocksOn();
@@ -1050,7 +1050,7 @@ Standard_Integer bopfinfo(Draw_Interpretor& di,
   //
   if (aMI.Extent()) {
     printf(" vertices %s:\n", aText);
-    BOPCol_MapIteratorOfMapOfInteger aItMI(aMI);
+    TColStd_MapIteratorOfMapOfInteger aItMI(aMI);
     for (; aItMI.More(); aItMI.Next()) {
       nV = aItMI.Value();
       printf(" %d", nV);
@@ -1103,7 +1103,7 @@ Standard_Integer bopfav(Draw_Interpretor& di,
     return 0;
   }
   //
-  BOPCol_ListOfInteger aLI;
+  TColStd_ListOfInteger aLI;
   pDS->AloneVertices(nF, aLI);
   if (!aLI.Extent()) {
     di << " no alone vertices found\n";
@@ -1111,7 +1111,7 @@ Standard_Integer bopfav(Draw_Interpretor& di,
   }
   //
   di << " alone vertices: \n";
-  BOPCol_ListIteratorOfListOfInteger aItLI(aLI);
+  TColStd_ListIteratorOfListOfInteger aItLI(aLI);
   for (; aItLI.More(); aItLI.Next()) {
     nV = aItLI.Value();
     di << nV << " ";
@@ -1147,7 +1147,7 @@ Standard_Integer bopimage(Draw_Interpretor& di,
   }
   //
   BOPAlgo_Builder& aBuilder = BOPTest_Objects::Builder();
-  const BOPCol_DataMapOfShapeListOfShape& anImages = aBuilder.Images();
+  const TopTools_DataMapOfShapeListOfShape& anImages = aBuilder.Images();
   if (!anImages.IsBound(aS)) {
     di << " no images found\n"; 
     return 0;
@@ -1160,8 +1160,8 @@ Standard_Integer bopimage(Draw_Interpretor& di,
   //
   aBB.MakeCompound(aC);
   //
-  const BOPCol_ListOfShape& aLSIm = anImages.Find(aS);
-  BOPCol_ListIteratorOfListOfShape aIt(aLSIm);
+  const TopTools_ListOfShape& aLSIm = anImages.Find(aS);
+  TopTools_ListIteratorOfListOfShape aIt(aLSIm);
   for (i = 0; aIt.More(); aIt.Next(), ++i) {
     const TopoDS_Shape& aSIm = aIt.Value();
     aBB.Add(aC, aSIm);
@@ -1201,7 +1201,7 @@ Standard_Integer boporigin(Draw_Interpretor& di,
   }
   //
   BOPAlgo_Builder& aBuilder = BOPTest_Objects::Builder();
-  const BOPCol_DataMapOfShapeListOfShape& aDMI = aBuilder.Origins();
+  const TopTools_DataMapOfShapeListOfShape& aDMI = aBuilder.Origins();
   if (!aDMI.IsBound(aS)) {
     di << " no origins found\n"; 
     return 0;
@@ -1210,7 +1210,7 @@ Standard_Integer boporigin(Draw_Interpretor& di,
   char buf[32];
   sprintf(buf, "%s_or", a[1]);
   //
-  const BOPCol_ListOfShape& aLSx = aDMI.Find(aS);
+  const TopTools_ListOfShape& aLSx = aDMI.Find(aS);
   if (aLSx.Extent() == 1) {
     DBRep::Set(buf, aLSx.First());
     di << "1 origin found\n" << buf << "\n";
@@ -1220,7 +1220,7 @@ Standard_Integer boporigin(Draw_Interpretor& di,
   TopoDS_Compound aCOr;
   BRep_Builder().MakeCompound(aCOr);
   //
-  BOPCol_ListIteratorOfListOfShape aItLSx(aLSx);
+  TopTools_ListIteratorOfListOfShape aItLSx(aLSx);
   for (; aItLSx.More(); aItLSx.Next()) {
     BRep_Builder().Add(aCOr, aItLSx.Value());
   }
@@ -1259,7 +1259,7 @@ Standard_Integer bopfsd(Draw_Interpretor& di,
   }
   //
   BOPAlgo_Builder& aBuilder = BOPTest_Objects::Builder();
-  const BOPCol_DataMapOfShapeShape& aDMSD = aBuilder.ShapesSD();
+  const TopTools_DataMapOfShapeShape& aDMSD = aBuilder.ShapesSD();
   if (!aDMSD.IsBound(aS)) {
     di << " shape has no sd shape\n"; 
     return 0;
@@ -1272,7 +1272,7 @@ Standard_Integer bopfsd(Draw_Interpretor& di,
   //
   aBB.MakeCompound(aC);
   //
-  BOPCol_DataMapIteratorOfDataMapOfShapeShape aItSD;
+  TopTools_DataMapIteratorOfDataMapOfShapeShape aItSD;
   aItSD.Initialize(aDMSD);
   for (i = 0; aItSD.More(); aItSD.Next()) {
     const TopoDS_Shape& aSK = aItSD.Key();
@@ -1321,7 +1321,7 @@ Standard_Integer bopbface (Draw_Interpretor& di,
   }
   //
   TopoDS_Face aF;
-  BOPCol_ListOfShape aLE;
+  TopTools_ListOfShape aLE;
   Standard_Integer i;
   //
   TopoDS_Iterator aItS(aS);
@@ -1353,8 +1353,8 @@ Standard_Integer bopbface (Draw_Interpretor& di,
   }
   //
   char buf[128];
-  const BOPCol_ListOfShape& aLFR = aBF.Areas();
-  BOPCol_ListIteratorOfListOfShape aIt(aLFR);
+  const TopTools_ListOfShape& aLFR = aBF.Areas();
+  TopTools_ListIteratorOfListOfShape aIt(aLFR);
   for (i = 1; aIt.More(); aIt.Next(), ++i) {
     const TopoDS_Shape& aFR = aIt.Value();
     sprintf(buf, "%s_%d", a[1], i);
@@ -1392,7 +1392,7 @@ Standard_Integer bopbsolid (Draw_Interpretor& di,
     return 1;
   }
   //
-  BOPCol_ListOfShape aLF;
+  TopTools_ListOfShape aLF;
   TopExp_Explorer aExp(aS, TopAbs_FACE);
   for (; aExp.More(); aExp.Next()) {
     const TopoDS_Shape& aF = aExp.Current();
@@ -1419,8 +1419,8 @@ Standard_Integer bopbsolid (Draw_Interpretor& di,
   aBB.MakeCompound(aSolids);
   //
   char buf[128];
-  const BOPCol_ListOfShape& aLSR = aBS.Areas();
-  BOPCol_ListIteratorOfListOfShape aIt(aLSR);
+  const TopTools_ListOfShape& aLSR = aBS.Areas();
+  TopTools_ListIteratorOfListOfShape aIt(aLSR);
   for (i = 1; aIt.More(); aIt.Next(), ++i) {
     const TopoDS_Shape& aSR = aIt.Value();
     sprintf(buf, "%s_%d", a[1], i);
@@ -1528,13 +1528,13 @@ void GetNameByType(const TopAbs_ShapeEnum& theType,
 //purpose  : 
 //=======================================================================
 template <class InterfType> void DumpInterfs
-  (const BOPCol_NCVector<InterfType>& theVInterf,
+  (const NCollection_Vector<InterfType>& theVInterf,
    Draw_Interpretor& di)
 {
   Standard_Integer i, aNb, n1, n2, nNew;
   char buf[64];
   //
-  aNb = theVInterf.Extent();
+  aNb = theVInterf.Length();
   if (aNb == 0) {
     di << "Not found\n";
     return;
@@ -1562,7 +1562,7 @@ template <class InterfType> void DumpInterfs
 template <class InterfType> void SearchNewIndex
   (const char* theCType,
    const Standard_Integer theInd,
-   const BOPCol_NCVector<InterfType>& theVInterf,
+   const NCollection_Vector<InterfType>& theVInterf,
    Draw_Interpretor& di)
 {
   char buf[64];
@@ -1570,7 +1570,7 @@ template <class InterfType> void SearchNewIndex
   Standard_Integer i, aNb, n1, n2, nNew;
   //
   bFound = Standard_False;
-  aNb = theVInterf.Extent();
+  aNb = theVInterf.Length();
   for (i = 0 ; i < aNb; ++i) {
     const InterfType& anInt = theVInterf(i);
     nNew = anInt.IndexNew();

src/BOPTest/BOPTest_ObjCommands.cxx

@@ -72,7 +72,7 @@ Standard_Integer baddcompound (Draw_Interpretor& ,
   //
   aS=DBRep::Get(a[1]);
   //
-  BOPCol_ListOfShape& aLS=BOPTest_Objects::Shapes();
+  TopTools_ListOfShape& aLS=BOPTest_Objects::Shapes();
   aIt.Initialize(aS);
   for (; aIt.More(); aIt.Next()) {
     const TopoDS_Shape& aSx=aIt.Value();
@@ -99,7 +99,7 @@ Standard_Integer baddctools (Draw_Interpretor& ,
   //
   aS=DBRep::Get(a[1]);
   //
-  BOPCol_ListOfShape& aLT=BOPTest_Objects::Tools();
+  TopTools_ListOfShape& aLT=BOPTest_Objects::Tools();
   aIt.Initialize(aS);
   for (; aIt.More(); aIt.Next()) {
     const TopoDS_Shape& aSx=aIt.Value();
@@ -125,7 +125,7 @@ Standard_Integer baddobjects (Draw_Interpretor& ,
   Standard_Integer i;
   TopoDS_Shape aS;
   //
-  BOPCol_ListOfShape& aLS=BOPTest_Objects::Shapes();
+  TopTools_ListOfShape& aLS=BOPTest_Objects::Shapes();
   for (i = 1; i < n; ++i) {
     aS=DBRep::Get(a[i]);
     aLS.Append(aS);
@@ -145,7 +145,7 @@ Standard_Integer bclearobjects (Draw_Interpretor& ,
     printf(" use bclearobjects\n");
     return 0;
   }
-  BOPCol_ListOfShape& aLS=BOPTest_Objects::Shapes();
+  TopTools_ListOfShape& aLS=BOPTest_Objects::Shapes();
   aLS.Clear();
   //
   return 0;
@@ -166,7 +166,7 @@ Standard_Integer baddtools (Draw_Interpretor& ,
   Standard_Integer i;
   TopoDS_Shape aS;
   //
-  BOPCol_ListOfShape& aLS=BOPTest_Objects::Tools();
+  TopTools_ListOfShape& aLS=BOPTest_Objects::Tools();
   for (i = 1; i < n; ++i) {
     aS=DBRep::Get(a[i]);
     aLS.Append(aS);
@@ -186,7 +186,7 @@ Standard_Integer bcleartools (Draw_Interpretor& ,
     printf(" use bcleartools\n");
     return 0;
   }
-  BOPCol_ListOfShape& aLS=BOPTest_Objects::Tools();
+  TopTools_ListOfShape& aLS=BOPTest_Objects::Tools();
   aLS.Clear();
   //
   return 0;

src/BOPTest/BOPTest_Objects.cxx

@@ -95,11 +95,11 @@ class BOPTest_Session {
     myBuilder=myBuilderDefault;
   };
   //
-  BOPCol_ListOfShape& Shapes() {
+  TopTools_ListOfShape& Shapes() {
     return myShapes;
   }
   //
-  BOPCol_ListOfShape& Tools() {
+  TopTools_ListOfShape& Tools() {
     return myTools;
   }
   //
@@ -162,8 +162,8 @@ protected:
   BOPAlgo_Builder* myBuilder;
   BOPAlgo_Builder* myBuilderDefault;
   //
-  BOPCol_ListOfShape myShapes;
-  BOPCol_ListOfShape myTools;
+  TopTools_ListOfShape myShapes;
+  TopTools_ListOfShape myTools;
   Standard_Boolean myRunParallel;
   Standard_Boolean myNonDestructive;
   Standard_Real myFuzzyValue;
@@ -287,7 +287,7 @@ BOPAlgo_Splitter& BOPTest_Objects::Splitter()
 //function : Shapes
 //purpose  : 
 //=======================================================================
-BOPCol_ListOfShape& BOPTest_Objects::Shapes()
+TopTools_ListOfShape& BOPTest_Objects::Shapes()
 {
   return GetSession().Shapes();
 }
@@ -295,7 +295,7 @@ BOPCol_ListOfShape& BOPTest_Objects::Shapes()
 //function : Tools
 //purpose  : 
 //=======================================================================
-BOPCol_ListOfShape& BOPTest_Objects::Tools()
+TopTools_ListOfShape& BOPTest_Objects::Tools()
 {
   return GetSession().Tools();
 }

src/BOPTest/BOPTest_Objects.hxx

@@ -20,7 +20,7 @@
 #include <Standard_Handle.hxx>
 
 #include <BOPDS_PDS.hxx>
-#include <BOPCol_ListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
 #include <BOPAlgo_PBuilder.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
@@ -59,9 +59,9 @@ public:
   
   Standard_EXPORT static BOPAlgo_Splitter& Splitter();
   
-  Standard_EXPORT static BOPCol_ListOfShape& Shapes();
+  Standard_EXPORT static TopTools_ListOfShape& Shapes();
   
-  Standard_EXPORT static BOPCol_ListOfShape& Tools();
+  Standard_EXPORT static TopTools_ListOfShape& Tools();
   
   Standard_EXPORT static void SetBuilder (const BOPAlgo_PBuilder& theBuilder);
   

src/BOPTest/BOPTest_PartitionCommands.cxx

@@ -72,9 +72,9 @@ Standard_Integer bfillds(Draw_Interpretor& di,
   Standard_Boolean bRunParallel, bNonDestructive, bShowTime;
   Standard_Integer i, aNbS;
   Standard_Real aTol;
-  BOPCol_ListIteratorOfListOfShape aIt;
-  BOPCol_ListOfShape aLC;
-  BOPCol_ListOfShape& aLS=BOPTest_Objects::Shapes();
+  TopTools_ListIteratorOfListOfShape aIt;
+  TopTools_ListOfShape aLC;
+  TopTools_ListOfShape& aLS=BOPTest_Objects::Shapes();
   aNbS=aLS.Extent();
   if (!aNbS) {
     di << " no objects to process\n";
@@ -94,7 +94,7 @@ Standard_Integer bfillds(Draw_Interpretor& di,
     }
   }
   //
-  BOPCol_ListOfShape& aLT=BOPTest_Objects::Tools();
+  TopTools_ListOfShape& aLT=BOPTest_Objects::Tools();
   //
   aIt.Initialize(aLS);
   for (; aIt.More(); aIt.Next()) {
@@ -158,7 +158,7 @@ Standard_Integer bbuild(Draw_Interpretor& di,
   Standard_Boolean bRunParallel, bShowTime;
   Standard_Integer i;
 
-  BOPCol_ListIteratorOfListOfShape aIt;
+  TopTools_ListIteratorOfListOfShape aIt;
   //
   BOPAlgo_PaveFiller& aPF=BOPTest_Objects::PaveFiller();
   //
@@ -166,14 +166,14 @@ Standard_Integer bbuild(Draw_Interpretor& di,
   BOPAlgo_Builder& aBuilder=BOPTest_Objects::Builder();
   aBuilder.Clear();
   //
-  BOPCol_ListOfShape& aLSObj=BOPTest_Objects::Shapes();
+  TopTools_ListOfShape& aLSObj=BOPTest_Objects::Shapes();
   aIt.Initialize(aLSObj);
   for (; aIt.More(); aIt.Next()) {
     const TopoDS_Shape& aS=aIt.Value();
     aBuilder.AddArgument(aS);
   }
   //
-  BOPCol_ListOfShape& aLSTool=BOPTest_Objects::Tools();
+  TopTools_ListOfShape& aLSTool=BOPTest_Objects::Tools();
   aIt.Initialize(aLSTool);
   for (; aIt.More(); aIt.Next()) {
     const TopoDS_Shape& aS=aIt.Value();
@@ -240,7 +240,7 @@ Standard_Integer bbop(Draw_Interpretor& di,
   Standard_Boolean bRunParallel, bShowTime;
   Standard_Integer iOp, i;
   BOPAlgo_Operation aOp;
-  BOPCol_ListIteratorOfListOfShape aIt; 
+  TopTools_ListIteratorOfListOfShape aIt; 
   //
   iOp=Draw::Atoi(a[2]);
   if (iOp<0 || iOp>4) {
@@ -270,7 +270,7 @@ Standard_Integer bbop(Draw_Interpretor& di,
   //
   pBuilder->Clear();
   //
-  BOPCol_ListOfShape& aLSObj=BOPTest_Objects::Shapes();
+  TopTools_ListOfShape& aLSObj=BOPTest_Objects::Shapes();
   aIt.Initialize(aLSObj);
   for (; aIt.More(); aIt.Next()) {
     const TopoDS_Shape& aS=aIt.Value();
@@ -280,7 +280,7 @@ Standard_Integer bbop(Draw_Interpretor& di,
   if (aOp!=BOPAlgo_SECTION) {
     BOPAlgo_BOP *pBOP=(BOPAlgo_BOP *)pBuilder;
     //
-    BOPCol_ListOfShape& aLSTools=BOPTest_Objects::Tools();
+    TopTools_ListOfShape& aLSTools=BOPTest_Objects::Tools();
     aIt.Initialize(aLSTools);
     for (; aIt.More(); aIt.Next()) {
       const TopoDS_Shape& aS=aIt.Value();
@@ -290,7 +290,7 @@ Standard_Integer bbop(Draw_Interpretor& di,
     pBOP->SetOperation(aOp);
   }
   else {
-    BOPCol_ListOfShape& aLSTools=BOPTest_Objects::Tools();
+    TopTools_ListOfShape& aLSTools=BOPTest_Objects::Tools();
     aIt.Initialize(aLSTools);
     for (; aIt.More(); aIt.Next()) {
       const TopoDS_Shape& aS=aIt.Value();
@@ -354,11 +354,11 @@ Standard_Integer bsplit(Draw_Interpretor& di,
   pSplitter->Clear();
   //
   // set objects
-  const BOPCol_ListOfShape& aLSObjects = BOPTest_Objects::Shapes();
+  const TopTools_ListOfShape& aLSObjects = BOPTest_Objects::Shapes();
   pSplitter->SetArguments(aLSObjects);
   //
   // set tools
-  BOPCol_ListOfShape& aLSTools = BOPTest_Objects::Tools();
+  TopTools_ListOfShape& aLSTools = BOPTest_Objects::Tools();
   pSplitter->SetTools(aLSTools);
   //
   // set options

src/BOPTest/BOPTest_UtilityCommands.cxx

@@ -215,7 +215,7 @@ static Standard_Integer BuildPcurvesOnPlane(Draw_Interpretor& theDI,
     BRepAdaptor_Surface aS(aF, Standard_False);
     if (aS.GetType() == GeomAbs_Plane)
     {
-      BOPCol_ListOfShape aLE;
+      TopTools_ListOfShape aLE;
       TopExp_Explorer exp1(aF, TopAbs_EDGE);
       for (; exp1.More(); exp1.Next())
         aLE.Append(exp1.Current());