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/IntTools/FILES

@@ -41,7 +41,6 @@ IntTools_FaceFace.cxx
 IntTools_FaceFace.hxx
 IntTools_FClass2d.cxx
 IntTools_FClass2d.hxx
-IntTools_IndexedDataMapOfTransientAddress.hxx
 IntTools_ListIteratorOfListOfBox.hxx
 IntTools_ListIteratorOfListOfCurveRangeSample.hxx
 IntTools_ListIteratorOfListOfSurfaceRangeSample.hxx

src/IntTools/IntTools_Context.cxx

@@ -97,8 +97,8 @@ IntTools_Context::IntTools_Context
 IntTools_Context::~IntTools_Context()
 {
   Standard_Address anAdr;
-  BOPCol_DataMapIteratorOfDataMapOfShapeAddress aIt;
-  BOPCol_DataMapIteratorOfDataMapOfTransientAddress aIt1;
+  DataMapOfShapeAddress::Iterator aIt;
+  DataMapOfTransientAddress::Iterator aIt1;
   //
   IntTools_FClass2d* pFClass2d;
   //
@@ -1091,7 +1091,7 @@ void IntTools_Context::SetPOnSProjectionTolerance(const Standard_Real theValue)
 void IntTools_Context::clearCachedPOnSProjectors()
 {
   GeomAPI_ProjectPointOnSurf* pProjPS;
-  BOPCol_DataMapIteratorOfDataMapOfShapeAddress aIt(myProjPSMap);
+  DataMapOfShapeAddress::Iterator aIt(myProjPSMap);
   for (; aIt.More(); aIt.Next()) {
     Standard_Address anAdr=aIt.Value();
     pProjPS=(GeomAPI_ProjectPointOnSurf*)anAdr;

src/IntTools/IntTools_Context.hxx

@@ -18,9 +18,9 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <BOPCol_BaseAllocator.hxx>
-#include <BOPCol_DataMapOfShapeAddress.hxx>
-#include <BOPCol_DataMapOfTransientAddress.hxx>
+#include <NCollection_BaseAllocator.hxx>
+#include <NCollection_DataMap.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
 #include <Precision.hxx>
@@ -28,6 +28,7 @@
 #include <TopAbs_State.hxx>
 #include <Standard_Boolean.hxx>
 #include <BRepAdaptor_Surface.hxx>
+#include <TColStd_MapTransientHasher.hxx>
 class IntTools_FClass2d;
 class TopoDS_Face;
 class GeomAPI_ProjectPointOnSurf;
@@ -45,7 +46,6 @@ class IntTools_Curve;
 class Bnd_Box;
 class TopoDS_Shape;
 
-
 //! The intersection Context contains geometrical
 //! and topological toolkit (classifiers, projectors, etc).
 //! The intersection Context is for caching the tools
@@ -58,7 +58,7 @@ public:
   Standard_EXPORT IntTools_Context();
 Standard_EXPORT virtual  ~IntTools_Context();
   
-  Standard_EXPORT IntTools_Context(const BOPCol_BaseAllocator& theAllocator);
+  Standard_EXPORT IntTools_Context(const Handle(NCollection_BaseAllocator)& theAllocator);
   
 
   //! Returns a reference to point classifier
@@ -239,17 +239,23 @@ Standard_EXPORT virtual  ~IntTools_Context();
 
 protected:
 
+  typedef NCollection_DataMap<TopoDS_Shape,
+                              Standard_Address,
+                              TopTools_ShapeMapHasher> DataMapOfShapeAddress;
+  typedef NCollection_DataMap<Handle(Standard_Transient),
+                              Standard_Address,
+                              TColStd_MapTransientHasher> DataMapOfTransientAddress;
 
-  BOPCol_BaseAllocator myAllocator;
-  BOPCol_DataMapOfShapeAddress myFClass2dMap;
-  BOPCol_DataMapOfShapeAddress myProjPSMap;
-  BOPCol_DataMapOfShapeAddress myProjPCMap;
-  BOPCol_DataMapOfShapeAddress mySClassMap;
-  BOPCol_DataMapOfTransientAddress myProjPTMap;
-  BOPCol_DataMapOfShapeAddress myHatcherMap;
-  BOPCol_DataMapOfShapeAddress myProjSDataMap;
-  BOPCol_DataMapOfShapeAddress myBndBoxDataMap;
-  BOPCol_DataMapOfShapeAddress mySurfAdaptorMap;
+  Handle(NCollection_BaseAllocator) myAllocator;
+  DataMapOfShapeAddress myFClass2dMap;
+  DataMapOfShapeAddress myProjPSMap;
+  DataMapOfShapeAddress myProjPCMap;
+  DataMapOfShapeAddress mySClassMap;
+  DataMapOfTransientAddress myProjPTMap;
+  DataMapOfShapeAddress myHatcherMap;
+  DataMapOfShapeAddress myProjSDataMap;
+  DataMapOfShapeAddress myBndBoxDataMap;
+  DataMapOfShapeAddress mySurfAdaptorMap;
   Standard_Integer myCreateFlag;
   Standard_Real myPOnSTolerance;
 

src/IntTools/IntTools_EdgeEdge.cxx

@@ -15,7 +15,7 @@
 
 #include <Bnd_Box.hxx>
 #include <BndLib_Add3dCurve.hxx>
-#include <BOPCol_MapOfInteger.hxx>
+#include <TColStd_MapOfInteger.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <ElCLib.hxx>
@@ -614,7 +614,7 @@ void IntTools_EdgeEdge::MergeSolutions(const IntTools_SequenceOfRanges& theRange
   Standard_Real aTi11, aTi12, aTi21, aTi22;
   Standard_Real aTj11, aTj12, aTj21, aTj22;
   Standard_Real aRes1, aRes2, dTR1, dTR2;
-  BOPCol_MapOfInteger aMI;
+  TColStd_MapOfInteger aMI;
   //
   aRes1 = Resolution(myCurve1.Curve().Curve(), 
                      myCurve1.GetType(), myResCoeff1, myTol);

src/IntTools/IntTools_IndexedDataMapOfTransientAddress.hxx

@@ -1,27 +0,0 @@
-// Created on: 2000-05-18
-// Created by: Peter KURNEV
-// Copyright (c) 2000-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 IntTools_IndexedDataMapOfTransientAddress_HeaderFile
-#define IntTools_IndexedDataMapOfTransientAddress_HeaderFile
-
-#include <Standard_Transient.hxx>
-#include <Standard_Address.hxx>
-#include <TColStd_MapTransientHasher.hxx>
-#include <NCollection_IndexedDataMap.hxx>
-
-typedef NCollection_IndexedDataMap<Handle(Standard_Transient),Standard_Address,TColStd_MapTransientHasher> IntTools_IndexedDataMapOfTransientAddress;
-
-
-#endif