mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-19 13:40:49 +03:00
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*;
This commit is contained in:
@@ -2337,8 +2337,8 @@ static Standard_Integer OCC25043 (Draw_Interpretor& theDI,
|
||||
for (; anCheckIter.More(); anCheckIter.Next())
|
||||
{
|
||||
const BOPAlgo_CheckResult& aCurCheckRes = anCheckIter.Value();
|
||||
const BOPCol_ListOfShape& aCurFaultyShapes = aCurCheckRes.GetFaultyShapes1();
|
||||
BOPCol_ListIteratorOfListOfShape aFaultyIter(aCurFaultyShapes);
|
||||
const TopTools_ListOfShape& aCurFaultyShapes = aCurCheckRes.GetFaultyShapes1();
|
||||
TopTools_ListIteratorOfListOfShape aFaultyIter(aCurFaultyShapes);
|
||||
for (; aFaultyIter.More(); aFaultyIter.Next())
|
||||
{
|
||||
const TopoDS_Shape& aFaultyShape = aFaultyIter.Value();
|
||||
@@ -2716,10 +2716,8 @@ static Standard_Integer OCC25413 (Draw_Interpretor& di, Standard_Integer narg ,
|
||||
#include <BRepAlgoAPI_Cut.hxx>
|
||||
#include <BRepAlgoAPI_Section.hxx>
|
||||
//
|
||||
#include <BOPTools.hxx>
|
||||
//
|
||||
#include <BOPCol_MapOfShape.hxx>
|
||||
#include <BOPCol_ListOfShape.hxx>
|
||||
#include <TopExp.hxx>
|
||||
#include <TopTools_MapOfShape.hxx>
|
||||
//=======================================================================
|
||||
//function : OCC25446
|
||||
//purpose :
|
||||
@@ -2756,7 +2754,7 @@ static Standard_Integer OCC25446 (Draw_Interpretor& theDI,
|
||||
aOp = (BOPAlgo_Operation)iOp;
|
||||
//
|
||||
Standard_Integer iErr;
|
||||
BOPCol_ListOfShape aLS;
|
||||
TopTools_ListOfShape aLS;
|
||||
BOPAlgo_PaveFiller aPF;
|
||||
//
|
||||
aLS.Append(aS1);
|
||||
@@ -2801,14 +2799,14 @@ static Standard_Integer OCC25446 (Draw_Interpretor& theDI,
|
||||
const TopoDS_Shape& aRes = pBuilder->Shape();
|
||||
DBRep::Set(argv[1], aRes);
|
||||
//
|
||||
BOPCol_MapOfShape aMapArgs, aMapShape;
|
||||
BOPCol_MapIteratorOfMapOfShape aIt;
|
||||
TopTools_MapOfShape aMapArgs, aMapShape;
|
||||
TopTools_MapIteratorOfMapOfShape aIt;
|
||||
Standard_Boolean bIsDeletedHist, bIsDeletedMap;
|
||||
TopAbs_ShapeEnum aType;
|
||||
//
|
||||
BOPTools::MapShapes(aS1, aMapArgs);
|
||||
BOPTools::MapShapes(aS2, aMapArgs);
|
||||
BOPTools::MapShapes(aRes, aMapShape);
|
||||
TopExp::MapShapes(aS1, aMapArgs);
|
||||
TopExp::MapShapes(aS2, aMapArgs);
|
||||
TopExp::MapShapes(aRes, aMapShape);
|
||||
//
|
||||
aIt.Initialize(aMapArgs);
|
||||
for (; aIt.More(); aIt.Next()) {
|
||||
|
Reference in New Issue
Block a user