Merge branch 'BR_2017_PORTING' into BR_2018_V8_5

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

diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
index 07a515ff296c6723f1a6d9c14a4da6bc5785204b..488618dec365c3e70d1c1524299634a84c08eb2c 100644 (file)
--- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
@@ -119,7 +119,7 @@ void HYDROData_SplitToZonesTool::SetFileNames(const QString& theNameBefore, cons
 #endif
 }
 //======================================================================================
-Standard_Integer HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& theComp, 
+bool HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& theComp, 
                                                         HYDROData_Transform& theTool)
 {
   theTool.Clear();
@@ -128,8 +128,7 @@ Standard_Integer HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& t
   const Standard_Boolean bToTransform = theTool.ToTransform();  
   theTool.SetToTransform(bToTransform);  
   theTool.Perform();
-  Standard_Integer anErr = theTool.ErrorStatus();
-  return anErr;
+  return theTool.HasErrors();
 }
 
 //======================================================================================
@@ -346,7 +345,7 @@ HYDROData_SplitToZonesTool::SplitDataList
   HYDROData_DataMapOfShapeListOfShape aDM1;
   if(anInputSplitDataList.size() > 1) {
     HYDROData_Transform splitTool; 
-    const Standard_Integer anErr = SplitFaces(aCmp, splitTool);    
+    bool anErr = SplitFaces(aCmp, splitTool);    
     if(anErr)
       return anOutputSplitDataList;
     aResult = splitTool.Shape();
@@ -816,9 +815,8 @@ int HYDROData_SplitToZonesTool::CutByEdges(const TopoDS_Shape& InSh, const TopTo
     anAlgo.AddArgument( anIt.Value() );
 
   anAlgo.Perform(); 
-  anError = anAlgo.ErrorStatus();
-  if (anError)
-    return anError;
+  if (anAlgo.HasErrors())
+    return -1;
 
   outShs = anAlgo.Modified( InSh );
   if (outShs.IsEmpty())