Bug #490: batch mode error.

[modules/hydro.git] / src / HYDROData / HYDROData_SplitToZonesTool.h

diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.h b/src/HYDROData/HYDROData_SplitToZonesTool.h
index f2a5ad69e81964813c985bdfd245acc3e2e7676f..67b6bdc046c4276066f7afde90c4218172b38928 100644 (file)
--- a/src/HYDROData/HYDROData_SplitToZonesTool.h
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.h
@@ -8,8 +8,8 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
-#include <NCollection_Map.hxx>
-#include <NCollection_DataMap.hxx>
+#include <NCollection_IndexedMap.hxx>
+#include <NCollection_IndexedDataMap.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <QStringList>
 
@@ -54,11 +54,11 @@ public:
 
   typedef QList        <SplitData> SplitDataList;
   typedef QListIterator<SplitData> SplitDataListIterator;  
-  typedef NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> HYDROData_MapOfShape;
+  typedef NCollection_IndexedMap<TopoDS_Shape, TopTools_ShapeMapHasher> HYDROData_MapOfShape;
   typedef HYDROData_MapOfShape::Iterator HYDROData_MapIteratorOfMapOfShape;
-  typedef NCollection_DataMap<TopoDS_Shape, TopTools_ListOfShape, TopTools_ShapeMapHasher> HYDROData_DataMapOfShapeListOfShape;
+  typedef NCollection_IndexedDataMap<TopoDS_Shape, TopTools_ListOfShape, TopTools_ShapeMapHasher> HYDROData_DataMapOfShapeListOfShape;
   typedef HYDROData_DataMapOfShapeListOfShape::Iterator HYDROData_DataMapIteratorOfDataMapOfShapeListOfShape;
-  typedef NCollection_DataMap<TopoDS_Shape,  QStringList, TopTools_ShapeMapHasher> HYDROData_DataMapOfShapeListOfString;
+  typedef NCollection_IndexedDataMap<TopoDS_Shape,  QStringList, TopTools_ShapeMapHasher> HYDROData_DataMapOfShapeListOfString;
   typedef HYDROData_DataMapOfShapeListOfString::Iterator HYDROData_DataMapIteratorOfDataMapOfShapeListOfString;
   #undef _NCollection_MapHasher
 
@@ -72,15 +72,7 @@ public:
 
 private:
 
-  static bool                SplitTwoData( const SplitData& theData1,
-                                           const SplitData& theData2,
-                                           SplitData& theData1Subtracted,
-                                           SplitData& theData2Subtracted,
-                                           SplitData& theDataIntersected );
-
-  static SplitDataList       ExtractSeparateData( const SplitData& theData );
-
-   /**
+  /**
    * Split input faces.
    */
   static Standard_Integer SplitFaces(const TopoDS_Compound& theComp, HYDROData_Transform& theTool);