From c86487eae575fa5d5253fea29197e5741e180aff Mon Sep 17 00:00:00 2001 From: gdd Date: Thu, 24 Mar 2011 19:46:04 +0000 Subject: [PATCH] Remove warnings --- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 32 +++++++++---------- src/GEOMAlgo/GEOMAlgo_Builder.cxx | 4 +-- src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx | 6 ++-- src/GEOMAlgo/GEOMAlgo_Builder_1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_2.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_3.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_4.cxx | 4 +-- src/GEOMAlgo/GEOMAlgo_Gluer1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx | 1 - src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx | 1 - src/GEOMAlgo/GEOMAlgo_WireSolid.cxx | 2 +- src/GEOMImpl/GEOMImpl_ArcDriver.cxx | 8 ++--- src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx | 8 ++--- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 7 ++-- src/GEOMImpl/GEOMImpl_MeasureDriver.cxx | 4 +-- .../NMTTools_IteratorOfCoupleOfShape.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_4.cxx | 4 +-- src/NMTTools/NMTTools_PaveFiller_7.cxx | 10 +++--- src/NMTTools/NMTTools_PaveFiller_8.cxx | 4 +-- src/OBJECT/GEOM_Actor.cxx | 6 ++-- src/OBJECT/GEOM_VTKTrihedron.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx | 16 +++++----- src/RepairGUI/RepairGUI_FreeBoundDlg.cxx | 2 +- src/RepairGUI/RepairGUI_FreeFacesDlg.cxx | 2 +- src/ShHealOper/ShHealOper_FillHoles.cxx | 1 - 26 files changed, 67 insertions(+), 69 deletions(-) diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index fc9483616..00fe1566c 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -945,13 +945,13 @@ void EntityGUI_SketcherDlg::ClickOnEnd() } else { // PAL16008 (Sketcher Validation should be equal to Apply&Close) - if ( Group1Spin->buttonApply->isEnabled() && Group1Spin->isVisible() || - Group2Spin->buttonApply->isEnabled() && Group2Spin->isVisible() || - Group3Spin->buttonApply->isEnabled() && Group3Spin->isVisible() || - Group4Spin->buttonApply->isEnabled() && Group4Spin->isVisible() || - Group1Sel->buttonApply->isEnabled() && Group1Sel->isVisible() || - Group2Sel->buttonApply->isEnabled() && Group2Sel->isVisible() || - Group1Sel1Spin->buttonApply->isEnabled() && Group1Sel1Spin->isVisible() ) { + if ( ( Group1Spin->buttonApply->isEnabled() && Group1Spin->isVisible() ) || + ( Group2Spin->buttonApply->isEnabled() && Group2Spin->isVisible() ) || + ( Group3Spin->buttonApply->isEnabled() && Group3Spin->isVisible() ) || + ( Group4Spin->buttonApply->isEnabled() && Group4Spin->isVisible() ) || + ( Group1Sel->buttonApply->isEnabled() && Group1Sel->isVisible() ) || + ( Group2Sel->buttonApply->isEnabled() && Group2Sel->isVisible() ) || + ( Group1Sel1Spin->buttonApply->isEnabled() && Group1Sel1Spin->isVisible() ) ) { ClickOnApply(); } myIsAllAdded = true; @@ -2164,17 +2164,17 @@ bool EntityGUI_SketcherDlg::createShapes( GEOM::GEOM_Object_ptr theObject, TopoDS_Shape& theLastSegment ) { TopoDS_Shape aShape; - if ( !GEOMBase::GetShape( theObject, aShape ) || - aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX ) + if ( !GEOMBase::GetShape( theObject, aShape ) || + ( aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX ) ) return false; - if ( Group1Sel->isVisible() && !Group1Sel->buttonApply->isEnabled() || - Group2Sel->isVisible() && !Group2Sel->buttonApply->isEnabled() || - Group1Sel1Spin->isVisible() && !Group1Sel1Spin->buttonApply->isEnabled() || - Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() || - Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() || - Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() || - Group4Spin->isVisible() && !Group4Spin->buttonApply->isEnabled() ) { + if ( ( Group1Sel->isVisible() && !Group1Sel->buttonApply->isEnabled() )|| + ( Group2Sel->isVisible() && !Group2Sel->buttonApply->isEnabled() ) || + ( Group1Sel1Spin->isVisible() && !Group1Sel1Spin->buttonApply->isEnabled() ) || + ( Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() ) || + ( Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() ) || + ( Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() ) || + ( Group4Spin->isVisible() && !Group4Spin->buttonApply->isEnabled() ) ) { theApplyedWire = aShape; return true; } diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.cxx b/src/GEOMAlgo/GEOMAlgo_Builder.cxx index 6fd871441..9ce94ec8f 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder.cxx @@ -378,8 +378,8 @@ PostTreat(); } // -static - void CorrectWires(const TopoDS_Shape& aS); +// static +// void CorrectWires(const TopoDS_Shape& aS); // //======================================================================= //function : PostTreat diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx index 97b9250c6..320811977 100755 --- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx @@ -190,9 +190,9 @@ static if (!myShapesToAvoid.Contains(aE)) { TopExp::MapShapesAndAncestors(aE, TopAbs_VERTEX, TopAbs_EDGE, aMVE); } - else { - int a=0; - } +// else { +// int a=0; +// } } aNbV=aMVE.Extent(); // diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx index 2c9f3d66e..43a97067c 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx @@ -112,7 +112,7 @@ static const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS(); NMTTools_PaveFiller* pPF=myPaveFiller; const BOPTools_SplitShapesPool& aSSP=pPF->SplitShapesPool(); - NMTTools_CommonBlockPool& aCBP=pPF->ChangeCommonBlockPool(); +/* NMTTools_CommonBlockPool& aCBP=*/pPF->ChangeCommonBlockPool(); IntTools_Context& aCtx=pPF->ChangeContext(); // Standard_Boolean bToReverse; diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx index 489947dea..fe064bbbe 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx @@ -642,7 +642,7 @@ static NMTDS_InterfPool* pIP=pPF->IP(); IntTools_Context& aCtx= pPF->ChangeContext(); // - BOPTools_CArray1OfSSInterference& aFFs=pIP->SSInterferences(); + /*BOPTools_CArray1OfSSInterference& aFFs=*/pIP->SSInterferences(); BOPTools_CArray1OfVSInterference& aVFs=pIP->VSInterferences(); BOPTools_CArray1OfESInterference& aEFs=pIP->ESInterferences(); const NMTTools_IndexedDataMapOfIndexedMapOfInteger& aMAV=pPF->AloneVertices(); diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx index ef3a0b747..e6b92ddcb 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx @@ -94,7 +94,7 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid, { myErrorStatus=0; // - const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS(); + /*const NMTDS_ShapesDataStructure& aDS=**/myPaveFiller->DS(); NMTTools_PaveFiller* pPF=myPaveFiller; IntTools_Context& aCtx= pPF->ChangeContext(); // diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx index 9b94938f1..bb47ae415 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx @@ -51,7 +51,7 @@ static //======================================================================= const TopTools_ListOfShape& GEOMAlgo_Builder::Generated(const TopoDS_Shape& theS) { - const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS(); + /*const NMTDS_ShapesDataStructure& aDS=**/myPaveFiller->DS(); NMTTools_PaveFiller* pPF=myPaveFiller; IntTools_Context& aCtx=pPF->ChangeContext(); // @@ -106,7 +106,7 @@ static //======================================================================= const TopTools_ListOfShape& GEOMAlgo_Builder::Modified(const TopoDS_Shape& theS) { - const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS(); + /*const NMTDS_ShapesDataStructure& aDS=**/myPaveFiller->DS(); NMTTools_PaveFiller* pPF=myPaveFiller; IntTools_Context& aCtx=pPF->ChangeContext(); // diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer1.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer1.cxx index d6fdb8d6f..b01e0802a 100755 --- a/src/GEOMAlgo/GEOMAlgo_Gluer1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer1.cxx @@ -216,7 +216,7 @@ static TopoDS_Shape aSold[2]; aItLS.Initialize(aLS); for (i=0; aItLS.More(); aItLS.Next(), ++i) { - const TopoDS_Shape& aSi=aItLS.Value(); +// const TopoDS_Shape& aSi=aItLS.Value(); aSold[i]=aItLS.Value(); } // diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx index 2a1310070..e30e67f9c 100755 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx @@ -154,7 +154,6 @@ { Standard_Boolean bRet; Standard_Integer aNb1, aNb2; - TopAbs_Orientation aOr; TopTools_ListIteratorOfListOfShape aIt; // bRet=Standard_True; diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx index 0b98a07b4..a640e17f3 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx @@ -243,7 +243,7 @@ void GEOMAlgo_ShellSolid::BuildResult() const BOPTools_PaveBlock& aPB=aLPB.First(); nSp=aPB.Edge(); } - const TopoDS_Shape& aSp=aDS.Shape(nSp); + /*const TopoDS_Shape& aSp=*/aDS.Shape(nSp); // aState=aDS.GetState(nSp); if (aState==BooleanOperations_IN) { diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx index 805ad5970..536d0dfdb 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx @@ -142,7 +142,6 @@ void GEOMAlgo_VertexSolid::Prepare() const TopoDS_Shape& aTool=aDS.Tool(); // const TopoDS_Solid& aSolid=(myRank==1) ? TopoDS::Solid(aTool) : TopoDS::Solid(aObj); - const TopoDS_Shape& aSV =(myRank==1)? aObj : aTool; // BRepClass3d_SolidClassifier& aSC=aCtx.SolidClassifier(aSolid); // diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx index fa718da55..e95209904 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx @@ -155,7 +155,7 @@ void GEOMAlgo_WireSolid::BuildResult() else if (aNbPB==1) { const BOPTools_PaveBlock& aPB=aLPB.First(); nSp=aPB.Edge(); - const TopoDS_Shape& aSp=aDS.Shape(nSp); + /*const TopoDS_Shape& aSp=*/aDS.Shape(nSp); aState=aDS.GetState(nSp); // if (aState==BooleanOperations_IN) { diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx index 3011ffd89..380f65605 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx @@ -141,10 +141,10 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const GC_MakeEllipse ellipse (aP2, aP3, aP1); Handle(Geom_Ellipse) aGeomEllipse = ellipse.Value(); - gp_Vec aV1 (aP1, aP2); - gp_Vec aV2 (aP1, aP3); - - double alpha = fabs(aV1.Angle(aV2)); +// gp_Vec aV1 (aP1, aP2); +// gp_Vec aV2 (aP1, aP3); +// +// double alpha = fabs(aV1.Angle(aV2)); GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True); aShape = BRepBuilderAPI_MakeEdge(arc).Edge(); diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx index 9a86c59fe..8b1d434f8 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx @@ -1441,7 +1441,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1, if (edges_e.IsNull() || edges_e->Length() == 0) { SetErrorCode("External edges not found"); - return false; + return NULL; } int nbEdgesInChamfer = 0; std::list theEdges; @@ -1657,7 +1657,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do if (edges_e.IsNull() || edges_e->Length() == 0) { SetErrorCode("External edges not found"); - return false; + return NULL; } int nbEdgesInChamfer = 0; std::list theEdges; @@ -1845,7 +1845,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d if (edges_e.IsNull() || edges_e->Length() == 0) { SetErrorCode("External edges not found"); - return false; + return NULL; } int nbEdgesInFillet = 0; std::list theEdges; @@ -2046,7 +2046,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou if (edges_e.IsNull() || edges_e->Length() == 0) { SetErrorCode("External edges not found"); - return false; + return NULL; } int nbEdgesInFillet = 0; std::list theEdges; diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index b4c4ebd77..374aa589f 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -1542,7 +1542,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetShapesNearPoint (Handle(GEOM_Object) theShape, Handle(GEOM_Object) thePoint, const Standard_Integer theShapeType, - const Standard_Real theTolerance) + const Standard_Real theConstTolerance) { SetErrorCode(KO); @@ -1572,9 +1572,10 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetShapesNearPoint SetErrorCode("Invalid type of result is requested"); return NULL; } - + + Standard_Real theTolerance = theConstTolerance; if (theTolerance < Precision::Confusion()) { - theTolerance == Precision::Confusion(); + theTolerance = Precision::Confusion(); } // Compute the result diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx index c3b9cd0ca..6d8698259 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx @@ -141,8 +141,8 @@ Standard_Integer GEOMImpl_MeasureDriver::Execute(TFunction_Logbook& log) const if (index < 0 || index > 1) Standard_NullObject::Raise("Vertex index is out of range"); - if ( anEdgeE.Orientation() == TopAbs_FORWARD && index == 0 || - anEdgeE.Orientation() == TopAbs_REVERSED && index == 1 ) + if ( ( anEdgeE.Orientation() == TopAbs_FORWARD && index == 0 ) || + ( anEdgeE.Orientation() == TopAbs_REVERSED && index == 1 ) ) aVertex = aP1; else aVertex = aP2; diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx index 5bba9f28d..eeb606067 100644 --- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx +++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx @@ -76,7 +76,7 @@ // Standard_Integer n1, n2, aIR1, aIR2;//, aN1, aN2, aNS; // - const NMTDS_CArray1OfIndexRange& aRanges=myPNMTPS->Ranges(); + /*const NMTDS_CArray1OfIndexRange& aRanges=*/myPNMTPS->Ranges(); // //aNS=myPNMTPS->NumberOfShapesOfTheObject(); myIndex1=0; diff --git a/src/NMTTools/NMTTools_PaveFiller_4.cxx b/src/NMTTools/NMTTools_PaveFiller_4.cxx index 22288863a..6e0a752ac 100644 --- a/src/NMTTools/NMTTools_PaveFiller_4.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_4.cxx @@ -127,8 +127,8 @@ static const IntTools_Range& aRange, const Standard_Real& aTolerance); -static - void EECommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfPaveBlock& aMapCB); +// static +// void EECommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfPaveBlock& aMapCB); static void ProcessBlock(const BOPTools_PaveBlock& aPB, diff --git a/src/NMTTools/NMTTools_PaveFiller_7.cxx b/src/NMTTools/NMTTools_PaveFiller_7.cxx index 08d365f6a..14fb0186a 100644 --- a/src/NMTTools/NMTTools_PaveFiller_7.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_7.cxx @@ -84,9 +84,9 @@ #include // Modified Thu Sep 14 14:35:18 2006 // Contribution of Samtech www.samcef.com BEGIN -static - void FuseVertices(const TopoDS_Shape& aCompound, - TopTools_DataMapOfShapeShape& aDMVV); +// static +// void FuseVertices(const TopoDS_Shape& aCompound, +// TopTools_DataMapOfShapeShape& aDMVV); // Contribution of Samtech www.samcef.com END //======================================================================= @@ -200,7 +200,7 @@ static } // NMTTools_ListOfCommonBlock& aLCB=myCommonBlockPool(myDS->RefEdge(nE)); - BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool (myDS->RefEdge(nE)); + /*BOPTools_ListOfPaveBlock& aLPB=*/mySplitShapesPool (myDS->RefEdge(nE)); // aCBIt.Initialize(aLCB); for (; aCBIt.More(); aCBIt.Next()) { @@ -611,7 +611,7 @@ static // function: FuseVertices // purpose: //======================================================================= - void NMTTools_PaveFiller::FuseVertices(const TopoDS_Shape& aCompound, + void NMTTools_PaveFiller::FuseVertices(const TopoDS_Shape& aCompound, TopTools_DataMapOfShapeShape& aDMVV)const { Standard_Integer i, aNbVV, n1, n2, nX; diff --git a/src/NMTTools/NMTTools_PaveFiller_8.cxx b/src/NMTTools/NMTTools_PaveFiller_8.cxx index fd3a6edaa..2ea493672 100644 --- a/src/NMTTools/NMTTools_PaveFiller_8.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_8.cxx @@ -329,7 +329,7 @@ { Standard_Integer nE1; // - BooleanOperations_ShapesDataStructure *pDS=myDS; +// BooleanOperations_ShapesDataStructure *pDS=myDS; BooleanOperations_OnceExplorer aExp(*myDS); aExp.Init(nF1, TopAbs_EDGE); for (; aExp.More(); aExp.Next()) { @@ -525,7 +525,7 @@ if (aT1!=TopAbs_FACE || aT2!=TopAbs_FACE) { return 1; // Type mismatch } - BooleanOperations_ShapesDataStructure *pDS=myDS; +// BooleanOperations_ShapesDataStructure *pDS=myDS; BooleanOperations_OnceExplorer aExp(*myDS); aExp.Init(nF1, TopAbs_EDGE); for (; aExp.More(); aExp.Next()) { diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index a0caca9c1..fb3c5c7fa 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -686,9 +686,9 @@ GEOM_Actor switch(aSelectionMode){ case ActorSelection : { - // cout << "=============== " << myIO->getEntry() << endl; - int nbio = mySelector->IObjectCount(); - // cout << " nbio = " << nbio << endl; +// cout << "=============== " << myIO->getEntry() << endl; +// int nbio = mySelector->IObjectCount(); +// cout << " nbio = " << nbio << endl; if( !mySelector->IsSelected( myIO ) ) { // printf ("!!!!!!!!!!!!!!!!\n"); diff --git a/src/OBJECT/GEOM_VTKTrihedron.cxx b/src/OBJECT/GEOM_VTKTrihedron.cxx index 4c62e9f36..cb96f1722 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.cxx +++ b/src/OBJECT/GEOM_VTKTrihedron.cxx @@ -113,7 +113,7 @@ void GEOM_VTKTrihedronAxis::SetSize( vtkFloatingPointType theSize ) aTrsf.SetDisplacement( gp_Ax3( gp_Pnt( 0, 0, 0 ), gp_Dir( 1, 0, 0 ) ), gp_Ax3( GetOri(), gp_Dir( myDir[ 0 ], myDir[ 1 ], myDir[ 2 ] ) ) ); - const gp_XYZ& aTrans = aTrsf.TranslationPart(); +// const gp_XYZ& aTrans = aTrsf.TranslationPart(); gp_Mat aRot = aTrsf.VectorialPart(); for ( int i = 1; i <= 3; i++ ) diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx index 37036ecfd..7f08ac073 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx @@ -456,14 +456,14 @@ GEOM::GEOM_IOperations_ptr PrimitiveGUI_DiskDlg::createOperation() return getGeomEngine()->GetI3DPrimOperations(getStudyId()); } -//================================================================================= -// function : isEqual -// purpose : it may also be needed to check for min distance between gp_Pnt-s... -//================================================================================= -static bool isEqual (const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2) -{ - return thePnt1->_is_equivalent(thePnt2); -} +// //================================================================================= +// // function : isEqual +// // purpose : it may also be needed to check for min distance between gp_Pnt-s... +// //================================================================================= +// static bool isEqual (const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2) +// { +// return thePnt1->_is_equivalent(thePnt2); +// } //================================================================================= // function : isValid diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx index ddcb80472..be93beec8 100644 --- a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx +++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx @@ -63,7 +63,7 @@ // purpose : Constructor //================================================================================= RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* theParent ) - : QDialog( theParent, false ), + : QDialog( theParent, 0 ), GEOMBase_Helper( dynamic_cast( theParent ) ), myGeomGUI( theGUI ) { diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx index 88007ac2a..739c1b23f 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx +++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx @@ -68,7 +68,7 @@ //================================================================================= RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg( GeometryGUI* GUI, QWidget* parent, bool modal ) - : QDialog( parent, false ), + : QDialog( parent, 0 ), GEOMBase_Helper( dynamic_cast( parent ) ), myGeomGUI( GUI ), myDisplayer( 0 ) diff --git a/src/ShHealOper/ShHealOper_FillHoles.cxx b/src/ShHealOper/ShHealOper_FillHoles.cxx index 2c889259f..d4dc621f0 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.cxx +++ b/src/ShHealOper/ShHealOper_FillHoles.cxx @@ -370,7 +370,6 @@ Standard_Boolean ShHealOper_FillHoles::addFace(const Handle(Geom_Surface)& theSu } aB.SameParameter(anEdge,Standard_False); aB.Add (aWire, anEdge); - Standard_Boolean isAdd = Standard_False; TopoDS_Shape aParent; if(!myEdgeFaces.Contains(anEdge)) continue; -- 2.39.2