From: akaftasev Date: Fri, 16 Apr 2021 15:53:47 +0000 (+0300) Subject: Delete definition of Progress_MessageScope from BOPAlgo_BuilderFace, BOPAlgo_BuilderSolid X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=bb18d7a867d81c4cdfc4bee00002941fe8c3cd45;p=occt-copy.git Delete definition of Progress_MessageScope from BOPAlgo_BuilderFace, BOPAlgo_BuilderSolid --- diff --git a/src/BOPAlgo/BOPAlgo_BuilderFace.cxx b/src/BOPAlgo/BOPAlgo_BuilderFace.cxx index d6e64f08d9..942a66a5bb 100644 --- a/src/BOPAlgo/BOPAlgo_BuilderFace.cxx +++ b/src/BOPAlgo/BOPAlgo_BuilderFace.cxx @@ -141,33 +141,32 @@ void BOPAlgo_BuilderFace::CheckData() //function : Perform //purpose : //======================================================================= -void BOPAlgo_BuilderFace::Perform(const Message_ProgressRange& theRange) +void BOPAlgo_BuilderFace::Perform(const Message_ProgressRange& /*theRange*/) { GetReport()->Clear(); // - Message_ProgressScope aPS(theRange, NULL, 1); CheckData(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } // PerformShapesToAvoid(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } // PerformLoops(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } // PerformAreas(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } // PerformInternalShapes(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } } diff --git a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx index 95aa8b7e43..377430dffe 100644 --- a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx +++ b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx @@ -106,7 +106,7 @@ BOPAlgo_BuilderSolid::~BOPAlgo_BuilderSolid() //function : Perform //purpose : //======================================================================= -void BOPAlgo_BuilderSolid::Perform(const Message_ProgressRange& theRange) +void BOPAlgo_BuilderSolid::Perform(const Message_ProgressRange& /*theRange*/) { GetReport()->Clear(); // @@ -123,7 +123,6 @@ void BOPAlgo_BuilderSolid::Perform(const Message_ProgressRange& theRange) BRep_Builder aBB; TopTools_ListIteratorOfListOfShape aIt; // - Message_ProgressScope aPS(theRange, NULL, 1); aBB.MakeCompound(aC); aIt.Initialize(myShapes); for(; aIt.More(); aIt.Next()) { @@ -134,22 +133,22 @@ void BOPAlgo_BuilderSolid::Perform(const Message_ProgressRange& theRange) // PerformShapesToAvoid(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } // PerformLoops(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } // PerformAreas(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } // PerformInternalShapes(); - if (HasErrors() || UserBreak(aPS)) { + if (HasErrors()) { return; } }