From: SALOME Date: Wed, 19 Aug 2020 07:06:02 +0000 (+0300) Subject: #18963 Minimize compiler warnings X-Git-Tag: V9_7_0a1~17 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1405980f7eb1ae349f5fdc23d2627ff25d2f2685;p=modules%2Fgeom.git #18963 Minimize compiler warnings --- diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx index 52c0e504e..7771c8bc9 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx @@ -523,4 +523,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver) diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx index 30ef22bbb..6cab4c405 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx @@ -33,7 +33,7 @@ class gp_Pnt; class gp_Dir; class gp_Ax3; -DEFINE_STANDARD_HANDLE( AdvancedEngine_DividedDiskDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( AdvancedEngine_DividedDiskDriver, GEOM_BaseDriver ) class AdvancedEngine_DividedDiskDriver : public GEOM_BaseDriver { diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx index dce82045e..9ee5bd895 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx @@ -459,31 +459,32 @@ bool AdvancedEngine_IOperations::MakeGroups(Handle(GEOM_Object) theShape, int sh #ifdef FIND_GROUPS_BY_POINTS // BEGIN: new groups search - - // W2 R2 - // .----.-----.----. - // e| | | | | - // | | | | | - // . | | | . - // g / ''..| | |..'' \ - // f / ''''''' \ - // .---.--'.. | | | ..'--.---. - // |a \ '''...........''' / | - // |-------\------' | '------/-------. - // | \ | / | - // c| \ | / | - // | R1 \ | / | - // | \ | / | - // ._________________|_________________. - // | L1 | | - // | | | - // | | | - // b| | | - // | | | - // |-----------------|-----------------| - // | W1 | | - // '-----------------'-----------------' - // d + /* + W2 R2 + .----.-----.----. + e| | | | | + | | | | | + . | | | . + g / ''..| | |..'' \ + f / ''''''' \ + .---.--'.. | | | ..'--.---. + |a \ '''...........''' / | + |-------\------' | '------/-------. + | \ | / | + c| \ | / | + | R1 \ | / | + | \ | / | + ._________________|_________________. + | L1 | | + | | | + | | | + b| | | + | | | + |-----------------|-----------------| + | W1 | | + '-----------------'-----------------' + d + */ // "Thickness" group (a) gp_Pnt aPntA (-theL1, 0, theR1 + theW1/2.); @@ -1338,7 +1339,7 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the else { Handle(GEOM_Object) P1, P2, P3, P4, P5, P6; int idP1, idP2, idP3, idP4; - int PZX, PZY; + int PZX=0, PZY=0; // todo: PZX, PZY must be explicitly initialized to avoid warning (see below) double ZX=0, ZY=0; std::vector LX; std::vector LY; @@ -1412,9 +1413,9 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the idP3 = LY.at(1); P1 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP1)); - P2 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP2)); + P2 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP2)); // todo: PZX must be explicitly initialized to avoid warning (see above) P3 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP3)); - P4 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP4)); + P4 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP4)); // todo: PZY must be explicitly initialized to avoid warning (see above) Handle(GEOM_Object) Cote_1 = myBasicOperations->MakeLineTwoPnt(P1, vi1); if (Cote_1.IsNull()) { @@ -1563,7 +1564,7 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the // Mirror and glue faces bool AdvancedEngine_IOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Object) theShape, double theR1, double theW1, double theL1, - double theR2, double theW2, double theL2) + double /*theR2*/, double /*theW2*/, double theL2) { SetErrorCode(KO); @@ -1682,16 +1683,17 @@ TopoDS_Shape AdvancedEngine_IOperations::MakePipeTShapeThicknessReduction { // Add thickness reduction elements // at the three extremities: Left, Right and Incident - // - // ---------------------. - // W \ - // ---------------------. \ - // ^ \ '-----------------. - // |R \ Wthin | - // | '-----------------' - // v Rthin - // --.--.--.--.--.--.--.--.--.--.--.--.--.--.-- - // Ltrans Lthin + /* + ---------------------. + W \ + ---------------------. \ + ^ \ '-----------------. + |R \ Wthin | + | '-----------------' + v Rthin + --.--.--.--.--.--.--.--.--.--.--.--.--.--.-- + Ltrans Lthin + */ TopoDS_Shape aResult = theShape; double aTol = Precision::Confusion(); @@ -1805,15 +1807,17 @@ TopoDS_Shape AdvancedEngine_IOperations::MakeThicknessReduction (gp_Ax2 theAxes, } bool isThinPart = (Lthin > aTol); - // . - // W |\ - // . \ - // ^ \ '-----------------. - // |R \| | Wthin - // | '-----------------' - // v Rthin - // --.--.--.--.--.--.--.--.--.--.--.--.--> theAxes.Direction() - // Ltrans Lthin + /* + . + W |\ + . \ + ^ \ '-----------------. + |R \| | Wthin + | '-----------------' + v Rthin + --.--.--.--.--.--.--.--.--.--.--.--.--> theAxes.Direction() + Ltrans Lthin + */ double RExt = R + W; double RthinExt = Rthin + Wthin; diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx index 1996c4e03..6ea1895f9 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx @@ -684,4 +684,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver) diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx index 512a11a15..60e867619 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx @@ -28,7 +28,7 @@ #include #include -DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver ) class AdvancedEngine_PipeTShapeDriver : public GEOM_BaseDriver { diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx index 6e1bd3e5d..0e3e065c5 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx @@ -266,4 +266,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver) diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx index 44dfda532..221901845 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx @@ -25,7 +25,7 @@ #include #include -DEFINE_STANDARD_HANDLE( AdvancedEngine_SmoothingSurfaceDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( AdvancedEngine_SmoothingSurfaceDriver, GEOM_BaseDriver ) class AdvancedEngine_SmoothingSurfaceDriver : public GEOM_BaseDriver { diff --git a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx index a962dd496..659c55091 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx @@ -134,7 +134,7 @@ void AdvancedGUI_DividedCylinderDlg::Init() // function : SetDoubleSpinBoxStep() // purpose : Double spin box management //================================================================================= -void AdvancedGUI_DividedCylinderDlg::SetDoubleSpinBoxStep (double step) +void AdvancedGUI_DividedCylinderDlg::SetDoubleSpinBoxStep (double /*step*/) { //@@ set double spin box step for all spin boxes here @@// } @@ -223,7 +223,7 @@ GEOM::GEOM_IOperations_ptr AdvancedGUI_DividedCylinderDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool AdvancedGUI_DividedCylinderDlg::isValid (QString& msg) +bool AdvancedGUI_DividedCylinderDlg::isValid (QString& /*msg*/) { bool ok = true; diff --git a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx index b39b35c74..26753b8a1 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx @@ -169,7 +169,7 @@ void AdvancedGUI_DividedDiskDlg::Init() // function : SetDoubleSpinBoxStep() // purpose : Double spin box management //================================================================================= -void AdvancedGUI_DividedDiskDlg::SetDoubleSpinBoxStep (double step) +void AdvancedGUI_DividedDiskDlg::SetDoubleSpinBoxStep (double /*step*/) { //@@ set double spin box step for all spin boxes here @@// } @@ -399,7 +399,7 @@ GEOM::GEOM_IOperations_ptr AdvancedGUI_DividedDiskDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool AdvancedGUI_DividedDiskDlg::isValid (QString& msg) +bool AdvancedGUI_DividedDiskDlg::isValid (QString& /*msg*/) { bool ok = true; diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx index daf58c34a..13b9ad2e9 100644 --- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx @@ -420,7 +420,7 @@ void AdvancedGUI_PipeTShapeDlg::ApplyNewDimensions() // function : UpdatePicture() // purpose : //================================================================================= -void AdvancedGUI_PipeTShapeDlg::UpdatePicture (QWidget* old, QWidget* now) +void AdvancedGUI_PipeTShapeDlg::UpdatePicture (QWidget* /*old*/, QWidget* now) { if (ChamferGroupParams->GroupBox1->isChecked()) if (now == MainTubeGroupParams->SpinBox_DX) @@ -504,7 +504,7 @@ void AdvancedGUI_PipeTShapeDlg::SetPosition (bool isChecked) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void AdvancedGUI_PipeTShapeDlg::ValueChangedInSpinBox (double newValue) +void AdvancedGUI_PipeTShapeDlg::ValueChangedInSpinBox (double /*newValue*/) { if (JunctionPointsSel->GroupBox1->isChecked() && myOkPoint1 && myOkPoint2 && myOkPoint3) CheckCompatiblePosition(myPoint1, myPoint2, myPoint3, 0.01); diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.cxx b/src/BREPPlugin/BREPPlugin_ExportDriver.cxx index e1fd56e5f..d51ba2e1a 100644 --- a/src/BREPPlugin/BREPPlugin_ExportDriver.cxx +++ b/src/BREPPlugin/BREPPlugin_ExportDriver.cxx @@ -54,7 +54,7 @@ BREPPlugin_ExportDriver::BREPPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const +Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -89,10 +89,10 @@ Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log */ //================================================================================ bool BREPPlugin_ExportDriver:: -GetCreationInformation( std::string& theOperationName, - std::vector& theParams ) +GetCreationInformation( std::string& /*theOperationName*/, + std::vector& /*theParams*/ ) { return false; } -IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver ) diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx index e22f7daa0..bfe0ccd3a 100644 --- a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver ) class BREPPlugin_ExportDriver : public GEOM_BaseDriver { diff --git a/src/BREPPlugin/BREPPlugin_IECallBack.cxx b/src/BREPPlugin/BREPPlugin_IECallBack.cxx index 497818a2b..e5c1ab9b4 100644 --- a/src/BREPPlugin/BREPPlugin_IECallBack.cxx +++ b/src/BREPPlugin/BREPPlugin_IECallBack.cxx @@ -47,8 +47,8 @@ BREPPlugin_IECallBack::~BREPPlugin_IECallBack() //============================================================================= bool BREPPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal, - const TCollection_AsciiString& theFileName, - const TCollection_AsciiString& theFormatName ) + const TCollection_AsciiString& theFileName, + const TCollection_AsciiString& /*theFormatName*/ ) { BREPPlugin_IOperations* aPluginOperations = BREPPlugin_OperationsCreator::get( GetEngine() ); aPluginOperations->ExportBREP( theOriginal, theFileName ); @@ -61,7 +61,7 @@ BREPPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal, */ //============================================================================= Handle(TColStd_HSequenceOfTransient) -BREPPlugin_IECallBack::Import( const TCollection_AsciiString& theFormatName, +BREPPlugin_IECallBack::Import( const TCollection_AsciiString& /*theFormatName*/, const TCollection_AsciiString& theFileName ) { BREPPlugin_IOperations* aPluginOperations = BREPPlugin_OperationsCreator::get( GetEngine() ); diff --git a/src/BREPPlugin/BREPPlugin_ImportDriver.cxx b/src/BREPPlugin/BREPPlugin_ImportDriver.cxx index 19ff83c9c..a206161f6 100644 --- a/src/BREPPlugin/BREPPlugin_ImportDriver.cxx +++ b/src/BREPPlugin/BREPPlugin_ImportDriver.cxx @@ -109,4 +109,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver ) diff --git a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx index 8b019e96c..84d168d94 100644 --- a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver ) class BREPPlugin_ImportDriver : public GEOM_BaseDriver { diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx index 785984d3b..309468168 100644 --- a/src/BasicGUI/BasicGUI.cxx +++ b/src/BasicGUI/BasicGUI.cxx @@ -126,7 +126,7 @@ bool BasicGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) // function : 0nMousePress() // purpose : [static] manage mouse events //================================================================================= -bool BasicGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow ) +bool BasicGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* theViewWindow ) { QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox(); diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx index 440e525b0..ae65357a6 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.cxx +++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx @@ -459,7 +459,7 @@ GEOM::GEOM_IOperations_ptr BasicGUI_ArcDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool BasicGUI_ArcDlg::isValid( QString& msg ) +bool BasicGUI_ArcDlg::isValid( QString& /*msg*/ ) { bool ok = myPoint1 && myPoint2 && myPoint3 && myPoint1 != myPoint2 && myPoint1 != myPoint3 && myPoint2 != myPoint3; diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx index 057f05f43..78ee5ca7c 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx +++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx @@ -360,7 +360,7 @@ void BasicGUI_EllipseDlg::enterEvent( QEvent* ) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void BasicGUI_EllipseDlg::ValueChangedInSpinBox( double newValue ) +void BasicGUI_EllipseDlg::ValueChangedInSpinBox( double /*newValue*/ ) { displayPreview(true); } diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx index e5290f7de..7898f6323 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.cxx +++ b/src/BasicGUI/BasicGUI_LineDlg.cxx @@ -371,7 +371,7 @@ GEOM::GEOM_IOperations_ptr BasicGUI_LineDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool BasicGUI_LineDlg::isValid( QString& msg ) +bool BasicGUI_LineDlg::isValid( QString& /*msg*/ ) { bool ok = false; switch ( getConstructorId() ) { diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx index 2e080041f..e985396c4 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx +++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx @@ -378,13 +378,13 @@ void BasicGUI_MarkerDlg::onSelectionDone() return; } - TopAbs_ShapeEnum aNeedType; + TopAbs_ShapeEnum aNeedType = TopAbs_SHAPE; // todo: aNeedType must be explicitly initialized to avoid warning (see below) if ( getConstructorId() == 1 ) // by shape position aNeedType = TopAbs_SHAPE; else if ( getConstructorId() == 2 ) // by point and two vectors aNeedType = myEditCurrentArgument == Group2->LineEdit1 ? TopAbs_VERTEX : TopAbs_EDGE; - GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType ); + GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType ); // todo: aNeedType must be explicitly initialized to avoid warning (see above) TopoDS_Shape aShape; if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) { QString aName = GEOMBase::GetName( aSelectedObject.get() ); diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx index 095e56875..028d3ef31 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx @@ -633,7 +633,7 @@ void BasicGUI_PlaneDlg::enterEvent( QEvent* ) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void BasicGUI_PlaneDlg::ValueChangedInSpinBox( double newValue ) +void BasicGUI_PlaneDlg::ValueChangedInSpinBox( double /*newValue*/ ) { displayPreview(true); } diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index 094472a1a..72fab7a95 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/src/BasicGUI/BasicGUI_PointDlg.cxx @@ -667,7 +667,7 @@ void BasicGUI_PointDlg::DeactivateActiveDialog() // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void BasicGUI_PointDlg::ValueChangedInSpinBox(double newValue) +void BasicGUI_PointDlg::ValueChangedInSpinBox(double /*newValue*/) { displayPreview(true); } @@ -957,7 +957,7 @@ QList BasicGUI_PointDlg::getSourceObjects() // function : ClickParamCoord() // purpose : //================================================================================= -void BasicGUI_PointDlg::ClickParamCoord(int id) +void BasicGUI_PointDlg::ClickParamCoord(int /*id*/) { updateParamCoord(true); displayPreview(true); diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx index e6a0deca4..6e9bda01e 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.cxx +++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx @@ -367,7 +367,7 @@ void BasicGUI_VectorDlg::enterEvent( QEvent* ) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void BasicGUI_VectorDlg::ValueChangedInSpinBox( double newValue ) +void BasicGUI_VectorDlg::ValueChangedInSpinBox( double /*newValue*/ ) { displayPreview(true); } @@ -376,7 +376,7 @@ void BasicGUI_VectorDlg::ValueChangedInSpinBox( double newValue ) // function : ReverseVector() // purpose : 'state' not used here //================================================================================= -void BasicGUI_VectorDlg::ReverseVector( int state ) +void BasicGUI_VectorDlg::ReverseVector( int /*state*/ ) { double dx = -GroupDimensions->SpinBox_DX->value(); double dy = -GroupDimensions->SpinBox_DY->value(); diff --git a/src/BlockFix/BlockFix_BlockFixAPI.cxx b/src/BlockFix/BlockFix_BlockFixAPI.cxx index 41726eaf1..09e0dafb8 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.cxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.cxx @@ -34,7 +34,7 @@ #include -IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient) //======================================================================= //function : BlockFix_BlockFixAPI diff --git a/src/BlockFix/BlockFix_BlockFixAPI.hxx b/src/BlockFix/BlockFix_BlockFixAPI.hxx index b8389423f..4b23b9764 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.hxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.hxx @@ -31,7 +31,7 @@ #include #include -DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, Standard_Transient); +DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, Standard_Transient) class BlockFix_BlockFixAPI : public Standard_Transient { diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx index 09ce49587..4a7af3cdd 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx @@ -50,7 +50,7 @@ #include -IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification) //======================================================================= //function : BlockFix_PeriodicSurfaceModifier() diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx index 7621ac82b..36763982a 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx @@ -44,7 +44,7 @@ class Geom_Curve; class Geom2d_Curve; class gp_Pnt; -DEFINE_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); +DEFINE_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification) class BlockFix_PeriodicSurfaceModifier : public BRepTools_Modification { diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx index 56fbb6f58..45479f535 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx @@ -56,7 +56,7 @@ #include #include -IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification) //======================================================================= //function : BlockFix_SphereSpaceModifier diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx index d2d509403..670c6c5fa 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx @@ -42,7 +42,7 @@ class Geom_Curve; class Geom2d_Curve; class gp_Pnt; -DEFINE_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification); +DEFINE_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification) class BlockFix_SphereSpaceModifier : public BRepTools_Modification { diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index 8ded10b0b..8fb5fde51 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -904,7 +904,7 @@ Standard_Boolean BlockFix_UnionFaces::IsSameDomain(const TopoDS_Face& aFace, return anIIInt.TangentFaces(); } - catch (Standard_Failure) { + catch (Standard_Failure&) { return false; } } diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx index a2fca2d29..61787272f 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx +++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx @@ -195,7 +195,7 @@ void BuildGUI_CompoundDlg::ActivateThisDialog() // function : enterEvent() // purpose : //================================================================================= -void BuildGUI_CompoundDlg::enterEvent(QEvent* e) +void BuildGUI_CompoundDlg::enterEvent(QEvent*) { if ( !mainFrame()->GroupConstructors->isEnabled() ) ActivateThisDialog(); diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx index 0e73b0f00..5d27c12aa 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx +++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx @@ -405,7 +405,7 @@ void BuildGUI_EdgeDlg::enterEvent (QEvent*) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void BuildGUI_EdgeDlg::ValueChangedInSpinBox(double newValue) +void BuildGUI_EdgeDlg::ValueChangedInSpinBox(double /*newValue*/) { displayPreview(true); } diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx index ae6f1dc18..b391f9d48 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.cxx +++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx @@ -554,7 +554,7 @@ void BuildGUI_FaceDlg::ActivateThisDialog() // function : onItemClicked() // purpose : called when tree item was clicked //================================================================================= -void BuildGUI_FaceDlg::onItemClicked( QTreeWidgetItem* theItem, int theColumn ) +void BuildGUI_FaceDlg::onItemClicked( QTreeWidgetItem* theItem, int /*theColumn*/ ) { if ( !theItem || !( theItem->flags() & Qt::ItemIsSelectable ) ) return; diff --git a/src/BuildGUI/BuildGUI_SolidDlg.cxx b/src/BuildGUI/BuildGUI_SolidDlg.cxx index b3e285de5..5fa3eee21 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.cxx +++ b/src/BuildGUI/BuildGUI_SolidDlg.cxx @@ -371,24 +371,22 @@ bool BuildGUI_SolidDlg::execute( ObjectList& objects ) switch (getConstructorId()) { case 0: { - if ( GroupSolid->CheckButton1->isChecked() ) { - GEOM::ListOfGO_var objlist = new GEOM::ListOfGO(); - objlist->length( myShells.count() ); - for ( int i = 0; i < myShells.count(); i++ ) - objlist[i] = myShells[i].copy(); - - anObj = anOper->MakeSolidShells( objlist.in() ); - - if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); - } - else { - for ( int i = 0, n = myShells.count(); i< n; i++ ){ - anObj = anOper->MakeSolidShell( myShells[ i ].get() ); - - if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); - } - } - break; + if ( GroupSolid->CheckButton1->isChecked() ) { + GEOM::ListOfGO_var objlist = new GEOM::ListOfGO(); + objlist->length( myShells.count() ); + for ( int i = 0; i < myShells.count(); i++ ) + objlist[i] = myShells[i].copy(); + + anObj = anOper->MakeSolidShells( objlist.in() ); + if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); + } + else { + for ( int i = 0, n = myShells.count(); i< n; i++ ) { + anObj = anOper->MakeSolidShell( myShells[ i ].get() ); + if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); + } + } + break; } case 1: { @@ -397,9 +395,9 @@ bool BuildGUI_SolidDlg::execute( ObjectList& objects ) for ( int i = 0; i < myShells.count(); i++ ) objlist[i] = myShells[i].copy(); - anObj = anOper->MakeSolidFromConnectedFaces( objlist.in(), GroupFaces->CheckButton1->isChecked() ); + anObj = anOper->MakeSolidFromConnectedFaces( objlist.in(), GroupFaces->CheckButton1->isChecked() ); + if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); - if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); break; } } diff --git a/src/CurveCreator/CurveCreator.hxx b/src/CurveCreator/CurveCreator.hxx index ed05c84e8..cc633b1b8 100644 --- a/src/CurveCreator/CurveCreator.hxx +++ b/src/CurveCreator/CurveCreator.hxx @@ -48,6 +48,6 @@ namespace CurveCreator typedef std::list PosPointsList; //! Map of sections with positioned points typedef std::map SectionsMap; -}; +} #endif diff --git a/src/CurveCreator/CurveCreator_Curve.cxx b/src/CurveCreator/CurveCreator_Curve.cxx index bcd3a6898..c9f64e252 100644 --- a/src/CurveCreator/CurveCreator_Curve.cxx +++ b/src/CurveCreator/CurveCreator_Curve.cxx @@ -48,19 +48,19 @@ // purpose: //======================================================================= CurveCreator_Curve::CurveCreator_Curve( const CurveCreator::Dimension theDimension ) -: myIsLocked (false), +: mySkipSorting (false), + myIsLocked (false), myDimension (theDimension), myDisplayer (NULL), - myAISShape (NULL), - myNbUndos (0), - myNbRedos (0), - myUndoDepth (-1), - myOpLevel(0), - mySkipSorting(false), myPointAspectColor (Quantity_NOC_ROYALBLUE4), myCurveColor (Quantity_NOC_RED), - myEraseAll(true), - myLineWidth(1) + myLineWidth (1), + myNbUndos (0), + myNbRedos (0), + myUndoDepth (-1), + myOpLevel (0), + myAISShape (NULL), + myEraseAll (true) { } @@ -95,12 +95,12 @@ std::string CurveCreator_Curve::getUniqSectionName() const sprintf( aBuffer, "Section_%d", i+1 ); std::string aName(aBuffer); int j; - for( j = 0 ; j < mySections.size() ; j++ ){ + for( j = 0 ; j < (int)mySections.size() ; j++ ){ aSection = (CurveCreator_Section*)getSection( j ); if ( aSection && aSection->myName == aName ) break; } - if( j == mySections.size() ) + if( j == (int)mySections.size() ) return aName; } return ""; @@ -791,8 +791,8 @@ bool CurveCreator_Curve::addPointsInternal( const CurveCreator::SectionsMap &the anIterPosition = aSection->myPoints.end(); else anIterPosition = aSection->myPoints.begin() + toICoord(anIPnt); - CurveCreator::Coordinates::const_iterator aFirstPosition = - aCoords.begin(); + /*CurveCreator::Coordinates::const_iterator aFirstPosition = + aCoords.begin();*/ aSection->myPoints.insert(anIterPosition, aCoords.begin(), aCoords.end()); } @@ -884,9 +884,9 @@ bool CurveCreator_Curve::setPoint( const int theISection, aPoints.push_back( aPosPoint ); aSectionsMap[theISection] = aPoints; - int aSize1 = getNbPoints( theISection ); + /*int aSize1 = */getNbPoints( theISection ); // todo: unused variable res = setPointInternal( aSectionsMap ); - int aSize2 = getNbPoints( theISection ); + /*int aSize2 = */getNbPoints( theISection ); // todo: unused variable finishOperation(); diff --git a/src/CurveCreator/CurveCreator_Curve.hxx b/src/CurveCreator/CurveCreator_Curve.hxx index a05113a8e..b0d89d9b3 100644 --- a/src/CurveCreator/CurveCreator_Curve.hxx +++ b/src/CurveCreator/CurveCreator_Curve.hxx @@ -217,7 +217,7 @@ public: //! A virtual method. const CurveCreator_ISection* getSection(const int theSectionIndex) const { - if (theSectionIndex >= 0 && theSectionIndex < mySections.size()) + if (theSectionIndex >= 0 && theSectionIndex < (int)mySections.size()) { return (CurveCreator_ISection*)mySections[theSectionIndex]; } diff --git a/src/CurveCreator/CurveCreator_Diff.cxx b/src/CurveCreator/CurveCreator_Diff.cxx index 62b7b7fb2..de33d8e64 100644 --- a/src/CurveCreator/CurveCreator_Diff.cxx +++ b/src/CurveCreator/CurveCreator_Diff.cxx @@ -275,6 +275,8 @@ bool CurveCreator_Diff::init(const CurveCreator_Curve *theCurve, setNbUndos(1); isOK = myPUndo[0].init(CurveCreator_Operation::RemoveSection, -1); break; + default: + break; } } } @@ -299,6 +301,8 @@ bool CurveCreator_Diff::init(const CurveCreator_Curve *theCurve, isOK = myPUndo[0].init(CurveCreator_Operation::RenameSection, theCurve->getSectionName(theIntParam1), theIntParam1); break; + default: + break; } } if( !isOK ){ diff --git a/src/CurveCreator/CurveCreator_Displayer.cxx b/src/CurveCreator/CurveCreator_Displayer.cxx index f8b0d3411..6541bef62 100644 --- a/src/CurveCreator/CurveCreator_Displayer.cxx +++ b/src/CurveCreator/CurveCreator_Displayer.cxx @@ -29,7 +29,7 @@ CurveCreator_Displayer::CurveCreator_Displayer( Handle(AIS_InteractiveContext) t CurveCreator_Displayer::~CurveCreator_Displayer(void) { eraseAll( true ); - for( int i = 0 ; i < myObjects.size() ; i++ ){ + for( int i = 0 ; i < (int)myObjects.size() ; i++ ){ myObjects[i].Nullify(); } myObjects.clear(); @@ -54,7 +54,7 @@ void CurveCreator_Displayer::eraseAll( bool isUpdate ) { if(myObjects.empty()) return; - for( int i = 0 ; i < myObjects.size() ; i++ ) + for( int i = 0 ; i < (int)myObjects.size() ; i++ ) myContext->Erase(myObjects[i], Standard_False); myObjects.clear(); if( isUpdate ) @@ -80,7 +80,7 @@ Quantity_Color CurveCreator_Displayer::getActiveColor( bool isHL ) void CurveCreator_Displayer::Update() { - for( int i = 0 ; i < myObjects.size() ; i++ ) + for( int i = 0 ; i < (int)myObjects.size() ; i++ ) myContext->Update(myObjects[i], Standard_True); myContext->UpdateCurrentViewer(); } diff --git a/src/CurveCreator/CurveCreator_ICurve.hxx b/src/CurveCreator/CurveCreator_ICurve.hxx index be321e80a..39e7a5d18 100644 --- a/src/CurveCreator/CurveCreator_ICurve.hxx +++ b/src/CurveCreator/CurveCreator_ICurve.hxx @@ -50,7 +50,7 @@ namespace CurveCreator Dim3d = 3 }; -}; +} //! The type represents the interface to the curve section. struct CURVECREATOR_EXPORT CurveCreator_ISection diff --git a/src/CurveCreator/CurveCreator_Operation.cxx b/src/CurveCreator/CurveCreator_Operation.cxx index 1a48fcc35..dbdf23564 100644 --- a/src/CurveCreator/CurveCreator_Operation.cxx +++ b/src/CurveCreator/CurveCreator_Operation.cxx @@ -363,6 +363,8 @@ void CurveCreator_Operation::apply(CurveCreator_Curve *theCurve) case CurveCreator_Operation::SetCoordinates: theCurve->setPointInternal( aSectionsMap ); break; + default: + break; } } break; diff --git a/src/CurveCreator/CurveCreator_TableView.cxx b/src/CurveCreator/CurveCreator_TableView.cxx index 4251d425d..77336440b 100644 --- a/src/CurveCreator/CurveCreator_TableView.cxx +++ b/src/CurveCreator/CurveCreator_TableView.cxx @@ -205,10 +205,12 @@ int CurveCreator_TableView::getPointId( const int theRowId ) const void CurveCreator_TableView::OnHeaderClick( int theLogicalId ) { if( theLogicalId == myCurrentSortId ) + { if( myCurrentSortOrder == Qt::AscendingOrder ) myCurrentSortOrder = Qt::DescendingOrder; else myCurrentSortOrder = Qt::AscendingOrder; + } sortByColumn( theLogicalId, myCurrentSortOrder ); diff --git a/src/CurveCreator/CurveCreator_TreeView.cxx b/src/CurveCreator/CurveCreator_TreeView.cxx index c2a6505e3..bec6d1b96 100644 --- a/src/CurveCreator/CurveCreator_TreeView.cxx +++ b/src/CurveCreator/CurveCreator_TreeView.cxx @@ -65,7 +65,7 @@ CurveCreator_TreeViewModel::CurveCreator_TreeViewModel( CurveCreator_ICurve* the int CurveCreator_TreeViewModel::columnCount(const QModelIndex & parent ) const { - if( parent.internalId() == ID_SECTION ) + if( parent.internalId() == (quintptr)ID_SECTION ) return 2; else return 2; @@ -76,7 +76,7 @@ QVariant CurveCreator_TreeViewModel::data(const QModelIndex & index, int role ) int aRow = index.row(); int aColumn = index.column(); if( myCurve ){ - if( index.internalId() == ID_SECTION ){ + if( index.internalId() == (quintptr)ID_SECTION ){ if( role == Qt::DisplayRole ){ if( aColumn == 0 ) return QString::fromStdString(myCurve->getSectionName(aRow)); @@ -150,7 +150,7 @@ QModelIndex CurveCreator_TreeViewModel::parent(const QModelIndex & theIndex) con if( !theIndex.isValid() ) return QModelIndex(); - if( theIndex.internalId() == ID_SECTION ){ + if( theIndex.internalId() == (quintptr)ID_SECTION ){ return QModelIndex(); } return createIndex( theIndex.internalId(), 0, ID_SECTION ); @@ -165,7 +165,7 @@ int CurveCreator_TreeViewModel::rowCount(const QModelIndex & parent ) const aRowCnt = myCurve->getNbSections(); } else{ - if( parent.internalId() == ID_SECTION ){ + if( parent.internalId() == (quintptr)ID_SECTION ){ //Points level aRowCnt = myCurve->getNbPoints(parent.row()); } @@ -191,21 +191,21 @@ QModelIndex CurveCreator_TreeViewModel::pointIndex( int theSection, int thePoint bool CurveCreator_TreeViewModel::isSection( const QModelIndex& theIndx ) const { - if( theIndx.internalId() == ID_SECTION ) + if( theIndx.internalId() == (quintptr)ID_SECTION ) return true; return false; } int CurveCreator_TreeViewModel::getSection( const QModelIndex& theIndx ) const { - if( theIndx.internalId() == ID_SECTION ) + if( theIndx.internalId() == (quintptr)ID_SECTION ) return theIndx.row(); return theIndx.internalId(); } int CurveCreator_TreeViewModel::getPoint( const QModelIndex& theIndx ) const { - if( theIndx.internalId() == ID_SECTION ) + if( theIndx.internalId() == (quintptr)ID_SECTION ) return -1; return theIndx.row(); } @@ -320,7 +320,7 @@ void CurveCreator_TreeView::sectionsRemoved( int theSection, int theSectionCnt ) } } -void CurveCreator_TreeView::setIndexState( const QModelIndex& theIndx, bool& isExpanded, bool& isSelected, bool& isCurrent ) +void CurveCreator_TreeView::setIndexState( const QModelIndex& theIndx, bool& isExpanded, bool& isSelected, bool& /*isCurrent*/ ) // todo: isCurrent is not set! { setExpanded( theIndx, isExpanded ); QItemSelectionModel::SelectionFlags aFlag = QItemSelectionModel::Select; diff --git a/src/CurveCreator/CurveCreator_Utils.cxx b/src/CurveCreator/CurveCreator_Utils.cxx index f115904b3..ef1705d47 100644 --- a/src/CurveCreator/CurveCreator_Utils.cxx +++ b/src/CurveCreator/CurveCreator_Utils.cxx @@ -618,9 +618,9 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) ); const NCollection_Vector& selected = aSelection->Entities(); - CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), - aLast = thePoints.end(); - bool isFound = false; + /*CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), + aLast = thePoints.end();*/ + //bool isFound = false; for( int i=0; i::Iterator selIter( selected ); @@ -634,7 +634,7 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity ); gp_Pnt anOwnerPnt = aSenPnt->Point(); - Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast( aSenPnt->OwnerId() ); + Handle(SelectMgr_EntityOwner) anOwner = aSenPnt->OwnerId(); bool isIntersect = fabs( aPntsToSelect[i].X() - anOwnerPnt.X() ) < LOCAL_SELECTION_TOLERANCE && fabs( aPntsToSelect[i].Y() - anOwnerPnt.Y() ) < LOCAL_SELECTION_TOLERANCE; @@ -663,14 +663,14 @@ void CurveCreator_Utils::setLocalPointContext( const CurveCreator_ICurve* theCur return; if ( theOpen ) { - theContext->ClearCurrents( false ); + theContext->ClearCurrents( false ); // todo: deprecated OCCT API // load the curve AIS object to the local context with the point selection Handle(AIS_InteractiveObject) anAIS = theCurve->getAISObject(); if ( !anAIS.IsNull() ) { if ( anAIS->IsKind( STANDARD_TYPE( AIS_Shape ) ) ) { - theContext->Load( anAIS, -1/*selection mode*/, true/*allow decomposition*/ ); + theContext->Load( anAIS, -1/*selection mode*/); theContext->Activate( anAIS, AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_VERTEX ) ); } } diff --git a/src/CurveCreator/CurveCreator_Widget.cxx b/src/CurveCreator/CurveCreator_Widget.cxx index e5af5cdbe..b853429ca 100644 --- a/src/CurveCreator/CurveCreator_Widget.cxx +++ b/src/CurveCreator/CurveCreator_Widget.cxx @@ -82,10 +82,10 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, CurveCreator_ICurve *theCurve, const int theActionFlags, const QStringList& theCoordTitles, - Qt::WindowFlags fl ) -: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0), + Qt::WindowFlags /*fl*/ ) +: QWidget(parent), myCurve(theCurve), myNewSectionEditor(NULL), + myOCCViewer( 0 ), mySection(0), myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ), - myOCCViewer( 0 ), myOld2DMode(OCCViewer_ViewWindow::No2dMode) { bool isToEnableClosed = !( theActionFlags & DisableClosedSection ); @@ -431,6 +431,8 @@ void CurveCreator_Widget::updateActionsStates() break; }*/ + default: + break; } /*int aSelObjsCnt = aSelPoints.size() + aSelSections.size(); @@ -480,7 +482,7 @@ void CurveCreator_Widget::onModificationMode(bool checked) myLocalPointView->setVisible( checked ); } -void CurveCreator_Widget::onDetectionMode(bool checked) +void CurveCreator_Widget::onDetectionMode(bool /*checked*/) { } @@ -511,6 +513,8 @@ void CurveCreator_Widget::onModeChanged(bool checked) else if (myActionMap[MODIFICATION_MODE_ID]->isChecked()) myActionMap[MODIFICATION_MODE_ID]->trigger(); break; + default: + break; } } updateActionsStates(); @@ -617,18 +621,18 @@ void CurveCreator_Widget::onModifySection() bool isClosed = myNewSectionEditor->isClosed(); CurveCreator::SectionType aSectType = myNewSectionEditor->getSectionType(); if( myCurve->getSectionName(mySection) != aName.toStdString() ) - myCurve->setSectionName( mySection , aName.toStdString() ); + myCurve->setSectionName( mySection, aName.toStdString() ); - bool isGeomModified = false; + //bool isGeomModified = false; if( myCurve->getSectionType(mySection) != aSectType ) { myCurve->setSectionType( mySection, aSectType ); - isGeomModified = true; + //isGeomModified = true; } if( myCurve->isClosed(mySection) != isClosed ) { myCurve->setClosed( mySection, isClosed ); - isGeomModified = true; + //isGeomModified = true; } mySectionView->sectionChanged(mySection); updateUndoRedo(); @@ -706,7 +710,7 @@ void CurveCreator_Widget::onJoinAll() for( int i = 0, aNb = myCurve->getNbSections(); i < aNb ; i++ ){ aSectionsToJoin.push_back( i ); } - bool aRes = myCurve->join( aSectionsToJoin ); + /*bool aRes = */myCurve->join( aSectionsToJoin ); mySectionView->reset(); updateActionsStates(); @@ -1113,7 +1117,7 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow* theWindow, QMouseEven return; if (!aHasShift) - aCtx->ClearCurrents( false ); + aCtx->ClearCurrents( false ); // todo: deprecated OCCT API Handle(V3d_View) aView3d = aView->getViewPort()->getView(); if ( !aView3d.IsNull() ) @@ -1141,7 +1145,6 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow* theWindow, QMouseEven } if ( myDragStarted ) { - bool isDragged = myDragged; CurveCreator_ICurve::SectionToPointList aDraggedPoints; QMap anInitialDragPointsCoords; if ( myDragged ) { @@ -1246,7 +1249,7 @@ void CurveCreator_Widget::onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent ) * Set zero viewer by the last view closed in * \param theManager a viewer manager */ -void CurveCreator_Widget::onLastViewClosed( SUIT_ViewManager* theManager ) +void CurveCreator_Widget::onLastViewClosed( SUIT_ViewManager* /*theManager*/ ) { myOCCViewer = 0; } @@ -1266,7 +1269,7 @@ void CurveCreator_Widget::onMouseMove( QMouseEvent* theEvent ) onMouseMove( 0, theEvent ); } -void CurveCreator_Widget::onCellChanged( int theRow, int theColumn ) +void CurveCreator_Widget::onCellChanged( int theRow, int /*theColumn*/ ) { int aCurrSect = myLocalPointView->getSectionId( theRow ); int aPntIndex = myLocalPointView->getPointId( theRow ); @@ -1459,7 +1462,7 @@ void CurveCreator_Widget::updateLocalPointView() return; CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints ); - int aNbPoints = myLocalPoints.size(); + //int aNbPoints = myLocalPoints.size(); //bool isRowLimit = aNbPoints > myLocalPointRowLimit; myLocalPointView->setVisible( getActionMode() == ModificationMode/* && !isRowLimit */); diff --git a/src/DependencyTree/DependencyTree_Arrow.cxx b/src/DependencyTree/DependencyTree_Arrow.cxx index 0095c52dd..e8e11cdbb 100644 --- a/src/DependencyTree/DependencyTree_Arrow.cxx +++ b/src/DependencyTree/DependencyTree_Arrow.cxx @@ -38,11 +38,11 @@ const qreal arrowSize = 20; DependencyTree_Arrow::DependencyTree_Arrow( DependencyTree_Object* theStartItem, DependencyTree_Object* theEndItem, - QGraphicsItem* parent, QGraphicsScene* scene ) + QGraphicsItem* parent, QGraphicsScene* /*scene*/ ) :QGraphicsLineItem( parent ), -myIsBiLink( false ), myStartItem( theStartItem ), -myEndItem( theEndItem ) +myEndItem( theEndItem ), +myIsBiLink( false ) { SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index edcb9586c..e6faa1093 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -82,7 +82,7 @@ DisplayGUI::~DisplayGUI() // function : DisplayGUI::OnGUIEvent() // purpose : Dispatch menu command //======================================================================= -bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) +bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/) { SalomeApp_Application* app = getGeometryGUI()->getApp(); if (!app) return false; diff --git a/src/DlgRef/DlgRef.h b/src/DlgRef/DlgRef.h index 11edd3df2..b835e1262 100644 --- a/src/DlgRef/DlgRef.h +++ b/src/DlgRef/DlgRef.h @@ -979,6 +979,6 @@ public: namespace DlgRef { DLGREF_EXPORT QString PrintDoubleValue( double, int = 16 ); -}; +} #endif // GEOM_DLGREF_H diff --git a/src/DlgRef/DlgRef_1Check1Spin1Check_QTD.ui b/src/DlgRef/DlgRef_1Check1Spin1Check_QTD.ui index d4dc9543f..42573e925 100644 --- a/src/DlgRef/DlgRef_1Check1Spin1Check_QTD.ui +++ b/src/DlgRef/DlgRef_1Check1Spin1Check_QTD.ui @@ -31,7 +31,7 @@ - + 6 diff --git a/src/DlgRef/DlgRef_1Sel1Frame_QTD.ui b/src/DlgRef/DlgRef_1Sel1Frame_QTD.ui index c4e51d14e..810785e6f 100644 --- a/src/DlgRef/DlgRef_1Sel1Frame_QTD.ui +++ b/src/DlgRef/DlgRef_1Sel1Frame_QTD.ui @@ -31,7 +31,7 @@ - + diff --git a/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui b/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui index 562f2cef8..26c18b45b 100644 --- a/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui +++ b/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui @@ -143,8 +143,8 @@ PushButton1 LineEdit1 + ComboBox1 CheckButton1 - ListView1 PushButton2 PushButton3 PushButton4 diff --git a/src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui index 0eeeedded..f11cee9a9 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui +++ b/src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui @@ -25,7 +25,7 @@ - + 6 diff --git a/src/DlgRef/DlgRef_2Sel1List2Check_QTD.ui b/src/DlgRef/DlgRef_2Sel1List2Check_QTD.ui index 8cc018c02..561f7c0c7 100644 --- a/src/DlgRef/DlgRef_2Sel1List2Check_QTD.ui +++ b/src/DlgRef/DlgRef_2Sel1List2Check_QTD.ui @@ -25,7 +25,7 @@ - + diff --git a/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui index 479e7bd81..06d30c9ab 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui +++ b/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui @@ -25,7 +25,7 @@ - + 6 diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Push_QTD.ui b/src/DlgRef/DlgRef_2Sel2Spin1Push_QTD.ui index d24095449..1d8224b11 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin1Push_QTD.ui +++ b/src/DlgRef/DlgRef_2Sel2Spin1Push_QTD.ui @@ -25,7 +25,7 @@ - + diff --git a/src/DlgRef/DlgRef_2Sel2Spin2Push_QTD.ui b/src/DlgRef/DlgRef_2Sel2Spin2Push_QTD.ui index 625ad9d62..6b2f4b580 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin2Push_QTD.ui +++ b/src/DlgRef/DlgRef_2Sel2Spin2Push_QTD.ui @@ -25,7 +25,7 @@ - + diff --git a/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui index f6f82c007..58eb605d8 100644 --- a/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui +++ b/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui @@ -36,7 +36,7 @@ - + diff --git a/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui b/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui index 7d6b025ed..6e49d1334 100644 --- a/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui +++ b/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui @@ -22,7 +22,7 @@ - + 6 diff --git a/src/DlgRef/DlgRef_3Sel2Spin_QTD.ui b/src/DlgRef/DlgRef_3Sel2Spin_QTD.ui index 509282969..aa97c8ac6 100644 --- a/src/DlgRef/DlgRef_3Sel2Spin_QTD.ui +++ b/src/DlgRef/DlgRef_3Sel2Spin_QTD.ui @@ -36,7 +36,7 @@ - + diff --git a/src/DlgRef/DlgRef_4Spin_QTD.ui b/src/DlgRef/DlgRef_4Spin_QTD.ui index ae4643041..65bbb1126 100644 --- a/src/DlgRef/DlgRef_4Spin_QTD.ui +++ b/src/DlgRef/DlgRef_4Spin_QTD.ui @@ -25,7 +25,7 @@ - + diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index 5d470125c..33a327485 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/src/EntityGUI/EntityGUI.cxx @@ -213,7 +213,7 @@ bool EntityGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) // function : 0nMousePress() // purpose : [static] manage mouse events //================================================================================= -bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow ) +bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* theViewWindow ) { QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox(); @@ -295,7 +295,7 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi // function : 0nMouseRelease() // purpose : [static] manage mouse events //================================================================================= -bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow ) +bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* theViewWindow ) { ((OCCViewer_ViewWindow*)theViewWindow)->setSketcherStyle(false); #ifdef WITH_OPENCV @@ -324,7 +324,7 @@ bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_View // function : 0nMouseMove() // purpose : [static] manage mouse events //================================================================================= -bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow ) +bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* theViewWindow ) { QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox(); @@ -390,7 +390,7 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha } ic->UpdateCurrentViewer(); } - catch( Standard_Failure ) { + catch( Standard_Failure& ) { MESSAGE( "Exception caught in EntityGUI::DisplaySimulationShape" ); } } diff --git a/src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui b/src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui index df1b68894..38bdd3983 100644 --- a/src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui +++ b/src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui @@ -25,7 +25,7 @@ Values - + diff --git a/src/EntityGUI/EntityGUI_1Sel1Spin_QTD.ui b/src/EntityGUI/EntityGUI_1Sel1Spin_QTD.ui index a40875a0e..e1fa7f231 100644 --- a/src/EntityGUI/EntityGUI_1Sel1Spin_QTD.ui +++ b/src/EntityGUI/EntityGUI_1Sel1Spin_QTD.ui @@ -25,7 +25,7 @@ Values - + diff --git a/src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui b/src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui index 4d0f6d907..0fa31e48c 100644 --- a/src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui +++ b/src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui @@ -25,7 +25,7 @@ Values - + diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index ef19ec0f3..e90a4495b 100644 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -130,8 +130,8 @@ private: const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode); - void ComputeSelection ( const Handle(SelectMgr_Selection)& aSelection, - const Standard_Integer aMode){} ; + void ComputeSelection ( const Handle(SelectMgr_Selection)& /*aSelection*/, + const Standard_Integer /*aMode*/){} ; protected: TCollection_ExtendedString aText; @@ -171,11 +171,11 @@ AIS_Text::AIS_Text( const TCollection_ExtendedString& text, const gp_Pnt& positi aColor = color; aFontAspect = fontAspect; aFont = font; -}; +} -void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, +void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer aMode) + const Standard_Integer /*aMode*/) { aPresentation->Clear(); @@ -191,8 +191,8 @@ void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentation asp->Aspect()->SetTextZoomable(aZoomable); asp->Aspect()->SetTextAngle(aAngle); asp->Aspect()->SetTextFontAspect(aFontAspect); - Prs3d_Text::Draw(aPresentation, asp, aText, aPosition); -}; + Prs3d_Text::Draw(aPresentation, asp, aText, aPosition); // todo: deprecated OCCT API +} bool isSame (double d1, double d2) { @@ -210,11 +210,11 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q bool modal, Qt::WindowFlags fl, const double lineWidth) : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl), + myLengthIORedoList(), myMode(-1), myOK(false), myLineWidth(lineWidth), myGeometryGUI(theGeometryGUI), - myLengthIORedoList(), myIsUndoRedo(false) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); @@ -831,7 +831,7 @@ void EntityGUI_3DSketcherDlg::ActivateThisDialog() // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void EntityGUI_3DSketcherDlg::ValueChangedInSpinBox (double newValue) +void EntityGUI_3DSketcherDlg::ValueChangedInSpinBox (double /*newValue*/) { GEOMBase_Helper::displayPreview(true, false, true, true, myLineWidth); } @@ -917,7 +917,7 @@ void EntityGUI_3DSketcherDlg::BoxChecked (bool checked) // function : ButtonClicked() // purpose : //================================================================================= -void EntityGUI_3DSketcherDlg::ButtonClicked (bool checked) +void EntityGUI_3DSketcherDlg::ButtonClicked (bool /*checked*/) { if (GroupAngles->radioButton_1->isChecked()) myOrientation = OXY; @@ -1326,8 +1326,8 @@ void EntityGUI_3DSketcherDlg::displayPreview (GEOM::GEOM_Object_ptr object, const bool activate, const bool update, const double lineWidth, - const int displayMode, - const int color) + const int /*displayMode*/, + const int /*color*/) { SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); diff --git a/src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui b/src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui index b298c7c9d..79834a292 100644 --- a/src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui +++ b/src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui @@ -25,7 +25,7 @@ Values - + diff --git a/src/EntityGUI/EntityGUI_Angles_QTD.ui b/src/EntityGUI/EntityGUI_Angles_QTD.ui index a5c4aa5fb..e4c14c046 100644 --- a/src/EntityGUI/EntityGUI_Angles_QTD.ui +++ b/src/EntityGUI/EntityGUI_Angles_QTD.ui @@ -25,7 +25,7 @@ Values - + diff --git a/src/EntityGUI/EntityGUI_Controls_QTD.ui b/src/EntityGUI/EntityGUI_Controls_QTD.ui index 7d8c71b74..8ff88fb69 100644 --- a/src/EntityGUI/EntityGUI_Controls_QTD.ui +++ b/src/EntityGUI/EntityGUI_Controls_QTD.ui @@ -30,7 +30,7 @@ - + diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index 89d86c11b..fdaddeded 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx @@ -407,8 +407,8 @@ void EntityGUI_FeatureDetectorDlg::SelectionIntoArgument() { // TODO supprimer les lignes qui ne servent à rien le cas échéant - SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow(); - SOCC_Viewer* soccViewer = (SOCC_Viewer*)(theViewWindow->getViewManager()->getViewModel()); + //SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow(); + //SOCC_Viewer* soccViewer = (SOCC_Viewer*)(theViewWindow->getViewManager()->getViewModel()); if (!myEditCurrentArgument->isEnabled()) return; @@ -618,9 +618,10 @@ ShapeRec_Parameters* EntityGUI_FeatureDetectorDlg::parametersChanged() aCornersParameters->qualityLevel = (dynamic_cast(myWidgets[QUALITY_LEVEL]))->value(); aCornersParameters->minDistance = (dynamic_cast(myWidgets[MIN_DISTANCE]))->value(); switch ( (dynamic_cast(myWidgets[TYPE_CRITERIA]))->currentIndex() ) { - case 0: aCornersParameters->typeCriteria = CV_TERMCRIT_ITER; - case 1: aCornersParameters->typeCriteria = CV_TERMCRIT_EPS; - case 2: aCornersParameters->typeCriteria = CV_TERMCRIT_ITER | CV_TERMCRIT_EPS; + case 0: aCornersParameters->typeCriteria = CV_TERMCRIT_ITER; break; + case 1: aCornersParameters->typeCriteria = CV_TERMCRIT_EPS; break; + case 2: aCornersParameters->typeCriteria = CV_TERMCRIT_ITER | CV_TERMCRIT_EPS; break; + default: break; } aCornersParameters->maxIter = (dynamic_cast(myWidgets[MAX_ITER]))->value(); aCornersParameters->epsilon = (dynamic_cast(myWidgets[EPSILON]))->value(); diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h index b4d3825f5..4e6d6c8e6 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h @@ -106,7 +106,7 @@ private: QList myWidgets; // Output typeselection widget - DlgRef_3Radio* myOutputGroup;; + DlgRef_3Radio* myOutputGroup; gp_Pnt myStartPnt; gp_Pnt myEndPnt; diff --git a/src/EntityGUI/EntityGUI_FieldDlg.cxx b/src/EntityGUI/EntityGUI_FieldDlg.cxx index d3efa0a7b..de5cde856 100644 --- a/src/EntityGUI/EntityGUI_FieldDlg.cxx +++ b/src/EntityGUI/EntityGUI_FieldDlg.cxx @@ -344,7 +344,7 @@ void EntityGUI_FieldDlg::Delegate::setModelData( QWidget* editor, void EntityGUI_FieldDlg::Delegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, - const QModelIndex& index ) const + const QModelIndex& /*index*/ ) const { editor->setGeometry( option.rect ); } @@ -393,7 +393,7 @@ EntityGUI_FieldDlg::StepTable::StepTable (int stepID, int dataType, if ( !bs->_is_nil() ) { GEOM::short_array_var vals = bs->GetValues(); - if ( vals->length() == nbRows * nbComps ) + if ( (int)vals->length() == nbRows * nbComps ) for ( int iV = 0, iR = 0; iR < nbRows; ++iR ) for ( int iC = 1; iC < nbColumns; ++iC ) setItem( iR, iC, new CheckItem( vals[ iV++ ])); @@ -407,7 +407,7 @@ EntityGUI_FieldDlg::StepTable::StepTable (int stepID, int dataType, if ( !is->_is_nil() ) { GEOM::ListOfLong_var vals = is->GetValues(); - if ( vals->length() == nbRows * nbComps ) + if ( (int)vals->length() == nbRows * nbComps ) for ( int iV = 0, iR = 0; iR < nbRows; ++iR ) for ( int iC = 1; iC < nbColumns; ++iC ) setItem( iR, iC, new IntSpinItem( vals[ iV++ ])); @@ -420,7 +420,7 @@ EntityGUI_FieldDlg::StepTable::StepTable (int stepID, int dataType, if ( !ds->_is_nil() ) { GEOM::ListOfDouble_var vals = ds->GetValues(); - if ( vals->length() == nbRows * nbComps ) + if ( (int)vals->length() == nbRows * nbComps ) for ( int iV = 0, iR = 0; iR < nbRows; ++iR ) for ( int iC = 1; iC < nbColumns; ++iC ) setItem( iR, iC, new DoubleSpinItem( vals[ iV++ ])); @@ -432,7 +432,7 @@ EntityGUI_FieldDlg::StepTable::StepTable (int stepID, int dataType, if ( !ss->_is_nil() ) { GEOM::string_array_var vals = ss->GetValues(); - if ( vals->length() == nbRows * nbComps ) + if ( (int)vals->length() == nbRows * nbComps ) for ( int iV = 0, iR = 0; iR < nbRows; ++iR ) for ( int iC = 1; iC < nbColumns; ++iC ) setItem( iR, iC, new QTableWidgetItem( vals[ iV++ ].in() )); @@ -1054,7 +1054,7 @@ void EntityGUI_FieldDlg::Init() // function : enterEvent() // purpose : //================================================================================= -void EntityGUI_FieldDlg::enterEvent(QEvent* e) +void EntityGUI_FieldDlg::enterEvent(QEvent*) { if (!buttonCancel()->isEnabled()) ActivateThisDialog(); @@ -1413,7 +1413,7 @@ void EntityGUI_FieldDlg::showCurStep() if ( !myIsCreation && !myField->_is_nil() ) { GEOM::string_array_var compNames = myField->GetComponents(); - for ( int iC = 0; iC < compNames->length(); ++iC ) + for ( int iC = 0; iC < (int)compNames->length(); ++iC ) headers << compNames[ iC ].in(); } else @@ -1628,7 +1628,7 @@ void EntityGUI_FieldDlg::updateDims(int curDim) //================================================================================= void EntityGUI_FieldDlg::activateSelection() { - bool isApply = ((QPushButton*)sender() == buttonApply()); + //bool isApply = ((QPushButton*)sender() == buttonApply()); if(!isApplyAndClose()) erasePreview(false); diff --git a/src/EntityGUI/EntityGUI_IsolineDlg.cxx b/src/EntityGUI/EntityGUI_IsolineDlg.cxx index 313464132..88e3966c5 100644 --- a/src/EntityGUI/EntityGUI_IsolineDlg.cxx +++ b/src/EntityGUI/EntityGUI_IsolineDlg.cxx @@ -198,7 +198,7 @@ GEOM::GEOM_IOperations_ptr EntityGUI_IsolineDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool EntityGUI_IsolineDlg::isValid (QString& msg) +bool EntityGUI_IsolineDlg::isValid (QString& /*msg*/) { return myFace; } @@ -278,7 +278,7 @@ void EntityGUI_IsolineDlg::SetEditFace() // function : ValueChangedInSpinBox // purpose : //================================================================================= -void EntityGUI_IsolineDlg::ValueChangedInSpinBox(double newValue) +void EntityGUI_IsolineDlg::ValueChangedInSpinBox(double /*newValue*/) { displayPreview(true); } diff --git a/src/EntityGUI/EntityGUI_PolylineDlg.cxx b/src/EntityGUI/EntityGUI_PolylineDlg.cxx index a92758ebf..3d6bc3741 100644 --- a/src/EntityGUI/EntityGUI_PolylineDlg.cxx +++ b/src/EntityGUI/EntityGUI_PolylineDlg.cxx @@ -62,8 +62,8 @@ EntityGUI_PolylineDlg::EntityGUI_PolylineDlg myPlnComboBox (0), myPlnButton (0), myPlnSelButton (0), - myWPlaneLineEdit (0), myPolylineSelButton (0), + myWPlaneLineEdit (0), myPolylineEdit (0), myEditCurrentArgument (0), myPreviewManager(0), @@ -293,7 +293,7 @@ GEOM::GEOM_IOperations_ptr EntityGUI_PolylineDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool EntityGUI_PolylineDlg::isValid( QString& msg ) +bool EntityGUI_PolylineDlg::isValid( QString& /*msg*/ ) { return true; } @@ -530,7 +530,7 @@ void EntityGUI_PolylineDlg::SelectionIntoArgument( bool isForced ) // function : SetEditCurrentArgument() // purpose : //================================================================================= -void EntityGUI_PolylineDlg::SetEditCurrentArgument( bool isChecked ) +void EntityGUI_PolylineDlg::SetEditCurrentArgument( bool /*isChecked*/ ) { if (sender() == myPlnSelButton) { diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index c2456fbeb..88e48bd5f 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -83,9 +83,9 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg( GeometryGUI* GUI, QWidget* parent, bool modal, Qt::WindowFlags fl, const double lineWidth ) : QDialog( parent, fl ), + GEOMBase_Helper( dynamic_cast( parent ) ), myIsAllAdded( false ), myIsApply( false ), - GEOMBase_Helper( dynamic_cast( parent ) ), myGeometryGUI( GUI ), myLineWidth( lineWidth ) { @@ -1873,7 +1873,7 @@ void EntityGUI_SketcherDlg::ValueChangedInSpinBox( double newValue ) LastDecimal = aPrecision; else // 'g' format in the QString LastDecimal = qAbs( aPrecision ) - ceil( log10(minRad) ); - minRad = ceil(pow(10,LastDecimal) * minRad) / pow(10,LastDecimal); // Rounded up at the last allowed decimal place + minRad = ceil(pow(10,LastDecimal) * minRad) / pow(10,LastDecimal); // Rounded up at the last allowed decimal place if ( Abs(vz) < minRad){ if (vz < 0.0) Group3Spin->SpinBox_DZ->setValue( - minRad ); @@ -2492,8 +2492,8 @@ void EntityGUI_SketcherDlg::displayPreview( GEOM::GEOM_Object_ptr object, const bool activate, const bool update, const double lineWidth, - const int displayMode, - const int color ) + const int /*displayMode*/, + const int /*color*/ ) { SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx index 541581d0e..c72483cac 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx @@ -910,7 +910,7 @@ void EntityGUI_SubShapeDlg::ClickOnOkFilter() TopTools_IndexedMapOfShape aSubShapesMap; TopExp::MapShapes(myShape, aSubShapesMap); - SALOME_View* view = GEOM_Displayer::GetActiveView(); + //SALOME_View* view = GEOM_Displayer::GetActiveView(); getDisplayer()->Erase(myObject, false, false); CORBA::String_var aMainEntry = myObject->GetStudyEntry(); QString anEntryBase = aMainEntry.in(); diff --git a/src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx b/src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx index 94878d5bf..c54a5c6ff 100644 --- a/src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx +++ b/src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx @@ -176,7 +176,7 @@ GEOM::GEOM_IOperations_ptr EntityGUI_SurfFromFaceDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool EntityGUI_SurfFromFaceDlg::isValid (QString& msg) +bool EntityGUI_SurfFromFaceDlg::isValid (QString& /*msg*/) { return myFace; } diff --git a/src/GEOM/GEOM_BaseDriver.cxx b/src/GEOM/GEOM_BaseDriver.cxx index c922810d4..d55188334 100644 --- a/src/GEOM/GEOM_BaseDriver.cxx +++ b/src/GEOM/GEOM_BaseDriver.cxx @@ -33,7 +33,7 @@ #include #include -IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver) //================================================================================ /*! diff --git a/src/GEOM/GEOM_BaseDriver.hxx b/src/GEOM/GEOM_BaseDriver.hxx index 118cefc45..37dfa4ee8 100644 --- a/src/GEOM/GEOM_BaseDriver.hxx +++ b/src/GEOM/GEOM_BaseDriver.hxx @@ -100,6 +100,6 @@ public: DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver) }; -DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver); +DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver) #endif diff --git a/src/GEOM/GEOM_BaseObject.cxx b/src/GEOM/GEOM_BaseObject.cxx index c3a710c2a..72e6c9bfd 100644 --- a/src/GEOM/GEOM_BaseObject.cxx +++ b/src/GEOM/GEOM_BaseObject.cxx @@ -486,4 +486,4 @@ TDF_Label GEOM_BaseObject::GetFreeLabel() return _label.FindChild(FREE_LABEL); } -IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient ) diff --git a/src/GEOM/GEOM_BaseObject.hxx b/src/GEOM/GEOM_BaseObject.hxx index 3abac4f1b..40986a688 100644 --- a/src/GEOM/GEOM_BaseObject.hxx +++ b/src/GEOM/GEOM_BaseObject.hxx @@ -37,7 +37,7 @@ class GEOM_BaseObject; class GEOM_Engine; -DEFINE_STANDARD_HANDLE( GEOM_BaseObject, Standard_Transient ); +DEFINE_STANDARD_HANDLE( GEOM_BaseObject, Standard_Transient ) class GEOM_BaseObject : public Standard_Transient { diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 0386e4236..c69a5722f 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -114,7 +114,7 @@ bool ProcessFunction(Handle(GEOM_Function)& theFunction, TCollection_AsciiString& theScript, TCollection_AsciiString& theAfterScript, const TVariablesList& theVariables, - const bool theIsPublished, + const bool /*theIsPublished*/, TDF_LabelMap& theProcessed, std::set& theIgnoreObjs, bool& theIsDumpCollected); @@ -1560,7 +1560,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand, //============================================================================= void ReplaceEntriesByNames (TCollection_AsciiString& theScript, TSting2ObjDataMap& aEntry2ObjData, - const bool theIsPublished, + const bool /*theIsPublished*/, TColStd_SequenceOfAsciiString& theObjListToPublish, Standard_Integer& objectCounter, Resource_DataMapOfAsciiStringAsciiString& aNameToEntry) diff --git a/src/GEOM/GEOM_Field.cxx b/src/GEOM/GEOM_Field.cxx index 88f1360c5..9c35c95cb 100644 --- a/src/GEOM/GEOM_Field.cxx +++ b/src/GEOM/GEOM_Field.cxx @@ -756,5 +756,5 @@ const Standard_GUID& GEOM_FieldStep::GetDataID() return TDataStd_ExtStringArray::GetID(); } -IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject ); -IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject ) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject ) diff --git a/src/GEOM/GEOM_Field.hxx b/src/GEOM/GEOM_Field.hxx index 288fafd06..2d9d3a96c 100644 --- a/src/GEOM/GEOM_Field.hxx +++ b/src/GEOM/GEOM_Field.hxx @@ -33,8 +33,8 @@ const int GEOM_FIELD_STEP_OBJTYPE = 53; class GEOM_Field; class GEOM_FieldStep; -DEFINE_STANDARD_HANDLE( GEOM_Field, GEOM_BaseObject ); -DEFINE_STANDARD_HANDLE( GEOM_FieldStep, GEOM_BaseObject ); +DEFINE_STANDARD_HANDLE( GEOM_Field, GEOM_BaseObject ) +DEFINE_STANDARD_HANDLE( GEOM_FieldStep, GEOM_BaseObject ) class GEOM_Field : public GEOM_BaseObject { diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx index 725592939..4d7aed766 100644 --- a/src/GEOM/GEOM_Function.cxx +++ b/src/GEOM/GEOM_Function.cxx @@ -977,4 +977,4 @@ void* GEOM_Function::GetCallBackData() return reinterpret_cast ( address ); } -IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient ) diff --git a/src/GEOM/GEOM_Function.hxx b/src/GEOM/GEOM_Function.hxx index 2328aa475..1b5f5fbae 100644 --- a/src/GEOM/GEOM_Function.hxx +++ b/src/GEOM/GEOM_Function.hxx @@ -37,7 +37,7 @@ #include class GEOM_Function; -DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient); +DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient) class GEOM_Function : public Standard_Transient { diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx index fda134620..b8145b1ac 100644 --- a/src/GEOM/GEOM_Object.cxx +++ b/src/GEOM/GEOM_Object.cxx @@ -296,5 +296,5 @@ GEOM_Object::GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObject return funs; } -IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject ) diff --git a/src/GEOM/GEOM_Object.hxx b/src/GEOM/GEOM_Object.hxx index 42f89e099..06f54ae3e 100644 --- a/src/GEOM/GEOM_Object.hxx +++ b/src/GEOM/GEOM_Object.hxx @@ -37,7 +37,7 @@ class GEOM_Object; class TFunction_Driver; class GEOM_Engine; -DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject ); +DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject ) class GEOM_Object : public GEOM_BaseObject { diff --git a/src/GEOM/GEOM_Solver.cxx b/src/GEOM/GEOM_Solver.cxx index acfd8d21e..aca09678a 100644 --- a/src/GEOM/GEOM_Solver.cxx +++ b/src/GEOM/GEOM_Solver.cxx @@ -34,7 +34,7 @@ * Update */ //============================================================================= -bool GEOM_Solver::Update(TDF_LabelSequence& theSeq) +bool GEOM_Solver::Update(TDF_LabelSequence& /*theSeq*/) { return false; } @@ -44,7 +44,7 @@ bool GEOM_Solver::Update(TDF_LabelSequence& theSeq) * UpdateObject */ //============================================================================= -bool GEOM_Solver::UpdateObject(Handle(GEOM_Object) theObject, TDF_LabelSequence& theSeq) +bool GEOM_Solver::UpdateObject(Handle(GEOM_Object) /*theObject*/, TDF_LabelSequence& /*theSeq*/) { return false; } diff --git a/src/GEOM/GEOM_SubShapeDriver.cxx b/src/GEOM/GEOM_SubShapeDriver.cxx index a267469dd..3084f3376 100644 --- a/src/GEOM/GEOM_SubShapeDriver.cxx +++ b/src/GEOM/GEOM_SubShapeDriver.cxx @@ -155,4 +155,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver) diff --git a/src/GEOM/GEOM_SubShapeDriver.hxx b/src/GEOM/GEOM_SubShapeDriver.hxx index d38b92a90..8520bb278 100644 --- a/src/GEOM/GEOM_SubShapeDriver.hxx +++ b/src/GEOM/GEOM_SubShapeDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver ) class GEOM_SubShapeDriver : public GEOM_BaseDriver { diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx index eeccb2fe8..cc9d6d3bf 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx @@ -27,7 +27,7 @@ // #include -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx index 4244309b2..cfd1de4ed 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx @@ -39,7 +39,7 @@ #include #include -DEFINE_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); +DEFINE_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo) //======================================================================= //class : GEOMAlgo_Clsf diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx index 4c0e66a56..8be5f121f 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx @@ -31,7 +31,7 @@ #include -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx index b24d17b59..598e477c9 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx @@ -32,7 +32,7 @@ #include -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx index 253962089..c73c603f0 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx @@ -344,7 +344,7 @@ void GEOMAlgo_FinderShapeOn2::ProcessEdges() // Standard_Boolean bIsConformState, bIsToBreak; Standard_Integer i, aNb, iCnt, iErr; - TopAbs_State aSt; + TopAbs_State aSt = TopAbs_UNKNOWN; // todo: aSt must be explicitly initilized to avoid warning (see below) TopTools_IndexedMapOfShape aM; TopExp_Explorer aExp; GEOMAlgo_ListIteratorOfListOfPnt aIt; @@ -378,7 +378,7 @@ void GEOMAlgo_FinderShapeOn2::ProcessEdges() } // if (BRep_Tool::Degenerated(aE)) { - myMSS.Add(aE, aSt); + myMSS.Add(aE, aSt); // todo: aSt must be explicitly initilized to avoid warning (see above) continue; } // diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx index 9bf5f047f..be3441306 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx @@ -260,7 +260,7 @@ gp_Vec GEOMAlgo_GetInPlaceAPI::GetNormal return du ^ dv; - } catch (Standard_Failure ) { + } catch (Standard_Failure&) { } return defaultNorm; } diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx index d0b939ce8..5edc7f4e4 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx @@ -27,7 +27,7 @@ // #include -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient) //======================================================================= // function: diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx index a1afce8f9..58fa9c450 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx @@ -34,7 +34,7 @@ #include #include -DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, Standard_Transient); +DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, Standard_Transient) //======================================================================= //class : GEOMAlgo_HAlgo diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx index e355bef5b..bd07bc5b4 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx @@ -300,7 +300,7 @@ void GEOMAlgo_ShellSolid::Perform() }//for (i=iBeg; i<=iEnd; ++i) { }// try - catch (Standard_Failure) { + catch (Standard_Failure&) { myErrorStatus=12; } } diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx index 8aa1ec25d..19a914411 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx @@ -91,7 +91,7 @@ void GEOMAlgo_SolidSolid::Perform() myRank=2; BuildResult(); } - catch (Standard_Failure) { + catch (Standard_Failure&) { myErrorStatus=12; } } diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx index 8c51619e0..2ddeaf9f2 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx @@ -109,7 +109,7 @@ void GEOMAlgo_VertexSolid::Perform() BuildResult(); } // - catch (Standard_Failure) { + catch (Standard_Failure&) { myErrorStatus = 12; } } diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx index 14ba36b1f..75eafd722 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx @@ -90,7 +90,7 @@ void GEOMAlgo_WireSolid::Perform() BuildResult(); } // - catch (Standard_Failure) { + catch (Standard_Failure&) { myErrorStatus= 12; } } diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx index 883dba0d3..d91905c85 100644 --- a/src/GEOMBase/GEOMBase.cxx +++ b/src/GEOMBase/GEOMBase.cxx @@ -307,7 +307,7 @@ Handle(GEOM_AISShape) GEOMBase::ConvertIORinGEOMAISShape(const QString& IOR, boo if ( it.Value()->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) ) { Handle(GEOM_AISShape) sh = Handle(GEOM_AISShape)::DownCast( it.Value() ); if ( !sh.IsNull() && sh->hasIO() ) { - Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject)::DownCast( sh->getIO() ); + Handle(SALOME_InteractiveObject) IO = sh->getIO(); if ( !IO.IsNull() && IO->hasEntry() && obj->GetID() == IO->getEntry() ) shape = sh; } @@ -354,7 +354,7 @@ GEOM_Actor* GEOMBase::ConvertIORinGEOMActor(const QString& IOR, bool onlyInActiv if ( a->IsA( "GEOM_Actor" ) ) { GEOM_Actor* ga = GEOM_Actor::SafeDownCast( a ); if ( ga && ga->hasIO() ) { - Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject)::DownCast( ga->getIO() ); + Handle(SALOME_InteractiveObject) IO = ga->getIO(); if ( !IO.IsNull() && IO->hasEntry() && obj->GetID() == IO->getEntry() ) actor = ga; } @@ -374,7 +374,7 @@ GEOM_Actor* GEOMBase::ConvertIORinGEOMActor(const QString& IOR, bool onlyInActiv // purpose : //======================================================================= Handle(AIS_InteractiveObject) GEOMBase::GetAIS( const Handle(SALOME_InteractiveObject)& IO, - bool onlyInActiveView, bool onlyGeom ) + bool onlyInActiveView, bool /*onlyGeom*/ ) { Handle(AIS_InteractiveObject) aisObject; @@ -524,7 +524,7 @@ TopoDS_Shape GEOMBase::CreateArrowForLinearEdge( const TopoDS_Shape& shape ) } } } - catch ( Standard_Failure ) { + catch ( Standard_Failure& ) { // OCC failures are hard to catch in GUI. // This is because of the position for #include that is very critical to find // in SALOME environment : compilation error ! diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index 9361f2275..6193a3e67 100644 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -1038,7 +1038,7 @@ bool GEOMBase_Helper::isValid( QString& ) // It should perform the required operation and put all new or modified objects into // argument.Should return if some error occurs during its execution. //================================================================ -bool GEOMBase_Helper::execute( ObjectList& objects ) +bool GEOMBase_Helper::execute( ObjectList& ) { return false; } @@ -1049,7 +1049,7 @@ bool GEOMBase_Helper::execute( ObjectList& objects ) // for or a nil reference if should be published // as a top-level object. //================================================================ -GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr theObj ) +GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr ) { return GEOM::GEOM_Object::_nil(); } @@ -1058,7 +1058,7 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr theObj ) // Function : getObjectName // Purpose : Redefine this method to return proper name for the given object //================================================================ -QString GEOMBase_Helper::getObjectName(GEOM::GEOM_Object_ptr object) const +QString GEOMBase_Helper::getObjectName( GEOM::GEOM_Object_ptr ) const { return QString(); } @@ -1067,7 +1067,7 @@ QString GEOMBase_Helper::getObjectName(GEOM::GEOM_Object_ptr object) const // Function : getNewObjectName // Purpose : Redefine this method to return proper name for a new object //================================================================ -QString GEOMBase_Helper::getNewObjectName (int) const +QString GEOMBase_Helper::getNewObjectName( int ) const { return QString(); } diff --git a/src/GEOMGUI/GEOMGUI_AnnotationAttrs.cxx b/src/GEOMGUI/GEOMGUI_AnnotationAttrs.cxx index 3e97e7b0f..594005a5a 100644 --- a/src/GEOMGUI/GEOMGUI_AnnotationAttrs.cxx +++ b/src/GEOMGUI/GEOMGUI_AnnotationAttrs.cxx @@ -90,7 +90,7 @@ namespace QString( ":" ) + QString( "ShapeType=" ) + QString::number( theShapeType ) + QString( " }" ); } -}; +} //================================================================================= // function : FindAttributes diff --git a/src/GEOMGUI/GEOMGUI_AnnotationAttrs.h b/src/GEOMGUI/GEOMGUI_AnnotationAttrs.h index 2423e48ce..e6df62dda 100644 --- a/src/GEOMGUI/GEOMGUI_AnnotationAttrs.h +++ b/src/GEOMGUI/GEOMGUI_AnnotationAttrs.h @@ -205,9 +205,8 @@ private: : myObj( theObject ), myParameterMap( theParameter ) {} - GEOMGUI_AnnotationAttrs( const GEOMGUI_AnnotationAttrs& theOther ) {} - - void operator=( const GEOMGUI_AnnotationAttrs& theOther ) {} + GEOMGUI_AnnotationAttrs( const GEOMGUI_AnnotationAttrs& ); // private copy constructor, must be never called + void operator=( const GEOMGUI_AnnotationAttrs& ); // private assignment operator, must be never called private: diff --git a/src/GEOMGUI/GEOMGUI_AnnotationMgr.h b/src/GEOMGUI/GEOMGUI_AnnotationMgr.h index 30a92ee4b..0a6c9d343 100644 --- a/src/GEOMGUI/GEOMGUI_AnnotationMgr.h +++ b/src/GEOMGUI/GEOMGUI_AnnotationMgr.h @@ -45,7 +45,7 @@ class GEOM_Displayer; */ class GEOMGUI_EXPORT GEOMGUI_AnnotationMgr : public QObject { - Q_OBJECT; + Q_OBJECT public: GEOMGUI_AnnotationMgr( SalomeApp_Application* theApplication ); diff --git a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx index 110f4531b..71f79bfbf 100644 --- a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx +++ b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx @@ -106,7 +106,7 @@ void GEOMGUI_CreationInfoWdg::setInfo( GEOM::CreationInformationSeq& info ) try { - if ( &info && info.length() > 0 ) + if ( info.length() > 0 ) { SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); for ( int j = 0, nb = info.length(); j < nb; ++j ) diff --git a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.h b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.h index 6820e4bf9..924b64aeb 100644 --- a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.h +++ b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.h @@ -44,7 +44,7 @@ class SalomeApp_Application; */ class GEOMGUI_EXPORT GEOMGUI_CreationInfoWdg : public QWidget { - Q_OBJECT; + Q_OBJECT public: GEOMGUI_CreationInfoWdg( SalomeApp_Application* app ); diff --git a/src/GEOMGUI/GEOMGUI_DimensionProperty.cxx b/src/GEOMGUI/GEOMGUI_DimensionProperty.cxx index c57d1335c..5e2bfde3c 100644 --- a/src/GEOMGUI/GEOMGUI_DimensionProperty.cxx +++ b/src/GEOMGUI/GEOMGUI_DimensionProperty.cxx @@ -68,7 +68,7 @@ namespace PATTERN_XYZ.arg( "Point1" ) + ":" + PATTERN_XYZ.arg( "Point2" ) + ":" + PATTERN_XYZ.arg( "Point3" ); -}; +} //================================================================================= // function : Length::Init diff --git a/src/GEOMGUI/GEOMGUI_DimensionProperty.h b/src/GEOMGUI/GEOMGUI_DimensionProperty.h index c57d988a4..639a8be42 100644 --- a/src/GEOMGUI/GEOMGUI_DimensionProperty.h +++ b/src/GEOMGUI/GEOMGUI_DimensionProperty.h @@ -504,6 +504,6 @@ private: VectorOfRecords myRecords; }; -Q_DECLARE_METATYPE(GEOMGUI_DimensionProperty); +Q_DECLARE_METATYPE(GEOMGUI_DimensionProperty) #endif diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx index eea733efa..de1e21243 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx @@ -86,7 +86,7 @@ void GEOMGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const for (ic->InitSelected(); ic->MoreSelected(); ic->NextSelected()) { - Handle(AIS_InteractiveObject) io = Handle(AIS_InteractiveObject)::DownCast( ic->SelectedInteractive() ); + Handle(AIS_InteractiveObject) io = ic->SelectedInteractive(); QString entryStr = entry(io); int index = -1; @@ -114,13 +114,13 @@ void GEOMGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const if (!entryStr.isEmpty()) { Handle(SALOME_InteractiveObject) anIO = Handle(SALOME_InteractiveObject)::DownCast(io->GetOwner()); - LightApp_DataOwner* owner; + LightApp_DataOwner* owner = 0; if (index > -1) // Local Selection owner = new LightApp_DataSubOwner (entryStr, index); else if ( !anIO.IsNull() ) // Global Selection owner = new LightApp_DataOwner( anIO ); - - aList.append(SUIT_DataOwnerPtr(owner)); + if ( owner ) + aList.append(SUIT_DataOwnerPtr(owner)); } } @@ -164,8 +164,7 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, if ( entity.IsNull() ) continue; - Handle(SelectMgr_EntityOwner) owner = - Handle(SelectMgr_EntityOwner)::DownCast(entity->OwnerId()); + Handle(SelectMgr_EntityOwner) owner = entity->OwnerId(); if ( !owner.IsNull() ) theMap.Add( owner ); } @@ -323,7 +322,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList ) for (; i <= n; i++) { Handle(SelectMgr_EntityOwner) owner = ownersmap( i ); - if ( owner->State() ) + if ( owner->IsSelected() ) continue; if ( owner->ComesFromDecomposition() ) diff --git a/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx b/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx index b893df68e..445616c48 100644 --- a/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx +++ b/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx @@ -395,7 +395,7 @@ void GEOMGUI_TextTreeWdg::fillBranch( const BranchType& theBranchType, const QSt //================================================================================= QSharedPointer GEOMGUI_TextTreeWdg::getVisualProperty( const BranchType& theBranchType, - SalomeApp_Study* theStudy, + SalomeApp_Study* /*theStudy*/, const std::string& theEntry ) { switch ( theBranchType ) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index abd978501..808e735aa 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -396,7 +396,7 @@ SUIT_SelectionFilter* GEOM_Displayer::getFilter( const int theMode ) //================================================================ SUIT_SelectionFilter* GEOM_Displayer::getComplexFilter( const QList* aSubShapes) { - GEOM_CompoundFilter* aFilter; + GEOM_CompoundFilter* aFilter = 0; if(aSubShapes != NULL ) { aFilter = new GEOM_CompoundFilter(getStudy()); @@ -1991,7 +1991,7 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, QList aListOfFilters; for ( ; anIter.More(); anIter.Next() ) { - SUIT_SelectionFilter* aFilter; + SUIT_SelectionFilter* aFilter = 0; int aMode = anIter.Key(); if ( aMode == GEOM_COMPOUNDFILTER ) aFilter = getComplexFilter( theSubShapes ); diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index e2efd421f..b210fc50e 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -72,7 +72,7 @@ class GEOMGUI_AnnotationMgr; //================================================================================= class GEOMGUI_EXPORT GeometryGUI : public SalomeApp_Module { - Q_OBJECT; + Q_OBJECT public: // Constructor diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx index 7a79e195c..085b89af5 100644 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx @@ -365,4 +365,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx index 6051a922a..51f1297b2 100644 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx @@ -25,7 +25,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_3DSketcherDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_3DSketcherDriver, GEOM_BaseDriver ) class GEOMImpl_3DSketcherDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx index dc63e4da5..76009d296 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx @@ -203,4 +203,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx index fc37346e3..9f31ea2d5 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_ArcDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ArcDriver, GEOM_BaseDriver ) class GEOMImpl_ArcDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx index 39a333b04..98c168e3a 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx @@ -168,4 +168,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx index c0e539bb0..7f65e0642 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_ArchimedeDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ArchimedeDriver, GEOM_BaseDriver ) class GEOMImpl_ArchimedeDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx index 15a547746..4cdc2a924 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx +++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx @@ -33,77 +33,79 @@ #include #include - // Class GEOMImpl_Block6Explorer gives easy and fast access to a certain sub-elements of hexahedral solid - // Each face can be accessed by its global ID [1-6] - // Each edge can be accessed by its global ID [1-12] or by its local NB [1-4] inside certain face - // Each vertex can be accessed by its global ID [1-8] or by its local NB [1-4] inside certain face - // Numeration of the sub-shapes is defined in constructors, see they comments - // - // face 2 face 4 | 4 face 2 face | - // | / | \ | | - // \|/ |/_ | _\| \|/ | - // ' ' | ' ' | - // 8_______7__7 | 7__7_______8 | - // /| /| | |\ |\ | - // 8 12 6 11 | 11 6 12 8 | - // / | / | | | \ | \ | - // 5/______5__6/ | | | \6__5______\5 | - // face 5 ---> | | | | <--- 6 face | face 6 ---> | | | | <--- 5 face | - // | |__3__|____| | |____|__3__| | | - // | /4 | /3 | 3\ | 4\ | | - // | / | / | \ | \ | | - // 9 4 10 2 | 2 10 4 9 | - // |/__1______|/ | \|______1__\| | - // 1 2 | 2 1 | - // _. . | . ._ | - // /| /|\ | /|\ |\ | - // / | | | \ | - // 3 face 1 face | face 1 face 3 | - // | | - // Picture 1 (right orientation) | Picture 2 (left orientation) | - // | - // For the moment, the orientation of numbering is not controlled - - // Faces: 1 - bottom, 2 - top, 3 - front, 4 - back, 5 - left (right), 6 - right (left) - - // - // 4_______3__3 2 ______2__3 - // / / | | - // 4 2 1 3 - // / / | | - // 1/______1__2/ | | - // | | - // | __4______| - // face 2 face 4 1 4 - // | / - // \|/ |/_ - // ' ' - // 3 8_______7__7 3 - // /| /| /| /| - // 3 2 8 12 6 11 3 2 - // / | / | / | / | - // 4/ | 5/______5__6/ | 4/ | - // | | face 5 ---> | | | | <--- 6 face | | - // | | | |__3__|____| | | - // | /2 | /4 | /3 | /2 - // | / | / | / | / - // 4 1 9 4 10 2 4 1 - // |/ |/__1______|/ |/ - // 1 1 2 1 - // _. . - // /| /|\ - // / | - // 2 ______2__3 3 face 1 face - // | | - // | | __3_______ - // | | /4 /3 - // | | / / - // 1 3 4 2 - // | __4______| /__1______ / - // 1 4 1 2 - // - // Picture 3 (On periferal pictures the local - // numeration of edges and vertices is shown) + /* ====================================================================================================== + Class GEOMImpl_Block6Explorer gives easy and fast access to a certain sub-elements of hexahedral solid + Each face can be accessed by its global ID [1-6] + Each edge can be accessed by its global ID [1-12] or by its local NB [1-4] inside certain face + Each vertex can be accessed by its global ID [1-8] or by its local NB [1-4] inside certain face + Numeration of the sub-shapes is defined in constructors, see they comments + + face 2 face 4 | 4 face 2 face + | / | \ | + \|/ |/_ | _\| \|/ + ' ' | ' ' + 8_______7__7 | 7__7_______8 + /| /| | |\ |\ + 8 12 6 11 | 11 6 12 8 + / | / | | | \ | \ + 5/______5__6/ | | | \6__5______\5 + face 5 ---> | | | | <--- 6 face | face 6 ---> | | | | <--- 5 face + | |__3__|____| | |____|__3__| | + | /4 | /3 | 3\ | 4\ | + | / | / | \ | \ | + 9 4 10 2 | 2 10 4 9 + |/__1______|/ | \|______1__\| + 1 2 | 2 1 + _. . | . ._ + /| /|\ | /|\ |\ + / | | | \ + 3 face 1 face | face 1 face 3 + | + Picture 1 (right orientation) | Picture 2 (left orientation) + + For the moment, the orientation of numbering is not controlled + + Faces: 1 - bottom, 2 - top, 3 - front, 4 - back, 5 - left (right), 6 - right (left) + + + 4_______3__3 2 ______2__3 + / / | | + 4 2 1 3 + / / | | + 1/______1__2/ | | + | | + | __4______| + face 2 face 4 1 4 + | / + \|/ |/_ + ' ' + 3 8_______7__7 3 + /| /| /| /| + 3 2 8 12 6 11 3 2 + / | / | / | / | + 4/ | 5/______5__6/ | 4/ | + | | face 5 ---> | | | | <--- 6 face | | + | | | |__3__|____| | | + | /2 | /4 | /3 | /2 + | / | / | / | / + 4 1 9 4 10 2 4 1 + |/ |/__1______|/ |/ + 1 1 2 1 + _. . + /| /|\ + / | + 2 ______2__3 3 face 1 face + | | + | | __3_______ + | | /4 /3 + | | / / + 1 3 4 2 + | __4______| /__1______ / + 1 4 1 2 + + Picture 3 (On periferal pictures the local + numeration of edges and vertices is shown) + ====================================================================================================== */ class GEOMImpl_Block6Explorer { diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index 2fc564822..24447382e 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx @@ -1156,4 +1156,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx index 6695887cd..366acf476 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx @@ -30,7 +30,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_BlockDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_BlockDriver, GEOM_BaseDriver ) class GEOMImpl_BlockDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 8b06f6fa2..b8af547ab 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -703,4 +703,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx index a496dd7d4..139236b34 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx @@ -30,7 +30,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_BooleanDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_BooleanDriver, GEOM_BaseDriver ) class GEOMImpl_BooleanDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx index d5716f9a0..8d3c5b26f 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx @@ -156,4 +156,4 @@ bool GEOMImpl_BoxDriver::GetCreationInformation(std::string& theOper return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx index 12203aeed..8b85d6932 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_BoxDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_BoxDriver, GEOM_BaseDriver ) class GEOMImpl_BoxDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx index dff71bfbd..0009654b0 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx @@ -359,4 +359,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx index 640bd4190..dedc939ab 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_ChamferDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ChamferDriver, GEOM_BaseDriver ) class GEOMImpl_ChamferDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx index eddfbc2f3..56fb598c1 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx @@ -233,4 +233,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx index b17152bae..1805d2c42 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_CircleDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_CircleDriver, GEOM_BaseDriver ) class GEOMImpl_CircleDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx index ae0d0d21f..aca8302b9 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx @@ -181,4 +181,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx index 8ab500f77..02b7a88ad 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_ConeDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ConeDriver, GEOM_BaseDriver ) class GEOMImpl_ConeDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx index 97fded87d..9e592d02b 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx @@ -146,7 +146,7 @@ GetCreationInformation(std::string& theOperationName, * \brief Performs Transfer Data operation. */ //================================================================================ -Standard_Integer GEOMImpl_CopyDriver::transferData(Handle(TFunction_Logbook)& log) const +Standard_Integer GEOMImpl_CopyDriver::transferData(Handle(TFunction_Logbook)& /*log*/) const { Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); GEOMImpl_ITransferData aTD (aFunction); @@ -410,4 +410,4 @@ Standard_Boolean GEOMImpl_CopyDriver::getInPlaceByHistory return Standard_True; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx index 57b759a53..5cde98d1d 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx @@ -34,7 +34,7 @@ class TopoDS_Shape; class Standard_GUID; -DEFINE_STANDARD_HANDLE( GEOMImpl_CopyDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_CopyDriver, GEOM_BaseDriver ) class GEOMImpl_CopyDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx index 26e2e1980..9193ab472 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx @@ -194,4 +194,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx index 0f16096b2..b0aeec271 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_CylinderDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_CylinderDriver, GEOM_BaseDriver ) class GEOMImpl_CylinderDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx index 46866c503..705e928b3 100644 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx @@ -210,4 +210,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx index 4f4cb69d2..fd30605ad 100644 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx @@ -25,7 +25,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_DiskDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_DiskDriver, GEOM_BaseDriver ) class GEOMImpl_DiskDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx index 206a610c7..cd451ba6d 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx @@ -192,4 +192,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx index a6680824b..4ffafb918 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_EllipseDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_EllipseDriver, GEOM_BaseDriver ) class GEOMImpl_EllipseDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx index 97dbaa331..37ff91132 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx @@ -85,7 +85,7 @@ Standard_Integer GEOMImpl_ExportDriver::Execute(Handle(TFunction_Logbook)& log) if (aFileName.IsEmpty() || aFormatName.IsEmpty() || aLibName.IsEmpty()) return 0; - if( !GEOMImpl_IECallBack::GetCallBack( aFormatName )->Export( obj, aFileName, aFormatName ) ); + if( !GEOMImpl_IECallBack::GetCallBack( aFormatName )->Export( obj, aFileName, aFormatName ) ) return 0; log->SetTouched(Label()); @@ -100,10 +100,10 @@ Standard_Integer GEOMImpl_ExportDriver::Execute(Handle(TFunction_Logbook)& log) //================================================================================ bool GEOMImpl_ExportDriver:: -GetCreationInformation(std::string& theOperationName, - std::vector& theParams) +GetCreationInformation(std::string& /*theOperationName*/, + std::vector& /*theParams*/) { return false; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx index 9ab85b320..19c72bc7c 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_ExportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ExportDriver, GEOM_BaseDriver ) class GEOMImpl_ExportDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx index 88467586c..c0fddaad0 100644 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx @@ -166,4 +166,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx index 4d3144105..689d95a24 100644 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx @@ -25,7 +25,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_FaceDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_FaceDriver, GEOM_BaseDriver ) class GEOMImpl_FaceDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx index 51472a36c..d03dd6319 100644 --- a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx @@ -44,7 +44,7 @@ GEOMImpl_FieldDriver::GEOMImpl_FieldDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FieldDriver::Execute(Handle(TFunction_Logbook)& log) const +Standard_Integer GEOMImpl_FieldDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const { return 0; } @@ -105,4 +105,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.hxx b/src/GEOMImpl/GEOMImpl_FieldDriver.hxx index 17c4656d4..c70fc3e42 100644 --- a/src/GEOMImpl/GEOMImpl_FieldDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FieldDriver.hxx @@ -25,7 +25,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_FieldDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_FieldDriver, GEOM_BaseDriver ) /*! * \brief This class is needed only to retrieve creation information of GEOM_Field diff --git a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx index e42d30a0e..996603508 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx @@ -578,7 +578,7 @@ TopoDS_Edge GEOMImpl_Fillet1d::Result(const gp_Pnt& thePoint, aTargetPoint2d.SetCoord(aX, aY); // choose the nearest circle - Standard_Real aDistance, aP; + Standard_Real aDistance = 0., aP; // todo: aDistance must be explicitly initialized to avoid warning (see below) GEOMImpl_Fillet1dPoint *aNearest; Standard_Integer a; TColStd_ListIteratorOfListOfReal anIter(myResultParams); @@ -590,7 +590,7 @@ TopoDS_Edge GEOMImpl_Fillet1d::Result(const gp_Pnt& thePoint, if (!aPoint->HasSolution(myRadius)) continue; aP = fabs(aPoint->GetCenter().Distance(aTargetPoint2d) - myRadius); - if (!aNearest || aP < aDistance) + if (!aNearest || aP < aDistance) // todo: aDistance must be explicitly initialized to avoid warning (see above) { aNearest = aPoint; aDistance = aP; @@ -715,7 +715,7 @@ Standard_Boolean GEOMImpl_Fillet1dPoint::ComputeDifference(GEOMImpl_Fillet1dPoin { Standard_Integer a; Standard_Boolean aDiffsSet = (myD.Length() != 0); - Standard_Real aDX = thePoint->GetParam() - myParam, aDY; + Standard_Real aDX = thePoint->GetParam() - myParam, aDY = 0.; // todo: aDY must be explicitly initialized to avoid warning (see below) if (thePoint->myV.Length() == myV.Length()) { // absolutely the same points for(a = 1; a <= myV.Length(); a++) @@ -746,7 +746,7 @@ Standard_Boolean GEOMImpl_Fillet1dPoint::ComputeDifference(GEOMImpl_Fillet1dPoin } else { - myD.Append( fabs(aDX) > gp::Resolution() ? aDY/aDX : 0); + myD.Append( fabs(aDX) > gp::Resolution() ? aDY/aDX : 0); // todo: aDY must be explicitly initialized to avoid warning (see above) } } diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx index da6b02136..590354fd9 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx @@ -125,7 +125,7 @@ static Standard_Boolean takePlane( const TopoDS_Edge& theE1, return false; thePlane = gp_Pln( gp_Pnt(aXYZ), aDir1^ aDir2); } - catch (Standard_Failure) { + catch (Standard_Failure&) { return false; } return true; @@ -445,4 +445,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx index 7d727dd7a..3eab0834e 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet1dDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet1dDriver, GEOM_BaseDriver ) class GEOMImpl_Fillet1dDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx index 8d3b69564..0a8426696 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx @@ -205,4 +205,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx index ab0f44369..315ff48e6 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx @@ -25,7 +25,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet2dDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet2dDriver, GEOM_BaseDriver ) class GEOMImpl_Fillet2dDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx index b79a54c27..bdb8a77a8 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx @@ -214,4 +214,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx index 18b4e2d29..8676b0945 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_FilletDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_FilletDriver, GEOM_BaseDriver ) class GEOMImpl_FilletDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx index 7fda25c8b..744b32567 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx @@ -407,4 +407,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx index ef61116c3..b335607ed 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_FillingDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_FillingDriver, GEOM_BaseDriver ) class GEOMImpl_FillingDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index 7b051b581..6fdc5a7cc 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -880,4 +880,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx index 62bc51dd7..ac6dc48a1 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx @@ -33,7 +33,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_GlueDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_GlueDriver, GEOM_BaseDriver ) class GEOMImpl_GlueDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx index a48f355f3..77b9b3842 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx @@ -69,10 +69,10 @@ void raiseNotDoneExeption( const int theErrorStatus ) { switch ( theErrorStatus ) { - case ShHealOper_NotError: StdFail_NotDone::Raise( "ShHealOper_NotError_msg" ); - case ShHealOper_InvalidParameters: StdFail_NotDone::Raise( "ShHealOper_InvalidParameters_msg" ); + case ShHealOper_NotError: StdFail_NotDone::Raise( "ShHealOper_NotError_msg" ); break; + case ShHealOper_InvalidParameters: StdFail_NotDone::Raise( "ShHealOper_InvalidParameters_msg" ); break; case ShHealOper_ErrorExecution: - default: StdFail_NotDone::Raise( "ShHealOper_ErrorExecution_msg" ); + default: StdFail_NotDone::Raise( "ShHealOper_ErrorExecution_msg" ); break; } } @@ -610,7 +610,7 @@ Standard_Boolean GEOMImpl_HealingDriver::AddPointOnEdge (GEOMImpl_IHealing* the //function : ChangeOrientation //purpose : //======================================================================= -Standard_Boolean GEOMImpl_HealingDriver::ChangeOrientation (GEOMImpl_IHealing* theHI, +Standard_Boolean GEOMImpl_HealingDriver::ChangeOrientation (GEOMImpl_IHealing* /*theHI*/, const TopoDS_Shape& theOriginalShape, TopoDS_Shape& theOutShape) const { @@ -1157,4 +1157,4 @@ void GEOMImpl_HealingDriver::SaveStatistics( const ShHealOper_Tool& healer, bool *stats = healer.GetStatistics(); } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx index f345f9915..128508aac 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx @@ -36,7 +36,7 @@ class GEOMImpl_IHealing; class ShHealOper_Tool; -DEFINE_STANDARD_HANDLE( GEOMImpl_HealingDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_HealingDriver, GEOM_BaseDriver ) class GEOMImpl_HealingDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index 2ff2beb88..5dfb1dae4 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -2072,7 +2072,7 @@ Standard_Boolean HasAnyConnection (const Standard_Integer theBlockIndex, */ //============================================================================= TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors - (Handle(GEOM_Object) theCompound, + (Handle(GEOM_Object) /*theCompound*/, const std::list& theErrors) { TCollection_AsciiString aDescr; diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index f9465c0a7..02e6c7e8e 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -106,13 +106,13 @@ namespace static PyMethodDef PyStdOut_methods[] = { {"write", (PyCFunction)PyStdOut_write, METH_VARARGS, PyDoc_STR("write(string) -> None")}, - {NULL, NULL} /* sentinel */ + {0, 0, 0, 0} /* sentinel */ }; static PyMemberDef PyStdOut_memberlist[] = { {(char*)"softspace", T_INT, offsetof(PyStdOut, softspace), 0, (char*)"flag indicating that a space needs to be printed; used by print"}, - {NULL} /* Sentinel */ + {0, 0, 0, 0, 0} /* sentinel */ }; static PyTypeObject PyStdOut_Type = { diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index ac088a46d..f180051cc 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -1142,7 +1142,7 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::UnionListOfGroups return NULL; } - TopAbs_ShapeEnum aType, aType_i; + TopAbs_ShapeEnum aType = TopAbs_SHAPE, aType_i; // todo: refactor: aType must be initialized to avoid warning (see below) TDF_Label aLabel, aLabel_i; TColStd_ListOfInteger aNewIDs; TColStd_MapOfInteger mapIDs; @@ -1160,7 +1160,7 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::UnionListOfGroups aType = aType_i; else { if (aType_i != aType) { - if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { // todo: refactor: aType must be initialized to avoid warning (see above) if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND) aType = aType_i; else { @@ -1257,7 +1257,7 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::IntersectListOfGroups return NULL; } - TopAbs_ShapeEnum aType, aType_i; + TopAbs_ShapeEnum aType = TopAbs_SHAPE, aType_i; // todo: refactor: aType must be initialized to avoid warning (see below) TDF_Label aLabel, aLabel_i; TColStd_ListOfInteger aNewIDs; TColStd_MapOfInteger mapIDs; @@ -1275,7 +1275,7 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::IntersectListOfGroups aType = aType_i; else { if (aType_i != aType) { - if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { // todo: refactor: aType must be initialized to avoid warning (see above) if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND) aType = aType_i; else { @@ -1398,7 +1398,7 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::CutListOfGroups return NULL; } - TopAbs_ShapeEnum aType, aType_i; + TopAbs_ShapeEnum aType = TopAbs_SHAPE, aType_i; // todo: refactor: aType must be initialized to avoid warning (see below) TDF_Label aLabel, aLabel_i; TColStd_ListOfInteger aNewIDs; TColStd_MapOfInteger mapIDs; @@ -1470,7 +1470,7 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::CutListOfGroups aType = aType_i; else { if (aType_i != aType) { - if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { // todo: refactor: aType must be initialized to avoid warning (see above) if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND) aType = aType_i; else { diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx index 07f4e985f..a5bc21fa0 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx @@ -106,4 +106,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx index ce2737286..369b548a1 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx @@ -28,7 +28,7 @@ #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( GEOMImpl_ImportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ImportDriver, GEOM_BaseDriver ) class GEOMImpl_ImportDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.cxx b/src/GEOMImpl/GEOMImpl_LineDriver.cxx index 5f7b01ff1..e09d3cb05 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.cxx @@ -220,4 +220,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.hxx b/src/GEOMImpl/GEOMImpl_LineDriver.hxx index 2c2a344bf..5fe63c553 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_LineDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_LineDriver, GEOM_BaseDriver ) class GEOMImpl_LineDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx index 8316a2d64..4d72e358d 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx @@ -207,4 +207,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx index 9b1f05bbc..10a06ceb6 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_MarkerDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_MarkerDriver, GEOM_BaseDriver ) class GEOMImpl_MarkerDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx index 5a8f61ffb..3d69546cc 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx @@ -366,4 +366,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx index 89211d58e..5bc3676cc 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_MeasureDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_MeasureDriver, GEOM_BaseDriver ) class GEOMImpl_MeasureDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx index 5329ad0d7..e90bcc3dc 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx @@ -202,4 +202,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx index 728c683f2..601d89f0a 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_MirrorDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_MirrorDriver, GEOM_BaseDriver ) class GEOMImpl_MirrorDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index f2a1c360c..9c28a6b72 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -237,4 +237,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx index 13a209b45..9440300b8 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_OffsetDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_OffsetDriver, GEOM_BaseDriver ) class GEOMImpl_OffsetDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index 7f2791007..6b5fe7b11 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -141,7 +141,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(Handle(TFunction_Logbook)& lo Handle(TColStd_HArray1OfInteger) aMaterials = aCI.GetMaterials(); //skl Standard_Boolean DoRemoveWebs = !aMaterials.IsNull(); - unsigned int ind; + int ind; //unsigned int ind, nbshapes = 0; //nbshapes += aShapes->Length() + aTools->Length(); //nbshapes += aKeepIns->Length() + aRemIns->Length(); @@ -559,4 +559,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx index 869e77305..a3945cfee 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_PartitionDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_PartitionDriver, GEOM_BaseDriver ) class GEOMImpl_PartitionDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index ec73411ab..126d80f31 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -3531,4 +3531,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx index 1b3be3ea1..d4bf4c09a 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx @@ -32,7 +32,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_PipeDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_PipeDriver, GEOM_BaseDriver ) class GEOMImpl_PipeDriver : public GEOM_BaseDriver { @@ -40,8 +40,8 @@ public: Standard_EXPORT GEOMImpl_PipeDriver(); Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; - Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)& log) const {} - Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)& log) const { return Standard_True; } + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)& /*log*/) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)& /*log*/) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PipeDriver() {}; diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx index 957fd9661..5ee6dea02 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx @@ -161,4 +161,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx index 617cc630c..6828544cb 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_PipePathDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_PipePathDriver, GEOM_BaseDriver ) class GEOMImpl_PipePathDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx index 14aafb270..3b907f8ea 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx @@ -299,4 +299,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx index d88a30513..0c44241c6 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_PlaneDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_PlaneDriver, GEOM_BaseDriver ) class GEOMImpl_PlaneDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx index 003af3b73..b91a6160f 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx @@ -438,4 +438,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.hxx b/src/GEOMImpl/GEOMImpl_PointDriver.hxx index c067956a5..e7e9ab3be 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_PointDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_PointDriver, GEOM_BaseDriver ) class GEOMImpl_PointDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx index 829f038a8..52b7cb83d 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx @@ -104,7 +104,7 @@ Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(Handle(TFunction_Logboo return 0; } - if (aNbSections != aCoords.size()) { + if (aNbSections != (int)aCoords.size()) { return 0; } @@ -318,10 +318,8 @@ GetCreationInformation(std::string& theOperationName, Handle(TColStd_HArray1OfReal) coords = aCI.GetCoordinates(); if ( coords->Length() > 3 ) pntParam << ( coords->Length() ) / 3 << " points: "; - for ( int i = coords->Lower(), nb = coords->Upper(); i <= nb; ) - pntParam << "( " << coords->Value( i++ ) - << ", " << coords->Value( i++ ) - << ", " << coords->Value( i++ ) << " ) "; + for ( int i = coords->Lower(), nb = coords->Lower()+(coords->Length()/3)*3; i < nb; i+=3) + pntParam << "( " << coords->Value( i ) << ", " << coords->Value( i+1 ) << ", " << coords->Value( i+2 ) << " ) "; } else { @@ -383,7 +381,7 @@ GetCreationInformation(std::string& theOperationName, AddParam(theParams, "Number of curves", aNbCurves); aP2d.GetCoords(aCoords); - Standard_Integer aNbCoords = aCoords.size(); + //Standard_Integer aNbCoords = aCoords.size(); std::list >::const_iterator anIt = aCoords.begin(); @@ -437,4 +435,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx index c3480e997..a4e00e9f9 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_PolylineDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_PolylineDriver, GEOM_BaseDriver ) class GEOMImpl_PolylineDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx index eee95d2d9..77ab5dbf1 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx @@ -262,4 +262,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx index ee95b7bd4..00b893ea5 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_PositionDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_PositionDriver, GEOM_BaseDriver ) class GEOMImpl_PositionDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx index b573f1294..adf045517 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx @@ -555,4 +555,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx index 021194df0..58b3d4650 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx @@ -32,7 +32,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_PrismDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_PrismDriver, GEOM_BaseDriver ) class GEOMImpl_PrismDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx index 3ee8db2c2..20f006b34 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx @@ -810,4 +810,4 @@ TopoDS_Shape GEOMImpl_ProjectionDriver::projectOnCylinder return aResult; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx index 8f73151ca..0b0836c0c 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx @@ -30,7 +30,7 @@ class TopoDS_Shape; #include -DEFINE_STANDARD_HANDLE( GEOMImpl_ProjectionDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ProjectionDriver, GEOM_BaseDriver ) class GEOMImpl_ProjectionDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx index 038d79db9..c9f3fe720 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx @@ -171,4 +171,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx index 15b21b0f3..6af8da4aa 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_RevolutionDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_RevolutionDriver, GEOM_BaseDriver ) class GEOMImpl_RevolutionDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx index c9e93ce6c..a6a21b214 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx @@ -377,4 +377,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx index 268dd6d79..793a486b8 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_RotateDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_RotateDriver, GEOM_BaseDriver ) class GEOMImpl_RotateDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx index b0480ebb6..562b9fe2a 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx @@ -218,4 +218,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx index 408af4663..a0f9f81d5 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_ScaleDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ScaleDriver, GEOM_BaseDriver ) class GEOMImpl_ScaleDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index a2bcdd27a..051f54d80 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -332,7 +332,7 @@ namespace for (anIter.Initialize(aListFaces); anIter.More();) { const TopoDS_Shape &aFace = anIter.Value(); - Standard_Boolean isFaceUsed = Standard_False; + //Standard_Boolean isFaceUsed = Standard_False; if (aMapFaces.Contains(aFace) || aSewing.IsModified(aFace)) { // Remove face from the list. @@ -1096,7 +1096,7 @@ TopoDS_Wire GEOMImpl_ShapeDriver::MakeWireFromEdges(const Handle(TColStd_HSequen B.MakeWire(aWire); // add edges - for (unsigned int ind = 1; ind <= theEdgesFuncs->Length(); ind++) { + for (int ind = 1; ind <= theEdgesFuncs->Length(); ind++) { Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(theEdgesFuncs->Value(ind)); TopoDS_Shape aShape_i = aRefShape->GetValue(); if (aShape_i.IsNull()) { @@ -1172,7 +1172,7 @@ TopoDS_Edge GEOMImpl_ShapeDriver::MakeEdgeFromWire(const TopoDS_Shape& aWire, TColStd_SequenceOfReal FparSeq; TColStd_SequenceOfReal LparSeq; TColStd_SequenceOfReal TolSeq; - GeomAbs_CurveType CurType; + GeomAbs_CurveType CurType = GeomAbs_OtherCurve; // todo: refactor: CurType must be explicitly initialized to avoid warning (see below) TopoDS_Vertex FirstVertex, LastVertex; Standard_Real aPntShiftDist = 0.; @@ -1204,7 +1204,7 @@ TopoDS_Edge GEOMImpl_ShapeDriver::MakeEdgeFromWire(const TopoDS_Shape& aWire, LocSeq.Append(aLocShape); FparSeq.Append(fpar); LparSeq.Append(lpar); - CurType = aType; + CurType = aType; // todo: refactor: CurType must be explicitly initialized to avoid warning (see above) FirstVertex = wexp.CurrentVertex(); } else @@ -1447,6 +1447,8 @@ TopoDS_Edge GEOMImpl_ShapeDriver::MakeEdgeFromWire(const TopoDS_Shape& aWire, } break; } + default: + break; } //end of switch (aType) } // end of else if (aType == CurType && ... if (Done) @@ -2031,7 +2033,7 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver) //modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f #include diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx index e1bc4433a..45ad7e76f 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -35,7 +35,7 @@ class TopoDS_Face; -DEFINE_STANDARD_HANDLE( GEOMImpl_ShapeDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ShapeDriver, GEOM_BaseDriver ) class GEOMImpl_ShapeDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx index f1a29f292..17a8d2be6 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx @@ -177,4 +177,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx index 1c645fd78..ada1a0c82 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_SketcherDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_SketcherDriver, GEOM_BaseDriver ) class GEOMImpl_SketcherDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx index d93e23c44..2102bd9d3 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx @@ -135,4 +135,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx index 1ed1aa406..2ecdb8543 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_SphereDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_SphereDriver, GEOM_BaseDriver ) class GEOMImpl_SphereDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index f6c4ec1f3..e48d775d3 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx @@ -166,12 +166,14 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(Handle(TFunction_Logbook)& log) } } if (nearest > 0 && nearest != i + 1) { - // Keep given order of points to use it in case of equidistant candidates - // .-<---<-. - // / \ - // o o o c o->o->o->o->n o o - // | | | - // i i+1 nearest + /*==================================================================== + Keep given order of points to use it in case of equidistant candidates + .-<---<-. + / \ + o o o c o->o->o->o->n o o + | | | + i i+1 nearest + ======================================================================*/ gp_Pnt p = points->Value(nearest); for (int j = nearest; j > i+1; j--) points->SetValue(j, points->Value(j-1)); @@ -397,4 +399,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx index a4aaeb837..d598dbf9e 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_SplineDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_SplineDriver, GEOM_BaseDriver ) class GEOMImpl_SplineDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx index b4289fdd8..8734fe699 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx @@ -171,4 +171,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx index 2ac3706b9..f49985137 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_ThruSectionsDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_ThruSectionsDriver, GEOM_BaseDriver ) class GEOMImpl_ThruSectionsDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx index 2ee6060bc..87b4710b4 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx @@ -156,4 +156,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx index 9101dce19..01735d1e5 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_TorusDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_TorusDriver, GEOM_BaseDriver ) class GEOMImpl_TorusDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx index 42c277a03..a3aeb14cc 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx @@ -314,4 +314,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx index 0dedb7f17..fbca9ed46 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_TranslateDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_TranslateDriver, GEOM_BaseDriver ) class GEOMImpl_TranslateDriver : public GEOM_BaseDriver { diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx index 52152f0fc..67b57e2db 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx @@ -224,4 +224,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver) diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx index cd29bc4e1..fdf40b137 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx @@ -28,7 +28,7 @@ #include -DEFINE_STANDARD_HANDLE( GEOMImpl_VectorDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( GEOMImpl_VectorDriver, GEOM_BaseDriver ) class GEOMImpl_VectorDriver : public GEOM_BaseDriver { diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 5be561172..15e79b3d5 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -206,7 +206,7 @@ GEOMToolsGUI::~GEOMToolsGUI() // function : OnGUIEvent() // purpose : //======================================================================= -bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) +bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/) { getGeometryGUI()->EmitSignalDeactivateDialog(); @@ -335,7 +335,7 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) // function : OnGUIEvent() // purpose : //======================================================================= -bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent, const QVariant& theParam ) +bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/, const QVariant& theParam ) { getGeometryGUI()->EmitSignalDeactivateDialog(); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 42790af11..50984c7de 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -607,7 +607,7 @@ void GEOMToolsGUI::OnUnpublishObject() { disp->EraseWithChildren(IObject); // hide references if any std::vector< _PTR(SObject) > vso = aStudy->FindDependances(obj); - for ( int i = 0; i < vso.size(); i++ ) { + for ( int i = 0; i < (int)vso.size(); i++ ) { _PTR(SObject) refObj = vso[i]; aDrw = B->FindOrCreateAttribute( refObj, "AttributeDrawable" ); aDrw->SetDrawable( false ); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx index ee1d7a17d..10c67dd92 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx @@ -277,7 +277,7 @@ void GEOMToolsGUI_MarkerDlg::init() GEOM::GEOM_Gen_var engine = GeometryGUI::GetGeomGen(); myOperation = engine->GetIInsertOperations(); GEOM::ListOfLong_var ids = myOperation->GetAllTextures(); - for ( int i = 0; i < ids->length(); i++ ) + for ( int i = 0; i < (int)ids->length(); i++ ) addTexture( ids[i] ); // --- diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx index dcccfb7bd..7a2a70c16 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx @@ -165,13 +165,13 @@ void GEOMToolsGUI_ReduceStudyDlg::init( const std::set& theObjectEn GeometryGUI::GetGeomGen()->GetEntriesToReduceStudy( keptObjects, parentsObjects, subObjects, otherObjects ); - for ( int i = 0; i < keptObjects->length(); i++ ) + for ( unsigned long i = 0; i < keptObjects->length(); i++ ) myKeptObjects.insert( keptObjects[i].in() ); - for( int i = 0; i< otherObjects->length(); i++ ) + for( unsigned long i = 0; i< otherObjects->length(); i++ ) myRemovedObjects.insert( otherObjects[i].in() ); - for( int i = 0; i< parentsObjects->length(); i++ ) + for( unsigned long i = 0; i< parentsObjects->length(); i++ ) myListParents.insert( parentsObjects[i].in() ); - for( int i = 0; i< subObjects->length(); i++ ) + for( unsigned long i = 0; i< subObjects->length(); i++ ) myListSubObjects.insert( subObjects[i].in() ); update(); @@ -400,7 +400,7 @@ void GEOMToolsGUI_ReduceStudyDlg::unpublishObjects( std::set& theOb myDisplayer.EraseWithChildren( new SALOME_InteractiveObject( studyEntry.c_str(), "GEOM", "TEMP_IO" ) ); // hide references if any std::vector< _PTR(SObject) > vso = aStudy->FindDependances(obj); - for ( int i = 0; i < vso.size(); i++ ) { + for ( int i = 0; i < (int)vso.size(); i++ ) { _PTR(SObject) refObj = vso[i]; aDrw = aStudyBuilder->FindOrCreateAttribute( refObj, "AttributeDrawable" ); aDrw->SetDrawable( false ); @@ -703,16 +703,16 @@ void GEOMToolsGUI_ReduceStudyDlg::clickOnHelp() GEOMToolsGUI_TreeWidgetItem::GEOMToolsGUI_TreeWidgetItem( QTreeWidget* view, const QStringList &strings, char* studyEntry, int type ) :QTreeWidgetItem( view, strings, type ), - myStudyEntry( studyEntry ), - myVisible( false ) + myVisible( false ), + myStudyEntry( studyEntry ) { } GEOMToolsGUI_TreeWidgetItem::GEOMToolsGUI_TreeWidgetItem( QTreeWidgetItem* parent, const QStringList &strings, char* studyEntry, int type ) :QTreeWidgetItem( parent, strings, type ), - myStudyEntry( studyEntry ), - myVisible( false ) + myVisible( false ), + myStudyEntry( studyEntry ) { } diff --git a/src/GEOMUtils/GEOMUtils.cxx b/src/GEOMUtils/GEOMUtils.cxx index 58f26932e..a2be3c849 100644 --- a/src/GEOMUtils/GEOMUtils.cxx +++ b/src/GEOMUtils/GEOMUtils.cxx @@ -1083,7 +1083,7 @@ void GEOMUtils::ConvertStringToTree( const std::string& dependencyStr, std::string objectEntry = dependencyStr.substr( cursor, objectIndex - cursor ); cursor = objectIndex; - std::size_t upwardIndexBegin = dependencyStr.find("{",cursor) + 1; + //std::size_t upwardIndexBegin = dependencyStr.find("{",cursor) + 1; //std::size_t upwardIndexFinish = dependencyStr.find("}",upwardIndexBegin); LevelsList upwardList = parseWard( dependencyStr, cursor ); diff --git a/src/GEOMUtils/GEOMUtils.hxx b/src/GEOMUtils/GEOMUtils.hxx index b6c5752e3..b17bccc79 100644 --- a/src/GEOMUtils/GEOMUtils.hxx +++ b/src/GEOMUtils/GEOMUtils.hxx @@ -116,7 +116,7 @@ namespace GEOMUtils * \brief Sort shapes in the list by their coordinates. * \param SL The list of shapes to sort. */ - struct CompareShapes : public std::binary_function + struct CompareShapes //: public std::binary_function { CompareShapes (bool isOldSorting) : myIsOldSorting(isOldSorting) {} @@ -390,6 +390,6 @@ namespace GEOMUtils const double theTolShape, const double theTolRef); -}; +} #endif diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx index dfc3d54bb..4ea2e2e27 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx @@ -21,7 +21,7 @@ #include namespace GEOMUtils { - IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d); + IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d) } //======================================================================= diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx index fb2053e3b..47bb9034d 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx @@ -31,7 +31,7 @@ namespace GEOMUtils class HTrsfCurve2d; - DEFINE_STANDARD_HANDLE(HTrsfCurve2d, Adaptor2d_HCurve2d); + DEFINE_STANDARD_HANDLE(HTrsfCurve2d, Adaptor2d_HCurve2d) /*! * This class represents an adaptor curve that represents an original curve diff --git a/src/GEOMUtils/GEOMUtils_XmlHandler.cxx b/src/GEOMUtils/GEOMUtils_XmlHandler.cxx index cbdd2c4e7..92928480c 100644 --- a/src/GEOMUtils/GEOMUtils_XmlHandler.cxx +++ b/src/GEOMUtils/GEOMUtils_XmlHandler.cxx @@ -182,8 +182,8 @@ namespace #endif } } - return xmlPaths; } + return xmlPaths; } #ifdef MYDEBUG diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 4e50c4bd6..2f8c4882d 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -152,10 +152,10 @@ GEOM_Gen_i::~GEOM_Gen_i() { // function : IORToLocalPersistentID() // purpose : //============================================================================ -char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, +char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr /*theSObject*/, const char* IORString, - CORBA::Boolean isMultiFile, - CORBA::Boolean isASCII) + CORBA::Boolean /*isMultiFile*/, + CORBA::Boolean /*isASCII*/) { GEOM::GEOM_BaseObject_var anObject = GEOM::GEOM_BaseObject::_narrow(_orb->string_to_object(IORString)); @@ -172,10 +172,10 @@ char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, // : Used when a study is loaded // : The IOR (IORName) of object created is returned //============================================================================ -char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, +char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr /*theSObject*/, const char* aLocalPersistentID, - CORBA::Boolean isMultiFile, - CORBA::Boolean isASCII) + CORBA::Boolean /*isMultiFile*/, + CORBA::Boolean /*isASCII*/) { Handle(::GEOM_BaseObject) anObject = _impl->GetObject(aLocalPersistentID); @@ -212,7 +212,7 @@ bool GEOM_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, const char* theName) - throw (SALOME::SALOME_Exception) + { Unexpect aCatch(SALOME_SalomeException); SALOMEDS::SObject_var aResultSO; @@ -440,9 +440,9 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObjec void GEOM_Gen_i::CreateAndPublishGroup(GEOM::GEOM_Object_var theMainShape, const TopTools_IndexedMapOfShape& anIndices, const TopTools_SequenceOfShape& SeqS, - const TColStd_SequenceOfAsciiString& SeqN, + const TColStd_SequenceOfAsciiString& /*SeqN*/, const Standard_CString& GrName, - GEOM::ListOfGO_var aResList) + GEOM::ListOfGO_var /*aResList*/) { CORBA::String_var entry = theMainShape->GetEntry(); //Handle(::GEOM_Object) aMainShape = _impl->GetObject(entry); @@ -558,7 +558,7 @@ GEOM::ListOfGO* GEOM_Gen_i:: // function : Save() // purpose : save OCAF/Geom document //============================================================================ -SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, +SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr /*theComponent*/, const char* theURL, bool isMultiFile) { SALOMEDS::TMPFile_var aStreamFile; @@ -705,7 +705,7 @@ CORBA::Boolean GEOM_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, // function : Close() // purpose : //============================================================================ -void GEOM_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent) +void GEOM_Gen_i::Close(SALOMEDS::SComponent_ptr /*theComponent*/) { _impl->Close(); } @@ -759,7 +759,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA:: // function : CanPaste() // purpose : //============================================================================ -CORBA::Boolean GEOM_Gen_i::CanPaste(const char* theComponentName, CORBA::Long theObjectID) { +CORBA::Boolean GEOM_Gen_i::CanPaste(const char* theComponentName, CORBA::Long /*theObjectID*/) { // The Geometry component can paste only objects copied by Geometry component // and with the object type = 1 if (strcmp(theComponentName, ComponentDataType()) != 0) return false; @@ -784,7 +784,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, BRep_Builder aBuilder; try { BRepTools::Read(aTopology, aStreamedBrep, aBuilder); - } catch (Standard_Failure) { + } catch (Standard_Failure&) { return aNewSO._retn(); } @@ -2237,7 +2237,6 @@ void GEOM_Gen_i::Redo() // purpose : //============================================================================ GEOM::GEOM_IBasicOperations_ptr GEOM_Gen_i::GetIBasicOperations() - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIBasicOperations" ); @@ -2259,7 +2258,6 @@ GEOM::GEOM_IBasicOperations_ptr GEOM_Gen_i::GetIBasicOperations() // purpose : //============================================================================ GEOM::GEOM_ITransformOperations_ptr GEOM_Gen_i::GetITransformOperations() - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetITransformOperations" ); @@ -2279,7 +2277,7 @@ GEOM::GEOM_ITransformOperations_ptr GEOM_Gen_i::GetITransformOperations() // purpose : //============================================================================ GEOM::GEOM_I3DPrimOperations_ptr GEOM_Gen_i::GetI3DPrimOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetI3DPrimOperations" ); @@ -2300,7 +2298,7 @@ GEOM::GEOM_I3DPrimOperations_ptr GEOM_Gen_i::GetI3DPrimOperations() // purpose : //============================================================================ GEOM::GEOM_IShapesOperations_ptr GEOM_Gen_i::GetIShapesOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIShapesOperations" ); @@ -2320,7 +2318,7 @@ GEOM::GEOM_IShapesOperations_ptr GEOM_Gen_i::GetIShapesOperations() // purpose : //============================================================================ GEOM::GEOM_IBlocksOperations_ptr GEOM_Gen_i::GetIBlocksOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIBlocksOperations" ); @@ -2340,7 +2338,7 @@ GEOM::GEOM_IBlocksOperations_ptr GEOM_Gen_i::GetIBlocksOperations() // purpose : //============================================================================ GEOM::GEOM_IBooleanOperations_ptr GEOM_Gen_i::GetIBooleanOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIBooleanOperations" ); @@ -2360,7 +2358,7 @@ GEOM::GEOM_IBooleanOperations_ptr GEOM_Gen_i::GetIBooleanOperations() // purpose : //============================================================================ GEOM::GEOM_ICurvesOperations_ptr GEOM_Gen_i::GetICurvesOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetICurvesOperations" ); @@ -2380,7 +2378,7 @@ GEOM::GEOM_ICurvesOperations_ptr GEOM_Gen_i::GetICurvesOperations() // purpose : //============================================================================ GEOM::GEOM_ILocalOperations_ptr GEOM_Gen_i::GetILocalOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetILocalOperations" ); @@ -2400,7 +2398,7 @@ GEOM::GEOM_ILocalOperations_ptr GEOM_Gen_i::GetILocalOperations() // purpose : //============================================================================ GEOM::GEOM_IHealingOperations_ptr GEOM_Gen_i::GetIHealingOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::IHealingOperations" ); @@ -2420,7 +2418,7 @@ GEOM::GEOM_IHealingOperations_ptr GEOM_Gen_i::GetIHealingOperations() // purpose : //============================================================================ GEOM::GEOM_IInsertOperations_ptr GEOM_Gen_i::GetIInsertOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIInsertOperations" ); @@ -2440,7 +2438,7 @@ GEOM::GEOM_IInsertOperations_ptr GEOM_Gen_i::GetIInsertOperations() // purpose : //============================================================================ GEOM::GEOM_IMeasureOperations_ptr GEOM_Gen_i::GetIMeasureOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIMeasureOperations" ); @@ -2460,7 +2458,7 @@ GEOM::GEOM_IMeasureOperations_ptr GEOM_Gen_i::GetIMeasureOperations() // purpose : //============================================================================ GEOM::GEOM_IGroupOperations_ptr GEOM_Gen_i::GetIGroupOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIGroupOperations" ); @@ -2480,7 +2478,7 @@ GEOM::GEOM_IGroupOperations_ptr GEOM_Gen_i::GetIGroupOperations() // purpose : //============================================================================ GEOM::GEOM_IFieldOperations_ptr GEOM_Gen_i::GetIFieldOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIFieldOperations" ); @@ -2500,7 +2498,7 @@ GEOM::GEOM_IFieldOperations_ptr GEOM_Gen_i::GetIFieldOperations() // purpose : //============================================================================ GEOM::GEOM_IOperations_ptr GEOM_Gen_i::GetPluginOperations(const char* theLibName) - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetPluginOperations" ); @@ -3230,7 +3228,7 @@ void GEOM_Gen_i::GetEntriesToReduceStudy(GEOM::string_array& theSelectedEntries, continue; stringIOR = handle_object->GetIOR(); - if ( !stringIOR.Length() > 1 ) + if ( stringIOR.Length() < 1 ) continue; geomObj = GetIORFromString( stringIOR.ToCString() ); diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh index cd515fe03..ce3035be4 100644 --- a/src/GEOM_I/GEOM_Gen_i.hh +++ b/src/GEOM_I/GEOM_Gen_i.hh @@ -150,7 +150,7 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi bool CanPublishInStudy(CORBA::Object_ptr theIOR); SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, - const char* theName) throw (SALOME::SALOME_Exception) ; + const char* theName) ; GEOM::ListOfGO* PublishNamedShapesInStudy(CORBA::Object_ptr theObject); @@ -213,60 +213,55 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi //-----------------------------------------------------------------------// //Returns a pointer to BasicOperations interface - virtual GEOM::GEOM_IBasicOperations_ptr GetIBasicOperations() - throw (SALOME::SALOME_Exception); + virtual GEOM::GEOM_IBasicOperations_ptr GetIBasicOperations(); //Returns a pointer to TransformOperations interface - virtual GEOM::GEOM_ITransformOperations_ptr GetITransformOperations() - throw (SALOME::SALOME_Exception); + virtual GEOM::GEOM_ITransformOperations_ptr GetITransformOperations(); //Returns a pointer to 3DPrimOperations interface - virtual GEOM::GEOM_I3DPrimOperations_ptr GetI3DPrimOperations() - throw (SALOME::SALOME_Exception); + virtual GEOM::GEOM_I3DPrimOperations_ptr GetI3DPrimOperations(); //Returns a pointer to ShapesOperations interface - virtual GEOM::GEOM_IShapesOperations_ptr GetIShapesOperations() - throw (SALOME::SALOME_Exception); + virtual GEOM::GEOM_IShapesOperations_ptr GetIShapesOperations(); //Returns a pointer to BlocksOperations interface - virtual GEOM::GEOM_IBlocksOperations_ptr GetIBlocksOperations() - throw (SALOME::SALOME_Exception); + virtual GEOM::GEOM_IBlocksOperations_ptr GetIBlocksOperations(); //Returns a pointer to BooleanOperations interface virtual GEOM::GEOM_IBooleanOperations_ptr GetIBooleanOperations() - throw (SALOME::SALOME_Exception); + ; //Returns a pointer to CurvesOperations interface virtual GEOM::GEOM_ICurvesOperations_ptr GetICurvesOperations() - throw (SALOME::SALOME_Exception); + ; //Returns a pointer to LocalOperations interface virtual GEOM::GEOM_ILocalOperations_ptr GetILocalOperations() - throw (SALOME::SALOME_Exception); + ; //Returns a pointer to HealingOperations interface virtual GEOM::GEOM_IHealingOperations_ptr GetIHealingOperations() - throw (SALOME::SALOME_Exception); + ; //Returns a pointer to InsertOperations interface virtual GEOM::GEOM_IInsertOperations_ptr GetIInsertOperations() - throw (SALOME::SALOME_Exception); + ; //Returns a pointer to MeasureOperations interface virtual GEOM::GEOM_IMeasureOperations_ptr GetIMeasureOperations() - throw (SALOME::SALOME_Exception); + ; //Returns a pointer to GroupOperations interface virtual GEOM::GEOM_IGroupOperations_ptr GetIGroupOperations() - throw (SALOME::SALOME_Exception); + ; //Returns a pointer to FiedlOperations interface virtual GEOM::GEOM_IFieldOperations_ptr GetIFieldOperations() - throw (SALOME::SALOME_Exception); + ; //Returns a pointer to corresponding plugin operations interface virtual GEOM::GEOM_IOperations_ptr GetPluginOperations (const char* theLibName) - throw (SALOME::SALOME_Exception); + ; //Adds a new sub-shape virtual GEOM::GEOM_Object_ptr AddSubShape (GEOM::GEOM_Object_ptr theMainShape, diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc index 78ea3e842..fb28bff70 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc @@ -485,7 +485,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCurveParametric //Set a not done flag GetOperations()->SetNotDone(); - GEOMImpl_ICurvesOperations::CurveType aType; + GEOMImpl_ICurvesOperations::CurveType aType = GEOMImpl_ICurvesOperations::Polyline; // todo: aType must be explicitly initialized to avoid warning switch(theCurveType) { case GEOM::Polyline: aType = GEOMImpl_ICurvesOperations::Polyline; @@ -526,7 +526,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCurveParametricNew //Set a not done flag GetOperations()->SetNotDone(); - GEOMImpl_ICurvesOperations::CurveType aType; + GEOMImpl_ICurvesOperations::CurveType aType = GEOMImpl_ICurvesOperations::Polyline; // todo: aType must be explicitly initialized to avoid warning switch(theCurveType) { case GEOM::Polyline: aType = GEOMImpl_ICurvesOperations::Polyline; diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc index 750fe0c35..3c746c160 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.cc +++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc @@ -419,9 +419,9 @@ PortableServer::ServantBase_var GEOM_Superv_i::GetServant(CORBA::Object_ptr // function : Save() // purpose : save OCAF/Geom document //============================================================================ -SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr theComponent, - const char* theURL, - CORBA::Boolean isMultiFile) +SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr /*theComponent*/, + const char* /*theURL*/, + CORBA::Boolean /*isMultiFile*/) { SALOMEDS::TMPFile_var aStreamFile; return aStreamFile._retn(); @@ -431,9 +431,9 @@ SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr theComponent, // function : SaveASCII() // purpose : //============================================================================ -SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent, - const char* theURL, - CORBA::Boolean isMultiFile) +SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr /*theComponent*/, + const char* /*theURL*/, + CORBA::Boolean /*isMultiFile*/) { SALOMEDS::TMPFile_var aStreamFile; return aStreamFile._retn(); @@ -443,10 +443,10 @@ SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr theComponen // function : Load() // purpose : //============================================================================ -CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr theComponent, - const SALOMEDS::TMPFile& theStream, - const char* theURL, - CORBA::Boolean isMultiFile) +CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr /*theComponent*/, + const SALOMEDS::TMPFile& /*theStream*/, + const char* /*theURL*/, + CORBA::Boolean /*isMultiFile*/) { return false; } @@ -455,10 +455,10 @@ CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr theComponent, // function : LoadASCII() // purpose : //============================================================================ -CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, - const SALOMEDS::TMPFile& theStream, - const char* theURL, - CORBA::Boolean isMultiFile) +CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr /*theComponent*/, + const SALOMEDS::TMPFile& /*theStream*/, + const char* /*theURL*/, + CORBA::Boolean /*isMultiFile*/) { return false; } @@ -467,7 +467,7 @@ CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, // function : Close() // purpose : //============================================================================ -void GEOM_Superv_i::Close(SALOMEDS::SComponent_ptr theComponent) +void GEOM_Superv_i::Close(SALOMEDS::SComponent_ptr /*theComponent*/) { } @@ -484,10 +484,10 @@ char* GEOM_Superv_i::ComponentDataType() // function : IORToLocalPersistentID() // purpose : //============================================================================ -char* GEOM_Superv_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, - const char* IORString, - CORBA::Boolean isMultiFile, - CORBA::Boolean isASCII) +char* GEOM_Superv_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr /*theSObject*/, + const char* /*IORString*/, + CORBA::Boolean /*isMultiFile*/, + CORBA::Boolean /*isASCII*/) { return 0; } @@ -498,10 +498,10 @@ char* GEOM_Superv_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, // : Used when a study is loaded // : The IOR (IORName) of object created is returned //============================================================================ -char* GEOM_Superv_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, - const char* aLocalPersistentID, - CORBA::Boolean isMultiFile, - CORBA::Boolean isASCII) +char* GEOM_Superv_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr /*theSObject*/, + const char* /*aLocalPersistentID*/, + CORBA::Boolean /*isMultiFile*/, + CORBA::Boolean /*isASCII*/) { return 0; } @@ -523,7 +523,7 @@ CORBA::Boolean GEOM_Superv_i::CanPublishInStudy(CORBA::Object_ptr theIOR) //============================================================================ SALOMEDS::SObject_ptr GEOM_Superv_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, - const char* theName) throw (SALOME::SALOME_Exception) + const char* theName) { if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); @@ -547,7 +547,7 @@ GEOM_Superv_i::PublishNamedShapesInStudy(//SALOMEDS::SObject_ptr theSObject, // function : CanCopy() // purpose : //============================================================================ -CORBA::Boolean GEOM_Superv_i::CanCopy(SALOMEDS::SObject_ptr theObject) +CORBA::Boolean GEOM_Superv_i::CanCopy(SALOMEDS::SObject_ptr /*theObject*/) { return false; } @@ -556,7 +556,7 @@ CORBA::Boolean GEOM_Superv_i::CanCopy(SALOMEDS::SObject_ptr theObject) // function : CopyFrom() // purpose : //============================================================================ -SALOMEDS::TMPFile* GEOM_Superv_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID) +SALOMEDS::TMPFile* GEOM_Superv_i::CopyFrom(SALOMEDS::SObject_ptr /*theObject*/, CORBA::Long& /*theObjectID*/) { SALOMEDS::TMPFile_var aStreamFile; return aStreamFile._retn(); @@ -566,7 +566,7 @@ SALOMEDS::TMPFile* GEOM_Superv_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORB // function : CanPaste() // purpose : //============================================================================ -CORBA::Boolean GEOM_Superv_i::CanPaste(const char* theComponentName, CORBA::Long theObjectID) +CORBA::Boolean GEOM_Superv_i::CanPaste(const char* /*theComponentName*/, CORBA::Long /*theObjectID*/) { return false; } @@ -575,9 +575,9 @@ CORBA::Boolean GEOM_Superv_i::CanPaste(const char* theComponentName, CORBA::Long // function : PasteInto() // purpose : //============================================================================ -SALOMEDS::SObject_ptr GEOM_Superv_i::PasteInto(const SALOMEDS::TMPFile& theStream, - CORBA::Long theObjectID, - SALOMEDS::SObject_ptr theObject) +SALOMEDS::SObject_ptr GEOM_Superv_i::PasteInto(const SALOMEDS::TMPFile& /*theStream*/, + CORBA::Long /*theObjectID*/, + SALOMEDS::SObject_ptr /*theObject*/) { SALOMEDS::SObject_var aNewSO; return aNewSO._retn(); @@ -3415,14 +3415,14 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportSTL( const char* theFileName ) MESSAGE("GEOM_Superv_i::ImportSTL"); getSTLPluginOp(); GEOM::ListOfGO* aSeq = mySTLOp->ImportSTL(theFileName ); - GEOM::GEOM_Object_ptr anObj; + GEOM::GEOM_Object_var anObj; if (aSeq->length() > 0) { anObj = aSeq->operator[](0); } endService( " GEOM_Superv_i::ImportSTL" ); - return anObj; + return anObj._retn(); } //============================================================================= @@ -3447,14 +3447,14 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportBREP( const char* theFileName ) MESSAGE("GEOM_Superv_i::ImportBREP"); getBREPPluginOp(); GEOM::ListOfGO* aSeq = myBREPOp->ImportBREP(theFileName ); - GEOM::GEOM_Object_ptr anObj; + GEOM::GEOM_Object_var anObj; if (aSeq->length() > 0) { anObj = aSeq->operator[](0); } endService( " GEOM_Superv_i::ImportBREP" ); - return anObj; + return anObj._retn(); } //============================================================================= @@ -3483,14 +3483,14 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportSTEP( const char* theFileName, MESSAGE("GEOM_Superv_i::ImportSTEP"); getSTEPPluginOp(); GEOM::ListOfGO* aSeq = mySTEPOp->ImportSTEP(theFileName, theIsIgnoreUnits, false ); - GEOM::GEOM_Object_ptr anObj; + GEOM::GEOM_Object_var anObj; if (aSeq->length() > 0) { anObj = aSeq->operator[](0); } endService( " GEOM_Superv_i::ImportSTEP" ); - return anObj; + return anObj._retn(); } //============================================================================= @@ -3517,14 +3517,14 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportIGES( const char* theFileName, MESSAGE("GEOM_Superv_i::ImportIGES"); getIGESPluginOp(); GEOM::ListOfGO* aSeq = myIGESOp->ImportIGES(theFileName, theIsIgnoreUnits ); - GEOM::GEOM_Object_ptr anObj; + GEOM::GEOM_Object_var anObj; if (aSeq->length() > 0) { anObj = aSeq->operator[](0); } endService( " GEOM_Superv_i::ImportIGES" ); - return anObj; + return anObj._retn(); } //============================================================================= @@ -3548,11 +3548,11 @@ CORBA::Boolean GEOM_Superv_i::ExportXAO( GEOM::GEOM_Object_ptr shape, //============================================================================= // Import XAO //============================================================================= -CORBA::Boolean GEOM_Superv_i::ImportXAO( const char* fileName, - GEOM::GEOM_Object_out shape, - GEOM::ListOfGO_out subShapes, - GEOM::ListOfGO_out groups, - GEOM::ListOfFields_out fields ) +CORBA::Boolean GEOM_Superv_i::ImportXAO( const char* /*fileName*/, + GEOM::GEOM_Object_out /*shape*/, + GEOM::ListOfGO_out /*subShapes*/, + GEOM::ListOfGO_out /*groups*/, + GEOM::ListOfFields_out /*fields*/ ) { return false; } diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh index f1f653ad2..1229bf595 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.hh +++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh @@ -140,7 +140,7 @@ public: CORBA::Boolean CanPublishInStudy(CORBA::Object_ptr theIOR); SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, - const char* theName) throw (SALOME::SALOME_Exception) ; + const char* theName) ; GEOM::ListOfGO* PublishNamedShapesInStudy(//SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject); diff --git a/src/GEOM_SWIG_WITHIHM/GEOM_Swig_LocalSelector.cxx b/src/GEOM_SWIG_WITHIHM/GEOM_Swig_LocalSelector.cxx index df299aede..a39769178 100644 --- a/src/GEOM_SWIG_WITHIHM/GEOM_Swig_LocalSelector.cxx +++ b/src/GEOM_SWIG_WITHIHM/GEOM_Swig_LocalSelector.cxx @@ -86,7 +86,7 @@ std::vector GEOM_Swig_LocalSelector::getSelection() std::vector ids; for (int i = 1; i <= n; i++) ids.push_back(aMap(i)); - for (int i =0; i < ids.size(); i++) + for (int i =0; i < (int)ids.size(); i++) { MESSAGE("ids[" << i << "] = " << ids[i]); } diff --git a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx index b7bc006c2..dbac62936 100644 --- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx +++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx @@ -512,7 +512,7 @@ void GEOM_Swig::initLocalSelection( const char* theEntry, int theMode) SUIT_Application* app = SUIT_Session::session()->activeApplication(); if ( app ) { - SUIT_ViewWindow* window = app->desktop()->activeWindow(); + //SUIT_ViewWindow* window = app->desktop()->activeWindow(); SUIT_ViewWindow* wnd = 0; LightApp_Application* lapp = dynamic_cast(app); if ( lapp ) diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx index 5b2d5ec3e..4caf7d658 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx @@ -275,7 +275,7 @@ void GenerationGUI_FillingDlg::enterEvent(QEvent*) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void GenerationGUI_FillingDlg::ValueChangedInSpinBox(double newValue) +void GenerationGUI_FillingDlg::ValueChangedInSpinBox(double /*newValue*/) { processPreview(); } @@ -354,7 +354,7 @@ bool GenerationGUI_FillingDlg::execute(ObjectList& objects) GEOM::GEOM_I3DPrimOperations_var anOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation()); - GEOM::filling_oper_method aMethod; + GEOM::filling_oper_method aMethod = GEOM::FOM_Default; // todo: aMethod must be explicitly initialized to avoid warning (see below) switch (GroupPoints->ComboBox1->currentIndex()) { case 0: aMethod = GEOM::FOM_Default; break; @@ -376,7 +376,7 @@ bool GenerationGUI_FillingDlg::execute(ObjectList& objects) GroupPoints->SpinBox5->value(), GroupPoints->SpinBox3->value(), aMethod, - GroupPoints->CheckBox1->isChecked()); + GroupPoints->CheckBox1->isChecked()); // todo: aMethod must be explicitly initialized to avoid warning (see below) if (!anObj->_is_nil()) { if (!IsPreview()) diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx index 670becfb0..410cf10a6 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx @@ -641,7 +641,7 @@ void GenerationGUI_PrismDlg::onAddThickening(bool isChecked) // function : onChangeDirection(bool) // purpose : //================================================================================= -void GenerationGUI_PrismDlg::onChangeDirection(bool isChecked) +void GenerationGUI_PrismDlg::onChangeDirection(bool /*isChecked*/) { processPreview(); } diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index bb91a41e3..8964cc110 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -355,7 +355,7 @@ void GroupGUI_GroupDlg::Init() // function : enterEvent() // purpose : //================================================================================= -void GroupGUI_GroupDlg::enterEvent(QEvent* e) +void GroupGUI_GroupDlg::enterEvent(QEvent*) { if (!buttonCancel()->isEnabled()) ActivateThisDialog(); @@ -547,7 +547,7 @@ void GroupGUI_GroupDlg::setInPlaceObj(GEOM::GEOM_Object_var theObj, const bool i GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations(); GEOM::ListOfGO_var aSubObjects = aShapesOp->MakeExplode(myInPlaceObj, getShapeType(), false); - for ( int i = 0; i < aSubObjects->length(); i++ ) + for ( int i = 0; i < (int)aSubObjects->length(); i++ ) { GEOM::ListOfLong_var aCurrList = aShapesOp->GetSameIDs( myMainObj, aSubObjects[i] ); if( aCurrList->length() > 1 ) { @@ -555,7 +555,7 @@ void GroupGUI_GroupDlg::setInPlaceObj(GEOM::GEOM_Object_var theObj, const bool i // In case if GetSameIDs(...) method return more then one ID use // GetSharedShapes(...) method to get sub-shapes of the second shape. GEOM::ListOfGO_var aSubObjects2 = aShapesOp->GetSharedShapes( myMainObj, aSubObjects[i], getShapeType() ); - for( int j = 0; j < aSubObjects2->length(); j++ ) { + for( int j = 0; j < (int)aSubObjects2->length(); j++ ) { CORBA::Long aMainIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects2[j] ); CORBA::Long aPlaceIndex = aLocOp->GetSubShapeIndex( myInPlaceObj, aSubObjects[i]); if ( aMainIndex >= 0 && aPlaceIndex > 0 ) { @@ -1008,6 +1008,7 @@ void GroupGUI_GroupDlg::setShapeType(const TopAbs_ShapeEnum theType) case TopAbs_EDGE: anId = 1; break; case TopAbs_FACE: anId = 2; break; case TopAbs_SOLID: anId = 3; break; + default: break; } setConstructorId(anId); if (!myIsShapeType) @@ -1024,7 +1025,7 @@ void GroupGUI_GroupDlg::setShapeType(const TopAbs_ShapeEnum theType) //================================================================================= void GroupGUI_GroupDlg::activateSelection() { - bool isApply = ((QPushButton*)sender() == buttonApply()); + //bool isApply = ((QPushButton*)sender() == buttonApply()); if(!isApplyAndClose()) erasePreview(false); @@ -1139,7 +1140,6 @@ void GroupGUI_GroupDlg::activateSelection() } } } - else ; aDisplayer->UnsetDisplayMode(); aDisplayer->UnsetColor(); aDisplayer->UpdateViewer(); @@ -1427,7 +1427,7 @@ void GroupGUI_GroupDlg::ClickOnOkFilter() TopoDS_Shape aMainShape = GEOM_Client::get_client().GetShape(GeometryGUI::GetGeomGen(), myMainObj); TopTools_IndexedMapOfShape aSubShapesMap; TopExp::MapShapes(aMainShape, aSubShapesMap); - SALOME_View* view = GEOM_Displayer::GetActiveView(); + //SALOME_View* view = GEOM_Displayer::GetActiveView(); getDisplayer()->Erase(myMainObj, false, false); CORBA::String_var aMainEntry = myMainObj->GetStudyEntry(); QString anEntryBase = aMainEntry.in(); diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.cxx b/src/IGESPlugin/IGESPlugin_ExportDriver.cxx index 426d94ba4..8a90b997f 100644 --- a/src/IGESPlugin/IGESPlugin_ExportDriver.cxx +++ b/src/IGESPlugin/IGESPlugin_ExportDriver.cxx @@ -115,7 +115,7 @@ IGESPlugin_ExportDriver::IGESPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer IGESPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const +Standard_Integer IGESPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -179,10 +179,10 @@ Standard_Integer IGESPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log */ //================================================================================ bool IGESPlugin_ExportDriver:: -GetCreationInformation( std::string& theOperationName, - std::vector& theParams ) +GetCreationInformation( std::string& /*theOperationName*/, + std::vector& /*theParams*/ ) { return false; } -IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver ) diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx index 381e75d8c..5249f3c88 100644 --- a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver ) class IGESPlugin_ExportDriver : public GEOM_BaseDriver { diff --git a/src/IGESPlugin/IGESPlugin_GUI.cxx b/src/IGESPlugin/IGESPlugin_GUI.cxx index de24920fa..0bd7246ee 100644 --- a/src/IGESPlugin/IGESPlugin_GUI.cxx +++ b/src/IGESPlugin/IGESPlugin_GUI.cxx @@ -96,7 +96,7 @@ bool IGESPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* pare getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) ); } - return true; // ????????????? + return result; } //======================================================================= diff --git a/src/IGESPlugin/IGESPlugin_IECallBack.cxx b/src/IGESPlugin/IGESPlugin_IECallBack.cxx index 3bfa12bf3..943f43183 100644 --- a/src/IGESPlugin/IGESPlugin_IECallBack.cxx +++ b/src/IGESPlugin/IGESPlugin_IECallBack.cxx @@ -76,7 +76,7 @@ IGESPlugin_IECallBack::Import( const TCollection_AsciiString& theFormatName, //============================================================================= TCollection_AsciiString IGESPlugin_IECallBack::ReadValue( const TCollection_AsciiString& theFileName, - const TCollection_AsciiString& theFormatName, + const TCollection_AsciiString& /*theFormatName*/, const TCollection_AsciiString& theParameterName ) { IGESPlugin_IOperations* aPluginOperations = IGESPlugin_OperationsCreator::get( GetEngine() ); diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.cxx b/src/IGESPlugin/IGESPlugin_ImportDriver.cxx index a5472b0c6..ffe65854e 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.cxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.cxx @@ -276,4 +276,4 @@ IGESPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, return TCollection_AsciiString(); } -IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver ) diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx index 16e344921..baa380040 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver ) class IGESPlugin_ImportDriver : public GEOM_BaseDriver { diff --git a/src/Material/Material_ResourceMgr.h b/src/Material/Material_ResourceMgr.h index f8ce1e52c..a3c043e5c 100644 --- a/src/Material/Material_ResourceMgr.h +++ b/src/Material/Material_ResourceMgr.h @@ -33,7 +33,7 @@ class QFileSystemWatcher; class MATERIAL_SALOME_EXPORT Material_ResourceMgr : public QObject, public QtxResourceMgr { - Q_OBJECT; + Q_OBJECT class Updater; diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx index 81b851e90..225165747 100644 --- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx @@ -389,7 +389,7 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs() return aPrs; } } - catch(Standard_Failure) { + catch(Standard_Failure&) { } } diff --git a/src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx b/src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx index d818734d8..1cb973013 100644 --- a/src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx +++ b/src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx @@ -273,7 +273,7 @@ bool MeasureGUI_AnnotationInteractor::eventFilter( QObject* theObject, QEvent* t { const Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext(); - if ( anAISContext->IsHilighted( Handle(AIS_InteractiveObject)::DownCast( myActiveIO ) ) ) + if ( anAISContext->IsHilighted( myActiveIO ) ) { anAISContext->Unhilight( myActiveIO, Standard_False ); } diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx index 2ffee21ee..d7e24df3f 100644 --- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx @@ -59,20 +59,20 @@ //================================================================================= MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (GeometryGUI* GUI, QWidget* parent) : GEOMBase_Skeleton (GUI, parent, false), + myCurrConstrId (-1), + myComputeButton1 (0), myTextView1 (0), - myTextView2 (0), mySelButton1 (0), - mySelButton2 (0), myEditObjName1 (0), - myEditObjName2 (0), myLevelBox (0), - myComputeButton1 (0), - myComputeButton2 (0), myInteList1 (0), myShapeList1 (0), + myComputeButton2 (0), + myTextView2 (0), + mySelButton2 (0), + myEditObjName2 (0), myInteList2 (0), - myShapeList2 (0), - myCurrConstrId (-1) + myShapeList2 (0) { SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_CHECK_SELF_INTERSECTIONS"))); @@ -588,7 +588,7 @@ bool MeasureGUI_CheckSelfIntersectionsDlg::findSelfIntersections } nbPairs = getInters()->length()/2; - if (nbPairs*2 != getInters()->length()) { + if (nbPairs*2 != (int)getInters()->length()) { isOK = false; } } diff --git a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx index 63f8939ac..ed7902834 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx @@ -509,7 +509,7 @@ Handle(AIS_DiameterDimension) MeasureGUI_DimensionCreateTool::Diameter( const GE aPmin = aTrimmedCurve->FirstParameter(); aPmax = aTrimmedCurve->LastParameter(); - aCircle = Handle(Geom_Circle)::DownCast( aTrimmedCurve ); + aCircle = Handle(Geom_Circle)::DownCast( aTrimmedCurve ); // todo: useless downcast: aCircle always NULL } break; } @@ -550,7 +550,7 @@ Handle(AIS_DiameterDimension) MeasureGUI_DimensionCreateTool::Diameter( const GE aPmin = aTrimmedCurve->FirstParameter(); aPmax = aTrimmedCurve->LastParameter(); - aCircle = Handle(Geom_Circle)::DownCast( aTrimmedCurve ); + aCircle = Handle(Geom_Circle)::DownCast( aTrimmedCurve ); // todo: useless downcast: aCircle always NULL } break; @@ -579,6 +579,7 @@ Handle(AIS_DiameterDimension) MeasureGUI_DimensionCreateTool::Diameter( const GE // do not break, go to edge checking aMeasuredShape = anExpEdge; } + // fall through! case TopAbs_EDGE: { @@ -627,6 +628,8 @@ Handle(AIS_DiameterDimension) MeasureGUI_DimensionCreateTool::Diameter( const GE } } break; + default: + break; } if ( aCircle.IsNull() ) diff --git a/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx b/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx index 1f197d5a3..dde212088 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx @@ -169,7 +169,7 @@ MeasureGUI_DimensionInteractor::Operation return Operation_None; } - Standard_Real anAngTolerance = M_PI / 30.0; // 6 degree tolerance + //Standard_Real anAngTolerance = M_PI / 30.0; // 6 degree tolerance switch ( anOwner->SelectionMode() ) { @@ -330,7 +330,7 @@ void MeasureGUI_DimensionInteractor::MoveFlyoutFree( const Handle(V3d_View)& the gp_Pnt aPointOnBase = gp_Pnt( aFirstPoint.XYZ() + aBaseDir.XYZ() * aPointVector.Dot( aBaseDir ) ); // snapping tolerance - Quantity_Length aSize[2]; + Standard_Real aSize[2]; theView->Size( aSize[0], aSize[1] ); Standard_Real aSnapTolerance = 1e-2 * Max( aSize[0], aSize[1] ); @@ -618,7 +618,7 @@ void MeasureGUI_DimensionInteractor::MoveText( const Handle(V3d_View)& theView, const gp_Pnt& aFirstPoint = anAngle->FirstPoint(); const gp_Pnt& aSecondPoint = anAngle->SecondPoint(); - Standard_Boolean isPositive = anAngle->GetFlyout() > 0.0; + //Standard_Boolean isPositive = anAngle->GetFlyout() > 0.0; gp_Dir aFirstDir = gce_MakeDir( aCenterPoint, aFirstPoint ); gp_Dir aSecondDir = gce_MakeDir( aCenterPoint, aSecondPoint ); @@ -871,7 +871,7 @@ gp_Pnt MeasureGUI_DimensionInteractor::ProjectPlane( const Handle(V3d_View)& the Standard_Real MeasureGUI_DimensionInteractor::SensitivityTolerance( const Handle(V3d_View)& theView ) { // snapping tolerance - Quantity_Length aSize[2]; + Standard_Real aSize[2]; theView->Size( aSize[0], aSize[1] ); return 1e-2 * Max( aSize[0], aSize[1] ); } diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx index 60e41ce8d..1281d006e 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx @@ -404,7 +404,7 @@ SALOME_Prs* MeasureGUI_DistanceDlg::buildPrs() return aPrs; } } - catch (Standard_Failure) { + catch (Standard_Failure&) { return 0; } } @@ -422,7 +422,7 @@ GEOM::GEOM_IOperations_ptr MeasureGUI_DistanceDlg::createOperation() // function : isValid() // purpose : //================================================================================= -bool MeasureGUI_DistanceDlg::isValid (QString& msg) +bool MeasureGUI_DistanceDlg::isValid (QString& /*msg*/) { return myObj1 && myObj2; } diff --git a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx index 2b9dd4f3b..ae0ad64be 100644 --- a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx @@ -252,7 +252,7 @@ void MeasureGUI_FastCheckIntersectionsDlg::onCompute() TopExp::MapShapes(aSelShape2, anIndices2); //Sub-shapes of 1st Object - for (int i = 0; i < myInters1->length(); i++) { + for (int i = 0; i < (int)myInters1->length(); i++) { TopoDS_Shape aSubShape = anIndices1.FindKey(myInters1[i]); QString aType = GEOMBase::GetShapeTypeString(aSubShape); if (!aType.isEmpty()) @@ -262,7 +262,7 @@ void MeasureGUI_FastCheckIntersectionsDlg::onCompute() myShapeList1->selectAll(); //Sub-shapes of second Object - for (int i = 0; i < myInters2->length(); i++) { + for (int i = 0; i < (int)myInters2->length(); i++) { TopoDS_Shape aSubShape = anIndices2.FindKey(myInters2[i]); QString aType = GEOMBase::GetShapeTypeString(aSubShape); if (!aType.isEmpty()) @@ -475,7 +475,7 @@ bool MeasureGUI_FastCheckIntersectionsDlg::findIntersections() GEOM::GEOM_IMeasureOperations::_narrow(getOperation()); bool isOK = true; - bool HasInte; + bool HasInte = false; try { HasInte = anOper->FastIntersect(myObj1.get(), myObj2.get(), getTolerance(), getDeflection(), myInters1, myInters2); } @@ -623,7 +623,7 @@ GEOM::ListOfGO_var MeasureGUI_FastCheckIntersectionsDlg::getLstObjFromListSelect for (i=0, anIter = aObjLstExist.begin(); anIter != aObjLstExist.end(); i++, ++anIter) { anObjLst[i] = *anIter; } - for (int j = 0; j < aObjLstCreate->length(); j++) { + for (int j = 0; j < (int)aObjLstCreate->length(); j++) { anObjLst[aObjLstExist.size()+j]=aObjLstCreate[j]; } return anObjLst._retn(); @@ -645,11 +645,11 @@ bool MeasureGUI_FastCheckIntersectionsDlg::execute(ObjectList& objects) //Collect general intersection list aCompList->length(nbObj); int i; - for (i = 0; i < aList1->length(); i++) { + for (i = 0; i < (int)aList1->length(); i++) { GEOMBase::PublishSubObject( aList1[i] ); aCompList[i]=aList1[i]; } - for (int j = 0; j < aList2->length(); j++) { + for (int j = 0; j < (int)aList2->length(); j++) { GEOMBase::PublishSubObject( aList2[j] ); aCompList[i+j]=aList2[j]; } diff --git a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx index 21b05da59..5a3083446 100644 --- a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx @@ -196,7 +196,7 @@ void MeasureGUI_ManageDimensionsDlg::StartSelection( const Selection theSelectio Handle(AIS_InteractiveContext) anAISContext = myOperatedViewer->getAISContext(); - anAISContext->ClearCurrents( Standard_False ); + anAISContext->ClearCurrents( Standard_False ); // todo: deprecated OCCT API anAISContext->ClearSelected( Standard_False ); Handle(MeasureGUI_DimensionFilter) aFilter = new MeasureGUI_DimensionFilter( myEditObject->GetStudyEntry() ); @@ -358,7 +358,7 @@ void MeasureGUI_ManageDimensionsDlg::SelectionIntoArgument( const Selection theS anAISContext->InitSelected(); Handle(AIS_InteractiveObject) anAIS; - anAIS = anAISContext->Current(); + anAIS = anAISContext->Current(); // todo: deprecated OCCT API int aDimensionId = IdFromPrs( anAIS ); @@ -1233,7 +1233,7 @@ void MeasureGUI_ManageDimensionsDlg::SelectInViewer( SOCC_Viewer* theViewer, con { return; } - anAISContext->ClearCurrents( Standard_False ); + anAISContext->ClearCurrents( Standard_False ); // todo: deprecated OCCT API SOCC_Prs* aPrs = dynamic_cast( theViewer->CreatePrs( myEditObject->GetStudyEntry() ) ); AIS_ListOfInteractive aListOfIO; @@ -1264,7 +1264,7 @@ void MeasureGUI_ManageDimensionsDlg::SelectInViewer( SOCC_Viewer* theViewer, con anAISContext->Activate( anIO, AIS_DSM_Text ); #endif - anAISContext->AddOrRemoveCurrentObject( anIO, Standard_False ); + anAISContext->AddOrRemoveCurrentObject( anIO, Standard_False ); // todo: deprecated OCCT API anAISContext->UpdateCurrentViewer(); } } diff --git a/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx b/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx index 9765b77c9..09f9fb959 100644 --- a/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx @@ -64,8 +64,8 @@ // class : MeasureGUI_ShapeStatisticsDlg() //=========================================================================== MeasureGUI_ShapeStatisticsDlg::MeasureGUI_ShapeStatisticsDlg( QWidget* parent, TopoDS_Shape aShape, TopAbs_ShapeEnum aSubShapeType ) -: GEOMBase_Helper( SUIT_Session::session()->activeApplication()->desktop() ), - QDialog( parent ), +: QDialog( parent ), + GEOMBase_Helper( SUIT_Session::session()->activeApplication()->desktop() ), myHistogram ( 0 ) { myShapes.push_back( aShape ); diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx index 491e4825e..ee6be6c19 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -255,7 +255,7 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent // computed deflection coefficient is stored as absolute. Prs3d::GetDeflection (myshape, myDrawer); #endif - } + } // fall through! // End 0023271 case CustomHighlight: { @@ -333,7 +333,7 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent else aDir = -aDirVec; - Prs3d_Arrow::Draw(aPrs, aP2, aDir, M_PI/180.*5., aDist/10.); + Prs3d_Arrow::Draw(aPrs->CurrentGroup(), aP2, aDir, M_PI/180.*5., aDist/10.); } } } @@ -606,7 +606,7 @@ void GEOM_AISShape::drawField( const Handle(Prs3d_Presentation)& thePrs, aGroup->AddText (aText); #else Graphic3d_Vertex aVertex( aCenter.X(), aCenter.Y(), aCenter.Z() ); - aGroup->Text( aString.toUtf8().constData(), aVertex, 14 ); + aGroup->Text( aString.toUtf8().constData(), aVertex, 14 ); // deprecated API, to be removed (see above) #endif } } @@ -681,7 +681,7 @@ void GEOM_AISShape::drawName( const Handle(Prs3d_Presentation)& thePrs ) aGroup->AddText(aText); #else Graphic3d_Vertex aVertex( aCenter.X(), aCenter.Y(), aCenter.Z() ); - aGroup->Text( TCollection_ExtendedString( aName ), aVertex, 16 ); + aGroup->Text( TCollection_ExtendedString( aName ), aVertex, 16 ); // deprecated API, to be removed (see above) #endif } diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index 1b782df45..8b7192f47 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -71,7 +71,7 @@ #include "SALOME_InteractiveObject.hxx" -//vtkStandardNewMacro(GEOM_Actor); +//vtkStandardNewMacro(GEOM_Actor) #ifndef MYDEBUG //#define MYDEBUG @@ -724,8 +724,8 @@ const TopoDS_Shape& GEOM_Actor::getTopo() { return myShape; } -void GEOM_Actor::setInputShape(const TopoDS_Shape& ashape, double adef1, - int imode, bool isVector) +void GEOM_Actor::setInputShape(const TopoDS_Shape& /*ashape*/, double /*adef1*/, + int /*imode*/, bool /*isVector*/) { #ifdef MYDEBUG MESSAGE ( "GEOM_Actor::setInputShape" ); @@ -986,7 +986,7 @@ GEOM_Actor */ bool GEOM_Actor -::PreHighlight(vtkInteractorStyle *theInteractorStyle, +::PreHighlight(vtkInteractorStyle* /*theInteractorStyle*/, SVTK_SelectionEvent* theSelectionEvent, bool theIsHighlight) { diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h index 810483a45..d84923213 100644 --- a/src/OBJECT/GEOM_Actor.h +++ b/src/OBJECT/GEOM_Actor.h @@ -59,7 +59,7 @@ typedef GEOM_SmartPtr PAppendFilter; class GEOM_OBJECT_EXPORT GEOM_Actor: public SALOME_Actor { public: - vtkTypeMacro(GEOM_Actor,SALOME_Actor); + vtkTypeMacro(GEOM_Actor,SALOME_Actor) static GEOM_Actor* New(); void SetShape(const TopoDS_Shape& theShape, diff --git a/src/OBJECT/GEOM_Annotation.cxx b/src/OBJECT/GEOM_Annotation.cxx index 368e7e8d1..3b2a1566c 100644 --- a/src/OBJECT/GEOM_Annotation.cxx +++ b/src/OBJECT/GEOM_Annotation.cxx @@ -549,8 +549,8 @@ Bnd_Box GEOM_Annotation::TextBoundingBox() const unsigned int aResolution = GetContext()->CurrentViewer()->DefaultRenderingParams().Resolution; if ( aFont.Init( anAsp->Aspect()->Font().ToCString(), anAsp->Aspect()->GetTextFontAspect(), - (unsigned int)anAsp->Height(), - aResolution ) ) + (unsigned int)anAsp->Height(), + aResolution ) ) // deprecated API, to be removed (see above) #endif { const NCollection_String aText( (Standard_Utf16Char* )myText.ToExtString() ); @@ -807,7 +807,7 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& // to avoid jittering when dragging text myTextDraw->SetPosition( OpenGl_Vec3( static_cast( myAISObject->myPosition.X() ), static_cast( myAISObject->myPosition.Y() ), - static_cast( myAISObject->myPosition.Z() ) ) ); + static_cast( myAISObject->myPosition.Z() ) ) ); // todo: deprecated OCCT API } myTextDraw->Render( theWorkspace ); diff --git a/src/OBJECT/GEOM_DeviceActor.cxx b/src/OBJECT/GEOM_DeviceActor.cxx index 72a65ae5d..f9d1ef6d8 100644 --- a/src/OBJECT/GEOM_DeviceActor.cxx +++ b/src/OBJECT/GEOM_DeviceActor.cxx @@ -34,12 +34,12 @@ #include -vtkStandardNewMacro(GEOM_DeviceActor); +vtkStandardNewMacro(GEOM_DeviceActor) GEOM_DeviceActor::GEOM_DeviceActor() : - myStripper(vtkStripper::New(), true), - myPolyDataMapper(vtkPolyDataMapper::New(), true), myPolyDataNormals(vtkPolyDataNormals::New(), true), + myPolyDataMapper(vtkPolyDataMapper::New(), true), + myStripper(vtkStripper::New(), true), myActor(VTKViewer_Actor::New(), true), myTransformFilter(VTKViewer_TransformFilter::New()) { @@ -66,9 +66,10 @@ SetInput(vtkAlgorithmOutput* thePolyData, bool theUseStripper) myTransformFilter->SetInputConnection(myStripper->GetOutputPort()); myPolyDataMapper->SetInputConnection(myTransformFilter->GetOutputPort()); } - else + else { myTransformFilter->SetInputConnection(thePolyData); myPolyDataMapper->SetInputConnection(myTransformFilter->GetOutputPort()); + } } void diff --git a/src/OBJECT/GEOM_DeviceActor.h b/src/OBJECT/GEOM_DeviceActor.h index 6d576c825..6e5f45b2c 100644 --- a/src/OBJECT/GEOM_DeviceActor.h +++ b/src/OBJECT/GEOM_DeviceActor.h @@ -51,7 +51,7 @@ class vtkAlgorithmOutput; class VTK_EXPORT GEOM_DeviceActor: public vtkObject { public: - vtkTypeMacro(GEOM_DeviceActor,vtkObject); + vtkTypeMacro(GEOM_DeviceActor,vtkObject) static GEOM_DeviceActor* New(); void SetProperty(vtkProperty* theProperty); diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx index 84f1763d3..6402cfae6 100644 --- a/src/OBJECT/GEOM_OCCReader.cxx +++ b/src/OBJECT/GEOM_OCCReader.cxx @@ -102,7 +102,7 @@ GEOM_OCCReader::~GEOM_OCCReader() //======================================================================= int GEOM_OCCReader::RequestData(vtkInformation *vtkNotUsed(request), - vtkInformationVector **inputVector, + vtkInformationVector **/*inputVector*/, vtkInformationVector *outputVector) { vtkInformation *outInfo = outputVector->GetInformationObject(0); @@ -350,7 +350,7 @@ void GEOM_OCCReader::DrawIso(GeomAbs_IsoType T, Standard_Real T2, vtkPoints* Pts, vtkCellArray* Cells, - Standard_Integer& startidx) + Standard_Integer& /*startidx*/) { Standard_Boolean halt = Standard_False; @@ -785,7 +785,7 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge, // Purpose : Transfer wireframe data for VERTEX //======================================================================= -void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& aVertex, +void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& /*aVertex*/, vtkPoints* Pts, vtkCellArray* Cells) { @@ -824,9 +824,9 @@ void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& aVertex, // Purpose : Transfer shading data for EDGE //======================================================================= -void GEOM_OCCReader::TransferEdgeSData(const TopoDS_Edge& aFace, - vtkPoints* Pts, - vtkCellArray* Cells) +void GEOM_OCCReader::TransferEdgeSData(const TopoDS_Edge& /*aFace*/, + vtkPoints* /*Pts*/, + vtkCellArray* /*Cells*/) { } diff --git a/src/OBJECT/GEOM_PainterPolyDataMapper.cxx b/src/OBJECT/GEOM_PainterPolyDataMapper.cxx index b00dbd3dc..c649827ea 100644 --- a/src/OBJECT/GEOM_PainterPolyDataMapper.cxx +++ b/src/OBJECT/GEOM_PainterPolyDataMapper.cxx @@ -21,4 +21,4 @@ #include -vtkStandardNewMacro(GEOM_PainterPolyDataMapper); +vtkStandardNewMacro(GEOM_PainterPolyDataMapper) diff --git a/src/OBJECT/GEOM_PainterPolyDataMapper.h b/src/OBJECT/GEOM_PainterPolyDataMapper.h index d12c88717..65940449b 100644 --- a/src/OBJECT/GEOM_PainterPolyDataMapper.h +++ b/src/OBJECT/GEOM_PainterPolyDataMapper.h @@ -40,15 +40,15 @@ public vtkPolyDataMapper { public: #ifndef VTK_OPENGL2 - vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper); + vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper) #else - vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPolyDataMapper); + vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPolyDataMapper) #endif static GEOM_PainterPolyDataMapper* New(); - virtual void RenderPiece(vtkRenderer *ren, vtkActor *act) {} + virtual void RenderPiece(vtkRenderer* /*ren*/, vtkActor* /*act*/) {} protected: GEOM_PainterPolyDataMapper() {} diff --git a/src/OBJECT/GEOM_VTKPropertyMaterial.cxx b/src/OBJECT/GEOM_VTKPropertyMaterial.cxx index 5f407f733..f6e04d7a2 100644 --- a/src/OBJECT/GEOM_VTKPropertyMaterial.cxx +++ b/src/OBJECT/GEOM_VTKPropertyMaterial.cxx @@ -27,7 +27,7 @@ #include -vtkStandardNewMacro( GEOM_VTKPropertyMaterial ); +vtkStandardNewMacro( GEOM_VTKPropertyMaterial ) GEOM_VTKPropertyMaterial::GEOM_VTKPropertyMaterial() { diff --git a/src/OBJECT/GEOM_VTKPropertyMaterial.hxx b/src/OBJECT/GEOM_VTKPropertyMaterial.hxx index 99d95a21f..39e5bf145 100644 --- a/src/OBJECT/GEOM_VTKPropertyMaterial.hxx +++ b/src/OBJECT/GEOM_VTKPropertyMaterial.hxx @@ -38,7 +38,7 @@ protected: virtual ~GEOM_VTKPropertyMaterial(); public: - vtkTypeMacro(GEOM_VTKPropertyMaterial, vtkProperty); + vtkTypeMacro(GEOM_VTKPropertyMaterial, vtkProperty) vtkSetMacro(Physical, bool); vtkGetMacro(Physical, bool); diff --git a/src/OBJECT/GEOM_VTKTrihedron.cxx b/src/OBJECT/GEOM_VTKTrihedron.cxx index 568b8a9d7..871b374ce 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.cxx +++ b/src/OBJECT/GEOM_VTKTrihedron.cxx @@ -63,7 +63,7 @@ protected: public: - vtkTypeMacro( GEOM_VTKTrihedronAxis, VTKViewer_Axis ); + vtkTypeMacro( GEOM_VTKTrihedronAxis, VTKViewer_Axis ) static GEOM_VTKTrihedronAxis* New(); void SetAxis( const gp_Ax1& theAxis, const int theRot, double theColor[ 3 ] ); @@ -79,7 +79,7 @@ private: vtkTransform* myTrsf; }; -vtkStandardNewMacro( GEOM_VTKTrihedronAxis ); +vtkStandardNewMacro( GEOM_VTKTrihedronAxis ) GEOM_VTKTrihedronAxis::GEOM_VTKTrihedronAxis() { @@ -197,7 +197,7 @@ void GEOM_VTKTrihedronAxis::SetColor( const double theColor[ 3 ] ) Placement of trihedron is changed with SetPlacement() method */ -vtkStandardNewMacro( GEOM_VTKTrihedron ); +vtkStandardNewMacro( GEOM_VTKTrihedron ) GEOM_VTKTrihedron::GEOM_VTKTrihedron() { diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx index 865931c55..0d85345f6 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.hxx +++ b/src/OBJECT/GEOM_VTKTrihedron.hxx @@ -52,7 +52,7 @@ protected: virtual ~GEOM_VTKTrihedron(); public: - vtkTypeMacro( GEOM_VTKTrihedron, SALOME_Actor ); + vtkTypeMacro( GEOM_VTKTrihedron, SALOME_Actor ) static GEOM_VTKTrihedron* New(); virtual double GetSize() { return mySize;} diff --git a/src/OCC2VTK/GEOM_EdgeSource.cxx b/src/OCC2VTK/GEOM_EdgeSource.cxx index c61ac7383..4be8d2909 100644 --- a/src/OCC2VTK/GEOM_EdgeSource.cxx +++ b/src/OCC2VTK/GEOM_EdgeSource.cxx @@ -37,7 +37,7 @@ #include #include -vtkStandardNewMacro(GEOM_EdgeSource); +vtkStandardNewMacro(GEOM_EdgeSource) GEOM_EdgeSource::GEOM_EdgeSource() : myIsVector(false) diff --git a/src/OCC2VTK/GEOM_EdgeSource.h b/src/OCC2VTK/GEOM_EdgeSource.h index b63de70fa..b66394351 100644 --- a/src/OCC2VTK/GEOM_EdgeSource.h +++ b/src/OCC2VTK/GEOM_EdgeSource.h @@ -36,7 +36,7 @@ class vtkPolyData; class OCC2VTK_EXPORT GEOM_EdgeSource: public vtkPolyDataAlgorithm { public: - vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataAlgorithm); + vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataAlgorithm) static GEOM_EdgeSource* New(); void AddEdge (const TopoDS_Edge& theEdge, diff --git a/src/OCC2VTK/GEOM_FaceSource.h b/src/OCC2VTK/GEOM_FaceSource.h index 56d266428..16ee4bee9 100644 --- a/src/OCC2VTK/GEOM_FaceSource.h +++ b/src/OCC2VTK/GEOM_FaceSource.h @@ -37,7 +37,7 @@ class vtkPolyData; class OCC2VTK_EXPORT GEOM_FaceSource: public vtkPolyDataAlgorithm { public: - vtkTypeMacro(GEOM_FaceSource,vtkPolyDataAlgorithm); + vtkTypeMacro(GEOM_FaceSource,vtkPolyDataAlgorithm) void AddFace(const TopoDS_Face& theFace); void Clear(){ myFaceSet.Clear();} diff --git a/src/OCC2VTK/GEOM_ShadingFace.cxx b/src/OCC2VTK/GEOM_ShadingFace.cxx index 50bb9fcec..18d8e8bd9 100644 --- a/src/OCC2VTK/GEOM_ShadingFace.cxx +++ b/src/OCC2VTK/GEOM_ShadingFace.cxx @@ -33,7 +33,7 @@ #include -vtkStandardNewMacro(GEOM_ShadingFace); +vtkStandardNewMacro(GEOM_ShadingFace) GEOM_ShadingFace::GEOM_ShadingFace() { diff --git a/src/OCC2VTK/GEOM_ShadingFace.h b/src/OCC2VTK/GEOM_ShadingFace.h index 2b765a282..86201ed4a 100644 --- a/src/OCC2VTK/GEOM_ShadingFace.h +++ b/src/OCC2VTK/GEOM_ShadingFace.h @@ -26,7 +26,7 @@ class OCC2VTK_EXPORT GEOM_ShadingFace: public GEOM_FaceSource { public: - vtkTypeMacro(GEOM_ShadingFace,GEOM_FaceSource); + vtkTypeMacro(GEOM_ShadingFace,GEOM_FaceSource) static GEOM_ShadingFace* New(); static diff --git a/src/OCC2VTK/GEOM_VertexSource.cxx b/src/OCC2VTK/GEOM_VertexSource.cxx index 90e45816d..70784a1c9 100644 --- a/src/OCC2VTK/GEOM_VertexSource.cxx +++ b/src/OCC2VTK/GEOM_VertexSource.cxx @@ -31,7 +31,7 @@ #include #include -vtkStandardNewMacro(GEOM_VertexSource); +vtkStandardNewMacro(GEOM_VertexSource) GEOM_VertexSource::GEOM_VertexSource() { diff --git a/src/OCC2VTK/GEOM_VertexSource.h b/src/OCC2VTK/GEOM_VertexSource.h index 086596f4d..5f8748518 100644 --- a/src/OCC2VTK/GEOM_VertexSource.h +++ b/src/OCC2VTK/GEOM_VertexSource.h @@ -36,7 +36,7 @@ class vtkPolyData; class OCC2VTK_EXPORT GEOM_VertexSource: public vtkPolyDataAlgorithm { public: - vtkTypeMacro(GEOM_VertexSource,vtkPolyDataAlgorithm); + vtkTypeMacro(GEOM_VertexSource,vtkPolyDataAlgorithm) static GEOM_VertexSource* New(); void AddVertex(const TopoDS_Vertex& theVertex); diff --git a/src/OCC2VTK/GEOM_WireframeFace.cxx b/src/OCC2VTK/GEOM_WireframeFace.cxx index 46579f1c1..86830f785 100644 --- a/src/OCC2VTK/GEOM_WireframeFace.cxx +++ b/src/OCC2VTK/GEOM_WireframeFace.cxx @@ -35,7 +35,7 @@ #include #include -vtkStandardNewMacro(GEOM_WireframeFace); +vtkStandardNewMacro(GEOM_WireframeFace) GEOM_WireframeFace::GEOM_WireframeFace(): Discret(15) @@ -309,12 +309,14 @@ CreateIso_(const TopoDS_Face& theFace, case GeomAbs_BSplineCurve : case GeomAbs_OtherCurve : for(j = 1; j <= theDiscret/2; j++){ - Standard_Real aStep = (theIsoType == GeomAbs_IsoV) ? stepU*2. : stepV*2.; - CreateIso__(S, theIsoType, U1, V1, aStep, thePolyData, thePts); + Standard_Real aStep = (theIsoType == GeomAbs_IsoV) ? stepU*2. : stepV*2.; + CreateIso__(S, theIsoType, U1, V1, aStep, thePolyData, thePts); U1 += stepU*2.; V1 += stepV*2.; } break; + default: + break; } } } diff --git a/src/OCC2VTK/GEOM_WireframeFace.h b/src/OCC2VTK/GEOM_WireframeFace.h index 2b0ef1558..e4cd8ad70 100644 --- a/src/OCC2VTK/GEOM_WireframeFace.h +++ b/src/OCC2VTK/GEOM_WireframeFace.h @@ -36,7 +36,7 @@ namespace GEOMUtils class OCC2VTK_EXPORT GEOM_WireframeFace: public GEOM_FaceSource { public: - vtkTypeMacro(GEOM_WireframeFace,GEOM_FaceSource); + vtkTypeMacro(GEOM_WireframeFace,GEOM_FaceSource) static GEOM_WireframeFace* New(); /* vtkSetMacro(NbIso,int); diff --git a/src/OCC2VTK/OCC2VTK_Tools.cxx b/src/OCC2VTK/OCC2VTK_Tools.cxx index 6a257d442..063bb91c9 100644 --- a/src/OCC2VTK/OCC2VTK_Tools.cxx +++ b/src/OCC2VTK/OCC2VTK_Tools.cxx @@ -178,7 +178,7 @@ namespace GEOM ret->ShallowCopy(myAppendFilter->GetOutput()); myAppendFilter->Delete(); } - catch(Standard_Failure) { + catch(Standard_Failure&) { } } return ret; diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx index df71b0cbc..90af752fb 100644 --- a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx +++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx @@ -302,7 +302,7 @@ bool OperationGUI_ArchimedeDlg::execute( ObjectList& objects ) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void OperationGUI_ArchimedeDlg::ValueChangedInSpinBox(double newValue) +void OperationGUI_ArchimedeDlg::ValueChangedInSpinBox(double /*newValue*/) { processPreview(); } diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx index ca392ce51..da409bb51 100644 --- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx +++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx @@ -321,7 +321,7 @@ bool OperationGUI_GetShapesOnShapeDlg::execute (ObjectList& objects) default: aLimit = GEOM::SHAPE ; break; } - GEOM::shape_state aState; + GEOM::shape_state aState = GEOM::ST_IN; // todo: aState must be explicitly initialized to avoid warning (see below) switch (GroupPoints->ComboBox2->currentIndex()) { case 0: aState = GEOM::ST_IN; break; @@ -335,7 +335,7 @@ bool OperationGUI_GetShapesOnShapeDlg::execute (ObjectList& objects) GEOM::GEOM_IShapesOperations_var anOper = GEOM::GEOM_IShapesOperations::_narrow(getOperation()); GEOM::GEOM_Object_var anObj = anOper->GetShapesOnShapeAsCompound(myObject2, myObject1, (CORBA::Short) aLimit, - aState); + aState); // todo: aState must be explicitly initialized to avoid warning (see above) if (!anObj->_is_nil()) objects.push_back(anObj._retn()); diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx index 0e8aa1a85..55adc00a5 100644 --- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx +++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx @@ -182,7 +182,7 @@ void OperationGUI_GetSharedShapesDlg::initTypes() // function : ConstructorsClicked() // purpose : Radio button management //================================================================================= -void OperationGUI_GetSharedShapesDlg::ConstructorsClicked (int constructorId) +void OperationGUI_GetSharedShapesDlg::ConstructorsClicked (int /*constructorId*/) { disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); globalSelection(); diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx index e4c6c5523..7517f61c4 100644 --- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx +++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx @@ -317,7 +317,7 @@ void OperationGUI_PartitionDlg::SelectionIntoArgument() //myListMaterials.length( 0 ); // obsolete GEOM::shape_type type = GEOM::SHAPE; - for (int i = 0; i < myListShapes.length(); i++) + for (int i = 0; i < (int)myListShapes.length(); i++) type = qMin( type, myListShapes[i]->GetMaxShapeType() ); int idx = qMax( 0, GroupPoints->ComboBox1->findData( type ) ); GroupPoints->ComboBox1->setCurrentIndex( idx ); @@ -560,19 +560,19 @@ int OperationGUI_PartitionDlg::GetLimit() const QList OperationGUI_PartitionDlg::getSourceObjects() { QList res; - for (int i = 0; i < myListShapes.length(); i++) { + for (int i = 0; i < (int)myListShapes.length(); i++) { GEOM::GeomObjPtr aGeomObjPtr(myListShapes[i]); res << aGeomObjPtr; } - for (int i = 0; i < myListTools.length(); i++) { + for (int i = 0; i < (int)myListTools.length(); i++) { GEOM::GeomObjPtr aGeomObjPtr(myListTools[i]); res << aGeomObjPtr; } - for (int i = 0; i < myListRemoveInside.length(); i++) { + for (int i = 0; i < (int)myListRemoveInside.length(); i++) { GEOM::GeomObjPtr aGeomObjPtr(myListRemoveInside[i]); res << aGeomObjPtr; } - for (int i = 0; i < myListKeepInside.length(); i++) { + for (int i = 0; i < (int)myListKeepInside.length(); i++) { GEOM::GeomObjPtr aGeomObjPtr(myListKeepInside[i]); res << aGeomObjPtr; } diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx index 750aceac6..0c5c3de51 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx @@ -196,7 +196,7 @@ void PrimitiveGUI_FaceDlg::SetDoubleSpinBoxStep( double step ) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void PrimitiveGUI_FaceDlg::ValueChangedInSpinBox( double newValue ) +void PrimitiveGUI_FaceDlg::ValueChangedInSpinBox( double /*newValue*/ ) { displayPreview(true); } diff --git a/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx b/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx index 675d87d0b..1e6f387f8 100644 --- a/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx +++ b/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx @@ -311,7 +311,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_FuseEdgesDlg::createOperation() // function : isValid() // purpose : Verify validity of input data //================================================================================= -bool RepairGUI_FuseEdgesDlg::isValid (QString& msg) +bool RepairGUI_FuseEdgesDlg::isValid (QString& /*msg*/) { return (!myShape->_is_nil()); } diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index 8921e9ede..b1702ee2e 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx @@ -165,6 +165,8 @@ RepairGUI_GlueDlg::RepairGUI_GlueDlg(GeometryGUI* theGeometryGUI, QWidget* paren aHelpFileName = "glue_faces_operation_page.html"; break; } + default: + break; } setHelpFileName(aHelpFileName); diff --git a/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx b/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx index 198562f21..64b650fec 100644 --- a/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx +++ b/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx @@ -237,8 +237,8 @@ QWidget* RepairGUI_InspectObjectDlg::Delegate::createEditor( QWidget* parent, // purpose : Constructs a RepairGUI_InspectObjectDlg which is a child of 'parent'. //================================================================================= RepairGUI_InspectObjectDlg::RepairGUI_InspectObjectDlg(GeometryGUI *theGeomGUI, SUIT_Desktop* parent ) -: GEOMBase_Helper (parent), - QDialog (parent), +: QDialog (parent), + GEOMBase_Helper (parent), myGeomGUI (theGeomGUI), myTreeObjects (0), myFilteredTreeObjects (0), @@ -247,14 +247,14 @@ RepairGUI_InspectObjectDlg::RepairGUI_InspectObjectDlg(GeometryGUI *theGeomGUI, myTolFilterGrp (0), myShapeTypeBtnGrp (0), myComparisonCompo (0), + myTolEdit (0), myMinTolValLabel (0), myMaxTolValLabel (0), - myTolEdit (0), myTreesLayout (0), - myTransparency (0.0), - myIsSelectAll (false), myMaxTol (-1.), - myMinTol (-1.) + myMinTol (-1.), + myIsSelectAll (false), + myTransparency (0.0) { SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); QIcon iconSelect( resMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) ); @@ -1214,7 +1214,7 @@ void RepairGUI_InspectObjectDlg::clickOnPublish() GEOM::ListOfGO_var aList = anOper->MakeSubShapes( aMainObject, anArray ); // publish sub-shapes - for ( int i = 0; i < aList->length(); i++ ) + for ( int i = 0; i < (int)aList->length(); i++ ) GeometryGUI::GetGeomGen()->AddInStudy( aList[i], anIndices.values().at(i).toStdString().c_str(), aMainObject ); diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx index 1042c46ec..6450c33b4 100644 --- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx +++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx @@ -150,7 +150,7 @@ void RepairGUI_LimitToleranceDlg::Init() // function : ConstructorsClicked() // purpose : Radio button management //================================================================================= -void RepairGUI_LimitToleranceDlg::ConstructorsClicked(int constructorId) +void RepairGUI_LimitToleranceDlg::ConstructorsClicked(int /*constructorId*/) { disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx index 6f124bc32..c57a51082 100644 --- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx +++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx @@ -241,7 +241,7 @@ void RepairGUI_RemoveExtraEdgesDlg::ActivateThisDialog() // function : enterEvent() // purpose : Mouse enter onto the dialog to activate it //================================================================================= -void RepairGUI_RemoveExtraEdgesDlg::enterEvent(QEvent* e) +void RepairGUI_RemoveExtraEdgesDlg::enterEvent(QEvent*) { if ( !mainFrame()->GroupConstructors->isEnabled() ) ActivateThisDialog(); @@ -274,7 +274,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_RemoveExtraEdgesDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool RepairGUI_RemoveExtraEdgesDlg::isValid( QString& msg ) +bool RepairGUI_RemoveExtraEdgesDlg::isValid( QString& /*msg*/ ) { return myOkObject; } diff --git a/src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx b/src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx index a8ce60d95..62820a279 100644 --- a/src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx +++ b/src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx @@ -212,7 +212,7 @@ void RepairGUI_RemoveWebsDlg::ActivateThisDialog() // function : enterEvent() // purpose : Mouse enter onto the dialog to activate it //================================================================================= -void RepairGUI_RemoveWebsDlg::enterEvent (QEvent* e) +void RepairGUI_RemoveWebsDlg::enterEvent (QEvent*) { if (!mainFrame()->GroupConstructors->isEnabled()) ActivateThisDialog(); @@ -243,7 +243,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_RemoveWebsDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool RepairGUI_RemoveWebsDlg::isValid (QString& msg) +bool RepairGUI_RemoveWebsDlg::isValid (QString& /*msg*/) { return myOkObject; } diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index 9cc750640..f49f068e9 100644 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -524,7 +524,7 @@ void RepairGUI_ShapeProcessDlg::loadDefaults() anOp->GetShapeProcessParameters( anOperators, aParams, aValues ); // check the default items-operators - for ( int i = 0; i < anOperators->length(); i++ ) { + for ( int i = 0; i < (int)anOperators->length(); i++ ) { //MESSAGE("-->"<<(const char*)anOperators[i]); QList items = myOpList->findItems ( (const char*)anOperators[i], Qt::MatchFixedString ); if ( items.count() ) @@ -541,7 +541,7 @@ void RepairGUI_ShapeProcessDlg::loadDefaults() if ( aParams->length() != aValues->length() ) continue; - for ( int j = 0; j < aParams->length(); j++ ) { + for ( int j = 0; j < (int)aParams->length(); j++ ) { QWidget* aCtrl = getControl( (const char*)aParams[j] ); setValue( aCtrl, set_convert( (const char*)aParams[j], aValues[j] )); } @@ -684,7 +684,7 @@ bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects ) */// ----------- QStringList anErrorObjNames; - for ( int i = 0; i < myObjects->length(); i++ ) { + for ( int i = 0; i < (int)myObjects->length(); i++ ) { GEOM::GEOM_Object_var obj = myObjects[i]; GEOM::GEOM_IHealingOperations_var anOper = GEOM::GEOM_IHealingOperations::_narrow( getOperation() ); GEOM::GEOM_Object_var anObj = anOper->ProcessShape( obj, anOperators, aParams, aValues ); @@ -696,10 +696,10 @@ bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects ) { QStringList aParameters; - for ( int i = 0; i < anOperators->length(); i++ ) + for ( int i = 0; i < (int)anOperators->length(); i++ ) aParameters << QString( anOperators[i] ); - for ( int i = 0; i < aParams->length(); i++ ) + for ( int i = 0; i < (int)aParams->length(); i++ ) aParameters << QString( aParams[i] ); aParameters << getTexts( aParams ); @@ -714,7 +714,7 @@ bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects ) if ( !anErrorObjNames.empty() ) MESSAGE( "ERRORS occurred while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() ); - return anErrorObjNames.size() < myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing. + return anErrorObjNames.size() < (int)myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing. } //================================================================================= @@ -839,14 +839,14 @@ GEOM::string_array* RepairGUI_ShapeProcessDlg::getParameters( const GEOM::string int i = 0, j = 0; // calculate the length of parameters - for ( i = 0, j = 0; i < theOperators.length(); i++ ) + for ( i = 0, j = 0; i < (int)theOperators.length(); i++ ) j += myValMap[ QString( theOperators[i].in() ) ].size(); // set the new length of parameters aParams->length( j ); // fill the parameters - for ( i = 0, j = 0; i < theOperators.length(); i++ ) { + for ( i = 0, j = 0; i < (int)theOperators.length(); i++ ) { QStringList aParamLst = myValMap[ QString( theOperators[i].in() ) ]; foreach ( QString aParam, aParamLst ) { aParams[j++] = CORBA::string_dup( aParam.toLatin1().constData() ); @@ -868,7 +868,7 @@ GEOM::string_array* RepairGUI_ShapeProcessDlg::getValues( const GEOM::string_arr GEOM::string_array_var aValues = new GEOM::string_array(); aValues->length( theParams.length() ); - for ( int i = 0; i < theParams.length(); i++ ) { + for ( int i = 0; i < (int)theParams.length(); i++ ) { QWidget* aCtrl = getControl( (const char*)theParams[i] ); if ( aCtrl ) aValues[i] = get_convert( (const char*)theParams[i], getValue( aCtrl )); @@ -885,7 +885,7 @@ QStringList RepairGUI_ShapeProcessDlg::getTexts( const GEOM::string_array& thePa { QStringList aTexts; - for ( int i = 0; i < theParams.length(); i++ ) { + for ( int i = 0; i < (int)theParams.length(); i++ ) { QWidget* aCtrl = getControl( (const char*)theParams[i] ); if ( aCtrl ) { @@ -1000,7 +1000,7 @@ QList RepairGUI_ShapeProcessDlg::getSourceObjects() { QList res; GEOM::ListOfGO aListPtr(myObjects); - for (int i = 0; i < aListPtr.length(); i++) { + for (int i = 0; i < (int)aListPtr.length(); i++) { GEOM::GeomObjPtr aGeomObjPtr(aListPtr[i]); res << aGeomObjPtr; } diff --git a/src/RepairGUI/RepairGUI_UnionFacesDlg.cxx b/src/RepairGUI/RepairGUI_UnionFacesDlg.cxx index 328e83190..9f437e471 100644 --- a/src/RepairGUI/RepairGUI_UnionFacesDlg.cxx +++ b/src/RepairGUI/RepairGUI_UnionFacesDlg.cxx @@ -237,7 +237,7 @@ void RepairGUI_UnionFacesDlg::ActivateThisDialog() // function : enterEvent() // purpose : Mouse enter onto the dialog to activate it //================================================================================= -void RepairGUI_UnionFacesDlg::enterEvent(QEvent* e) +void RepairGUI_UnionFacesDlg::enterEvent(QEvent*) { if ( !mainFrame()->GroupConstructors->isEnabled() ) ActivateThisDialog(); @@ -270,7 +270,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_UnionFacesDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool RepairGUI_UnionFacesDlg::isValid( QString& msg ) +bool RepairGUI_UnionFacesDlg::isValid( QString& /*msg*/ ) { return myOkObject; } diff --git a/src/SKETCHER/Sketcher_Profile.cxx b/src/SKETCHER/Sketcher_Profile.cxx index 52df8087c..969d4248f 100644 --- a/src/SKETCHER/Sketcher_Profile.cxx +++ b/src/SKETCHER/Sketcher_Profile.cxx @@ -636,6 +636,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentLength( const TCollection_AsciiSt void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString& x, int CurrentIndex ) { + (void)CurrentIndex; // unused in release mode myMove = none; myLength = x.RealValue(); if ( Abs( myDx ) < Precision::Confusion() ) { @@ -656,6 +657,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString& void Sketcher_Profile::ShapeFunctor::addSegmentY( const TCollection_AsciiString& y, int CurrentIndex ) { + (void)CurrentIndex; // unused in release mode myMove = none; myLength = y.RealValue(); if ( Abs( myDy ) < Precision::Confusion() ) { @@ -1380,7 +1382,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentLength( const TCollection_AsciiStr \internal */ void Sketcher_Profile::DumpFunctor::addSegmentX( const TCollection_AsciiString& x, - int CurrentIndex ) + int /*CurrentIndex*/ ) { myDescr += "sk.addSegmentX("; myDescr += x + ")"; @@ -1393,7 +1395,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentX( const TCollection_AsciiString& \internal */ void Sketcher_Profile::DumpFunctor::addSegmentY( const TCollection_AsciiString& y, - int CurrentIndex ) + int /*CurrentIndex*/ ) { myDescr += "sk.addSegmentY("; myDescr += y + ")"; @@ -1408,7 +1410,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentY( const TCollection_AsciiString& */ void Sketcher_Profile::DumpFunctor::addSegmentAngleLength( const TCollection_AsciiString& angle, const TCollection_AsciiString& length, - int& CurrentIndex ) + int& /*CurrentIndex*/ ) { double aAngle = angle.RealValue(); if ( aAngle == 90 ) { @@ -1430,7 +1432,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentAngleLength( const TCollection_Asc */ void Sketcher_Profile::DumpFunctor::addSegmentAngleX( const TCollection_AsciiString& angle, const TCollection_AsciiString& x, - int& CurrentIndex ) + int& /*CurrentIndex*/ ) { double aAngle = angle.RealValue(); if ( aAngle == 90 ) { @@ -1452,7 +1454,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentAngleX( const TCollection_AsciiStr */ void Sketcher_Profile::DumpFunctor::addSegmentAngleY( const TCollection_AsciiString& angle, const TCollection_AsciiString& y, - int& CurrentIndex ) + int& /*CurrentIndex*/ ) { double aAngle = angle.RealValue(); if ( aAngle == 90 ) { @@ -1476,7 +1478,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentAngleY( const TCollection_AsciiStr void Sketcher_Profile::DumpFunctor::addSegmentDirectionLength( const TCollection_AsciiString& dx, const TCollection_AsciiString& dy, const TCollection_AsciiString& length, - int& CurrentIndex ) + int& /*CurrentIndex*/ ) { myDescr += "sk.addSegmentDirectionLength("; myDescr += dx + ", " + dy + ", " + length + ")"; @@ -1493,7 +1495,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentDirectionLength( const TCollection void Sketcher_Profile::DumpFunctor::addSegmentDirectionX( const TCollection_AsciiString& dx, const TCollection_AsciiString& dy, const TCollection_AsciiString& x, - int& CurrentIndex ) + int& /*CurrentIndex*/ ) { myDescr += "sk.addSegmentDirectionX("; myDescr += dx + ", " + dy + ", " + x + ")"; @@ -1510,7 +1512,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentDirectionX( const TCollection_Asci void Sketcher_Profile::DumpFunctor::addSegmentDirectionY( const TCollection_AsciiString& dx, const TCollection_AsciiString& dy, const TCollection_AsciiString& y, - int& CurrentIndex ) + int& /*CurrentIndex*/ ) { myDescr += "sk.addSegmentDirectionY("; myDescr += dx + ", " + dy + ", " + y + ")"; @@ -1642,7 +1644,7 @@ void Sketcher_Profile::DumpFunctor::addArcRadiusLength( const TCollection_AsciiS void Sketcher_Profile::DumpFunctor::addArcAngleRadiusLength( const TCollection_AsciiString& angle, const TCollection_AsciiString& radius, const TCollection_AsciiString& length , - int& CurrentIndex ) + int& /*CurrentIndex*/ ) { double aAngle = angle.RealValue(); if ( aAngle == 90 ) { @@ -1668,7 +1670,7 @@ void Sketcher_Profile::DumpFunctor::addArcDirectionRadiusLength( const TCollecti const TCollection_AsciiString& dy, const TCollection_AsciiString& radius, const TCollection_AsciiString& length , - int& CurrentIndex ) + int& /*CurrentIndex*/ ) { myDescr += "sk.addArcDirectionRadiusLength("; myDescr += dx + ", " + dy + ", " + radius + ", " + length + ")"; @@ -1800,7 +1802,7 @@ TCollection_AsciiString Sketcher_Profile::GetDump( bool* isDone ) \param cmd sketcher script to parse \internal */ -void Sketcher_Profile::parse( const TCollection_AsciiString& cmd, Functor* functor ) +void Sketcher_Profile::parse( const TCollection_AsciiString& /*cmd*/, Functor* functor ) { int CurrentIndex = 1; int NumberOfArg = 0; diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx index 5119a1e8c..cb307fcf5 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx @@ -58,7 +58,7 @@ STEPPlugin_ExportDriver::STEPPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const +Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -135,7 +135,7 @@ Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log if( status == IFSelect_RetDone ) return 1; } - catch (Standard_Failure) + catch (Standard_Failure&) { //THROW_SALOME_CORBA_EXCEPTION("Exception caught in STEPExport", SALOME::BAD_PARAM); } @@ -148,10 +148,10 @@ Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log */ //================================================================================ bool STEPPlugin_ExportDriver:: -GetCreationInformation( std::string& theOperationName, - std::vector& theParams ) +GetCreationInformation( std::string& /*theOperationName*/, + std::vector& /*theParams*/ ) { return false; } -IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver ) diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx index bf37006c4..87a14f4d3 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver ) class STEPPlugin_ExportDriver : public GEOM_BaseDriver { diff --git a/src/STEPPlugin/STEPPlugin_IECallBack.cxx b/src/STEPPlugin/STEPPlugin_IECallBack.cxx index 042acf68e..543b8f080 100644 --- a/src/STEPPlugin/STEPPlugin_IECallBack.cxx +++ b/src/STEPPlugin/STEPPlugin_IECallBack.cxx @@ -48,7 +48,7 @@ STEPPlugin_IECallBack::~STEPPlugin_IECallBack() bool STEPPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal, const TCollection_AsciiString& theFileName, - const TCollection_AsciiString& theFormatName ) + const TCollection_AsciiString& /*theFormatName*/ ) { STEPPlugin_IOperations* aPluginOperations = STEPPlugin_OperationsCreator::get( GetEngine() ); const STEPPlugin_IOperations::LengthUnit aUnit = STEPPlugin_IOperations::LengthUnit_Meter; @@ -78,7 +78,7 @@ STEPPlugin_IECallBack::Import( const TCollection_AsciiString& theFormatName, //============================================================================= TCollection_AsciiString STEPPlugin_IECallBack::ReadValue( const TCollection_AsciiString& theFileName, - const TCollection_AsciiString& theFormatName, + const TCollection_AsciiString& /*theFormatName*/, const TCollection_AsciiString& theParameterName ) { STEPPlugin_IOperations* aPluginOperations = STEPPlugin_OperationsCreator::get( GetEngine() ); diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.cxx b/src/STEPPlugin/STEPPlugin_ImportDriver.cxx index 98c92c07a..8a0662f5c 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.cxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.cxx @@ -877,4 +877,4 @@ STEPPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, return aValue; } -IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver ) diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx index 4831b7434..73aee0251 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver ) class STEPPlugin_ImportDriver : public GEOM_BaseDriver { diff --git a/src/STLPlugin/STLPlugin_ExportDriver.cxx b/src/STLPlugin/STLPlugin_ExportDriver.cxx index daf5debbf..3d875d79f 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.cxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.cxx @@ -110,7 +110,7 @@ Standard_Integer STLPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) log->SetTouched(Label()); return 1; } - catch( Standard_Failure ) + catch( Standard_Failure& ) { //THROW_SALOME_CORBA_EXCEPTION("Exception caught in ExportSTL", SALOME::BAD_PARAM); } @@ -123,10 +123,10 @@ Standard_Integer STLPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) */ //================================================================================ bool STLPlugin_ExportDriver:: -GetCreationInformation( std::string& theOperationName, - std::vector& theParams ) +GetCreationInformation( std::string& /*theOperationName*/, + std::vector& /*theParams*/ ) { return false; } -IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver ) diff --git a/src/STLPlugin/STLPlugin_ExportDriver.hxx b/src/STLPlugin/STLPlugin_ExportDriver.hxx index a9caa39b0..90257eb09 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver ) class STLPlugin_ExportDriver : public GEOM_BaseDriver { diff --git a/src/STLPlugin/STLPlugin_GUI.cxx b/src/STLPlugin/STLPlugin_GUI.cxx index 82c2015f5..030713a23 100644 --- a/src/STLPlugin/STLPlugin_GUI.cxx +++ b/src/STLPlugin/STLPlugin_GUI.cxx @@ -96,7 +96,7 @@ bool STLPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* paren getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) ); } - return true; // ????????? + return result; } //======================================================================= diff --git a/src/STLPlugin/STLPlugin_IECallBack.cxx b/src/STLPlugin/STLPlugin_IECallBack.cxx index 18008c358..fcfb7ae8d 100644 --- a/src/STLPlugin/STLPlugin_IECallBack.cxx +++ b/src/STLPlugin/STLPlugin_IECallBack.cxx @@ -64,7 +64,7 @@ STLPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal, */ //============================================================================= Handle(TColStd_HSequenceOfTransient) -STLPlugin_IECallBack::Import( const TCollection_AsciiString& theFormatName, +STLPlugin_IECallBack::Import( const TCollection_AsciiString& /*theFormatName*/, const TCollection_AsciiString& theFileName ) { STLPlugin_IOperations* aPluginOperations = STLPlugin_OperationsCreator::get( GetEngine() ); diff --git a/src/STLPlugin/STLPlugin_ImportDriver.cxx b/src/STLPlugin/STLPlugin_ImportDriver.cxx index c9bc92221..8295cd724 100644 --- a/src/STLPlugin/STLPlugin_ImportDriver.cxx +++ b/src/STLPlugin/STLPlugin_ImportDriver.cxx @@ -142,4 +142,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver ) diff --git a/src/STLPlugin/STLPlugin_ImportDriver.hxx b/src/STLPlugin/STLPlugin_ImportDriver.hxx index 2524db3a1..ddb3ca62d 100644 --- a/src/STLPlugin/STLPlugin_ImportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ImportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver ) class STLPlugin_ImportDriver : public GEOM_BaseDriver { diff --git a/src/ShHealOper/ShHealOper_FillHoles.cxx b/src/ShHealOper/ShHealOper_FillHoles.cxx index 6f026e850..dac0c895e 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.cxx +++ b/src/ShHealOper/ShHealOper_FillHoles.cxx @@ -230,7 +230,7 @@ Standard_Boolean ShHealOper_FillHoles::prepareWires(const TopTools_SequenceOfSha if (!BRep_Tool::Degenerated (TopoDS::Edge (aExp.Current()))) if(myEdgeFaces.Contains(aExp.Current()) && myEdgeFaces.FindFromKey(aExp.Current()).Extent() >1) continue; - aSeqEdges->Append(aExp.Current()); + aSeqEdges->Append(aExp.Current()); // to do: mustn't this clause be within if(!BRep_Tool::Degenerated...)? } } @@ -319,7 +319,7 @@ Handle(Geom_Surface) ShHealOper_FillHoles::buildSurface(const TopoDS_Wire& theWi theSenses = aBuilder.Sense(); } - catch (Standard_Failure) { + catch (Standard_Failure&) { aSurf.Nullify(); return aSurf; } diff --git a/src/ShHealOper/ShHealOper_RemoveFace.cxx b/src/ShHealOper/ShHealOper_RemoveFace.cxx index 85e6bd427..36a9e08cf 100644 --- a/src/ShHealOper/ShHealOper_RemoveFace.cxx +++ b/src/ShHealOper/ShHealOper_RemoveFace.cxx @@ -429,9 +429,9 @@ void ShHealOper_RemoveFace::removePCurve(const TopoDS_Face& theFace) for(; aIterOtherFace.More() && aIsDeleted ; aIterOtherFace.Next()) { if(aIterOtherFace.Value().IsSame(theFace)) continue; - TopoDS_Face aFaceOther = TopoDS::Face(aIterOtherFace.Value()); - Handle(Geom_Surface) aSurf = BRep_Tool::Surface( aFaceOther); - aIsDeleted = (aSurf != aSurfDel); + TopoDS_Face aFaceOther = TopoDS::Face(aIterOtherFace.Value()); + Handle(Geom_Surface) aSurf = BRep_Tool::Surface( aFaceOther); + aIsDeleted = (aSurf != aSurfDel); } TopoDS_Edge aEdge = TopoDS::Edge(myContext->Apply(aExpEdges.Current())); diff --git a/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx b/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx index 54b3ad692..f1276c8ea 100644 --- a/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx @@ -347,7 +347,7 @@ void TransformationGUI_ExtensionDlg::enterEvent(QEvent*) // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void TransformationGUI_ExtensionDlg::ValueChangedInSpinBox(double newValue) +void TransformationGUI_ExtensionDlg::ValueChangedInSpinBox(double /*newValue*/) { processPreview(); } diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx index 9e8e8a39d..05a101f5f 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx @@ -502,7 +502,7 @@ void TransformationGUI_MultiTranslationDlg::enterEvent (QEvent*) // function : TextValueChangedInSpinBox // purpose : //================================================================================= -void TransformationGUI_MultiTranslationDlg::TextValueChangedInSpinBox( const QString& s) +void TransformationGUI_MultiTranslationDlg::TextValueChangedInSpinBox( const QString& ) { QObject* send = (QObject*)sender(); bool isDigit = true; diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index 4d2dfa24c..06ef756ae 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -466,7 +466,7 @@ bool TransformationGUI_ScaleDlg::execute (ObjectList& objects) { anObj = anOper->ScaleShapeAlongAxesCopy(myObjects[i].get(), myPoint.get(), SpinBox_FX->value(), SpinBox_FY->value(), SpinBox_FZ->value()); - if (!anObj->_is_nil()) + if (!anObj->_is_nil()) { if(!IsPreview()) { QStringList aParameters; aParameters<text(); @@ -475,6 +475,7 @@ bool TransformationGUI_ScaleDlg::execute (ObjectList& objects) anObj->SetParameters(aParameters.join(":").toUtf8().constData()); } objects.push_back(anObj._retn()); + } } } else diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.cxx b/src/VTKPlugin/VTKPlugin_ExportDriver.cxx index cbe98f366..530e58faf 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.cxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.cxx @@ -69,7 +69,7 @@ VTKPlugin_ExportDriver::VTKPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const +Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -104,7 +104,7 @@ Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) return 1; } - catch( Standard_Failure ) + catch( Standard_Failure& ) { //THROW_SALOME_CORBA_EXCEPTION("Exception caught in ExportVTK", SALOME::BAD_PARAM); } @@ -117,10 +117,10 @@ Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) */ //================================================================================ bool VTKPlugin_ExportDriver:: -GetCreationInformation( std::string& theOperationName, - std::vector& theParams ) +GetCreationInformation( std::string& /*theOperationName*/, + std::vector& /*theParams*/ ) { return false; } -IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver ) diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx index 251bb0139..41e5e77e6 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx @@ -23,7 +23,7 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver ); +DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver ) class VTKPlugin_ExportDriver : public GEOM_BaseDriver { diff --git a/src/VTKPlugin/VTKPlugin_GUI.cxx b/src/VTKPlugin/VTKPlugin_GUI.cxx index 580bf1256..84cae2325 100644 --- a/src/VTKPlugin/VTKPlugin_GUI.cxx +++ b/src/VTKPlugin/VTKPlugin_GUI.cxx @@ -88,7 +88,7 @@ bool VTKPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* paren getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) ); } - return true; // ??????????? + return result; } //======================================================================= diff --git a/src/VTKPlugin/VTKPlugin_IECallBack.cxx b/src/VTKPlugin/VTKPlugin_IECallBack.cxx index 22bd538d7..218261e71 100644 --- a/src/VTKPlugin/VTKPlugin_IECallBack.cxx +++ b/src/VTKPlugin/VTKPlugin_IECallBack.cxx @@ -47,7 +47,7 @@ VTKPlugin_IECallBack::~VTKPlugin_IECallBack() //============================================================================= bool VTKPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal, const TCollection_AsciiString& theFileName, - const TCollection_AsciiString& theFormatName ) + const TCollection_AsciiString& /*theFormatName*/ ) { VTKPlugin_IOperations* aPluginOperations = VTKPlugin_OperationsCreator::get( GetEngine() ); const double aDeflection = 0.001; diff --git a/src/XAO/XAO_BooleanField.cxx b/src/XAO/XAO_BooleanField.cxx index 052d1b752..b978747d1 100644 --- a/src/XAO/XAO_BooleanField.cxx +++ b/src/XAO/XAO_BooleanField.cxx @@ -24,26 +24,23 @@ using namespace XAO; -BooleanField::BooleanField(const XAO::Dimension& dimension, - const int& nbElements, const int& nbComponents, const std::string& name) +BooleanField::BooleanField(XAO::Dimension dimension, + int nbElements, int nbComponents, const std::string& name) : Field(dimension, nbElements, nbComponents, name) { } -Step* BooleanField::addNewStep(const int& step) -throw (XAO_Exception) +Step* BooleanField::addNewStep(int step) { return addStep(step, 0); } -BooleanStep* BooleanField::addStep(const int& step) -throw (XAO_Exception) +BooleanStep* BooleanField::addStep(int step) { return addStep(step, 0); } -BooleanStep* BooleanField::addStep(const int& step, const int& stamp) -throw (XAO_Exception) +BooleanStep* BooleanField::addStep(int step, int stamp) { if (hasStep(step)) throw XAO_Exception(MsgBuilder() << "Step with number " << step << " already exists."); @@ -53,8 +50,7 @@ throw (XAO_Exception) return bstep; } -BooleanStep* BooleanField::getStep(const int& index) -throw (XAO_Exception) +BooleanStep* BooleanField::getStep(int index) { checkStepIndex(index); return (BooleanStep*)m_steps[index]; diff --git a/src/XAO/XAO_BooleanField.hxx b/src/XAO/XAO_BooleanField.hxx index fc49270c6..ecb747506 100644 --- a/src/XAO/XAO_BooleanField.hxx +++ b/src/XAO/XAO_BooleanField.hxx @@ -49,18 +49,18 @@ namespace XAO * @param nbComponents the number of components. * @param name the name of the field. */ - BooleanField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name); + BooleanField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name); - virtual const XAO::Type getType() { return XAO::BOOLEAN; } + virtual XAO::Type getType() { return XAO::BOOLEAN; } - virtual Step* addNewStep(const int& step) throw (XAO_Exception); + virtual Step* addNewStep(int step); /** * Adds a new step. * @param step the number of the step. * @return the newly created step. */ - BooleanStep* addStep(const int& step) throw (XAO_Exception); + BooleanStep* addStep(int step); /** * Adds a new step. @@ -68,15 +68,14 @@ namespace XAO * @param stamp the stamp of the step. * @return the newly created step. */ - BooleanStep* addStep(const int& step, const int& stamp) - throw (XAO_Exception); + BooleanStep* addStep(int step, int stamp); /** * Gets the step of given index. * @param index the index. * @return the step for the given index. */ - BooleanStep* getStep(const int& index) throw (XAO_Exception); + BooleanStep* getStep(int index); }; } diff --git a/src/XAO/XAO_BooleanStep.cxx b/src/XAO/XAO_BooleanStep.cxx index 15e875f5b..97cff697f 100644 --- a/src/XAO/XAO_BooleanStep.cxx +++ b/src/XAO/XAO_BooleanStep.cxx @@ -23,7 +23,7 @@ using namespace XAO; -BooleanStep::BooleanStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents) +BooleanStep::BooleanStep(int step, int stamp, int nbElements, int nbComponents) { m_nbElements = nbElements; m_nbComponents = nbComponents; @@ -56,8 +56,7 @@ std::vector BooleanStep::getValues() return result; } -std::vector BooleanStep::getElement(const int& element) -throw (XAO_Exception) +std::vector BooleanStep::getElement(int element) { checkElementIndex(element); @@ -65,8 +64,7 @@ throw (XAO_Exception) return result; } -std::vector BooleanStep::getComponent(const int& component) -throw (XAO_Exception) +std::vector BooleanStep::getComponent(int component) { checkComponentIndex(component); @@ -83,8 +81,7 @@ throw (XAO_Exception) return result; } -const bool BooleanStep::getValue(const int& element, const int& component) -throw (XAO_Exception) +bool BooleanStep::getValue(int element, int component) { checkElementIndex(element); checkComponentIndex(component); @@ -92,14 +89,12 @@ throw (XAO_Exception) return m_values[element][component]; } -const std::string BooleanStep::getStringValue(const int& element, const int& component) -throw (XAO_Exception) +const std::string BooleanStep::getStringValue(int element, int component) { return XaoUtils::booleanToString(getValue(element, component)); } void BooleanStep::setValues(const std::vector& values) -throw (XAO_Exception) { checkNbValues((int)values.size()); @@ -112,8 +107,7 @@ throw (XAO_Exception) } } -void BooleanStep::setElement(const int& element, const std::vector& elements) -throw (XAO_Exception) +void BooleanStep::setElement(int element, const std::vector& elements) { checkElementIndex(element); checkNbComponents(elements.size()); @@ -122,8 +116,7 @@ throw (XAO_Exception) m_values[element][i] = elements[i]; } -void BooleanStep::setComponent(const int& component, const std::vector& components) -throw (XAO_Exception) +void BooleanStep::setComponent(int component, const std::vector& components) { checkComponentIndex(component); checkNbElements(components.size()); @@ -132,8 +125,7 @@ throw (XAO_Exception) m_values[i][component] = components[i]; } -void BooleanStep::setValue(const int& element, const int& component, const bool& value) -throw (XAO_Exception) +void BooleanStep::setValue(int element, int component, bool value) { checkElementIndex(element); checkComponentIndex(component); @@ -141,8 +133,7 @@ throw (XAO_Exception) m_values[element][component] = value; } -void BooleanStep::setStringValue(const int& element, const int& component, const std::string& value) -throw (XAO_Exception) +void BooleanStep::setStringValue(int element, int component, const std::string& value) { setValue(element, component, XaoUtils::stringToBoolean(value)); } diff --git a/src/XAO/XAO_BooleanStep.hxx b/src/XAO/XAO_BooleanStep.hxx index 39eb8d8b1..aa9628aab 100644 --- a/src/XAO/XAO_BooleanStep.hxx +++ b/src/XAO/XAO_BooleanStep.hxx @@ -49,9 +49,9 @@ namespace XAO * @param nbElements the number elements of the geometry. * @param nbComponents the number of components of the field. */ - BooleanStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents); + BooleanStep(int step, int stamp, int nbElements, int nbComponents); - virtual const XAO::Type getType() { return XAO::BOOLEAN; } + virtual XAO::Type getType() { return XAO::BOOLEAN; } /** * Gets all the values in a vector by elements and by components. @@ -64,14 +64,14 @@ namespace XAO * @param element the index of the element to get. * @return a vector containing all the values for the given element. */ - std::vector getElement(const int& element) throw (XAO_Exception); + std::vector getElement(int element); /** * Gets all the values for a component. * @param component the index of the component to get. * @return a vector containing all the values for the given component. */ - std::vector getComponent(const int& component) throw (XAO_Exception); + std::vector getComponent(int component); /** * Gets a value for an element and a component. @@ -79,27 +79,27 @@ namespace XAO * @param component the index of the component. * @return the value. */ - const bool getValue(const int& element, const int& component) throw (XAO_Exception); + bool getValue(int element, int component); /** * Sets all the values from a list. * @param values the list of values to set. */ - void setValues(const std::vector& values) throw (XAO_Exception); + void setValues(const std::vector& values); /** * Sets the values for an element. * @param element the index of the element to set. * @param elements the values to set. */ - void setElement(const int& element, const std::vector& elements) throw (XAO_Exception); + void setElement(int element, const std::vector& elements); /** * Sets the values for a component. * @param component the index of the component to set. * @param components the values to set. */ - void setComponent(const int& component, const std::vector& components) throw (XAO_Exception); + void setComponent(int component, const std::vector& components); /** * Sets the value for an element and a component. @@ -107,10 +107,10 @@ namespace XAO * @param component the index of the component. * @param value the value. */ - void setValue(const int& element, const int& component, const bool& value) throw (XAO_Exception); + void setValue(int element, int component, bool value); - virtual const std::string getStringValue(const int& element, const int& component) throw (XAO_Exception); - virtual void setStringValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception); + virtual const std::string getStringValue(int element, int component); + virtual void setStringValue(int element, int component, const std::string& value); private: std::vector< std::vector > m_values; diff --git a/src/XAO/XAO_BrepGeometry.cxx b/src/XAO/XAO_BrepGeometry.cxx index 4751570a5..48174504d 100644 --- a/src/XAO/XAO_BrepGeometry.cxx +++ b/src/XAO/XAO_BrepGeometry.cxx @@ -66,7 +66,6 @@ void BrepGeometry::setShapeString(const std::string& shape) } void BrepGeometry::writeShapeFile(const std::string& fileName) -throw (XAO_Exception) { bool res = BRepTools::Write(m_shape, fileName.c_str()); if (!res) @@ -74,7 +73,6 @@ throw (XAO_Exception) } void BrepGeometry::readShapeFile(const std::string& fileName) -throw (XAO_Exception) { BRep_Builder builder; bool res = BRepTools::Read(m_shape, fileName.c_str(), builder); @@ -136,8 +134,7 @@ void BrepGeometry::initListIds(const TopAbs_ShapeEnum& shapeType, GeometricEleme } } -TopoDS_Shape BrepGeometry::getSubShape(const TopoDS_Shape& mainShape, const TopAbs_ShapeEnum& shapeType, const int& shapeIndex) -throw (XAO_Exception) +TopoDS_Shape BrepGeometry::getSubShape(const TopoDS_Shape& mainShape, const TopAbs_ShapeEnum& shapeType, int shapeIndex) { TopTools_MapOfShape mapShape; TopTools_ListOfShape listShape; @@ -166,7 +163,7 @@ throw (XAO_Exception) } // ----------------------------- -const int BrepGeometry::countGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType) +int BrepGeometry::countGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType) { int res = 0; TopExp_Explorer exp(shape, shapeType); @@ -176,7 +173,7 @@ const int BrepGeometry::countGeometricalElements(const TopoDS_Shape& shape, cons return res; } -std::vector BrepGeometry::getGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType, const XAO::Dimension& dim) +std::vector BrepGeometry::getGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType, XAO::Dimension dim) { std::vector indexList; @@ -208,7 +205,7 @@ std::vector BrepGeometry::getGeometricalElements(const TopoDS_Shape& shape, return indexList; } -void BrepGeometry::getEdgeVertices(const int& edgeIndex, int& vertexA, int& vertexB) +void BrepGeometry::getEdgeVertices(int edgeIndex, int& vertexA, int& vertexB) { TopoDS_Shape edge = getSubShape(m_shape, TopAbs_EDGE, edgeIndex); std::vector vertices = getGeometricalElements(edge, TopAbs_VERTEX, XAO::VERTEX); @@ -218,13 +215,13 @@ void BrepGeometry::getEdgeVertices(const int& edgeIndex, int& vertexA, int& vert vertexB = vertices[1]; } -const int BrepGeometry::countFaceWires(const int& faceIndex) +int BrepGeometry::countFaceWires(int faceIndex) { TopoDS_Shape face = getSubShape(m_shape, TopAbs_FACE, faceIndex); return countGeometricalElements(face, TopAbs_WIRE); } -std::vector BrepGeometry::getFaceEdges(const int& faceIndex, const int& wireIndex) +std::vector BrepGeometry::getFaceEdges(int faceIndex, int wireIndex) { // get the face TopoDS_Shape face = getSubShape(m_shape, TopAbs_FACE, faceIndex); @@ -233,21 +230,20 @@ std::vector BrepGeometry::getFaceEdges(const int& faceIndex, const int& wir return getGeometricalElements(wire, TopAbs_EDGE, XAO::EDGE); } -const int BrepGeometry::countSolidShells(const int& solidIndex) +int BrepGeometry::countSolidShells(int solidIndex) { TopoDS_Shape solid = getSubShape(m_shape, TopAbs_SOLID, solidIndex); return countGeometricalElements(solid, TopAbs_SHELL); } -std::vector BrepGeometry::getSolidFaces(const int& solidIndex, const int& shellIndex) +std::vector BrepGeometry::getSolidFaces(int solidIndex, int shellIndex) { TopoDS_Shape solid = getSubShape(m_shape, TopAbs_SOLID, solidIndex); TopoDS_Shape shell = getSubShape(solid, TopAbs_SHELL, shellIndex); return getGeometricalElements(shell, TopAbs_FACE, XAO::FACE); } -void BrepGeometry::getVertexXYZ(const int& vertexIndex, double& xCoord, double& yCoord, double& zCoord) -throw (XAO_Exception) +void BrepGeometry::getVertexXYZ(int vertexIndex, double& xCoord, double& yCoord, double& zCoord) { xCoord = 0.; yCoord = 0.; @@ -268,7 +264,7 @@ throw (XAO_Exception) } // ----------------------------- -const double BrepGeometry::getEdgeLength(const int& edgeIndex) +double BrepGeometry::getEdgeLength(int edgeIndex) { TopoDS_Shape edge = getSubShape(m_shape, TopAbs_EDGE, edgeIndex); GProp_GProps system; @@ -276,7 +272,7 @@ const double BrepGeometry::getEdgeLength(const int& edgeIndex) return system.Mass(); } -const double BrepGeometry::getFaceArea(const int& faceIndex) +double BrepGeometry::getFaceArea(int faceIndex) { TopoDS_Shape face = getSubShape(m_shape, TopAbs_FACE, faceIndex); GProp_GProps system; @@ -284,7 +280,7 @@ const double BrepGeometry::getFaceArea(const int& faceIndex) return system.Mass(); } -const double BrepGeometry::getSolidVolume(const int& solidIndex) +double BrepGeometry::getSolidVolume(int solidIndex) { TopoDS_Shape solid = getSubShape(m_shape, TopAbs_SOLID, solidIndex); GProp_GProps system; @@ -293,50 +289,49 @@ const double BrepGeometry::getSolidVolume(const int& solidIndex) } // ----------------------------- -const int BrepGeometry::getVertexID(const int& index) +int BrepGeometry::getVertexID(int index) { return XaoUtils::stringToInt(getVertexReference(index)); } -const int BrepGeometry::getEdgeID(const int& index) +int BrepGeometry::getEdgeID(int index) { return XaoUtils::stringToInt(getEdgeReference(index)); } -const int BrepGeometry::getFaceID(const int& index) +int BrepGeometry::getFaceID(int index) { return XaoUtils::stringToInt(getFaceReference(index)); } -const int BrepGeometry::getSolidID(const int& index) +int BrepGeometry::getSolidID(int index) { return XaoUtils::stringToInt(getSolidReference(index)); } // ----------------------------- -void BrepGeometry::setVertexID(const int& index, const int& id) +void BrepGeometry::setVertexID(int index, int id) { setVertexReference(index, XaoUtils::intToString(id)); } -void BrepGeometry::setEdgeID(const int& index, const int& id) +void BrepGeometry::setEdgeID(int index, int id) { setEdgeReference(index, XaoUtils::intToString(id)); } -void BrepGeometry::setFaceID(const int& index, const int& id) +void BrepGeometry::setFaceID(int index, int id) { setEdgeReference(index, XaoUtils::intToString(id)); } -void BrepGeometry::setSolidID(const int& index, const int& id) +void BrepGeometry::setSolidID(int index, int id) { setEdgeReference(index, XaoUtils::intToString(id)); } // ----------------------------- -const int BrepGeometry::findElement(const XAO::Dimension& dim, const int& id) -throw (XAO_Exception) +int BrepGeometry::findElement(XAO::Dimension dim, int id) { if (dim == XAO::VERTEX) return findVertex(id); @@ -350,68 +345,64 @@ throw (XAO_Exception) throw XAO_Exception(MsgBuilder() << "Unknown Dimension: " << dim); } -const int BrepGeometry::findVertex(const int& id) +int BrepGeometry::findVertex(int id) { return getVertexIndexByReference(XaoUtils::intToString(id)); } -const int BrepGeometry::findEdge(const int& id) +int BrepGeometry::findEdge(int id) { return getEdgeIndexByReference(XaoUtils::intToString(id)); } -const int BrepGeometry::findFace(const int& id) +int BrepGeometry::findFace(int id) { return getFaceIndexByReference(XaoUtils::intToString(id)); } -const int BrepGeometry::findSolid(const int& id) +int BrepGeometry::findSolid(int id) { return getSolidIndexByReference(XaoUtils::intToString(id)); } // ----------------------------- -const std::string BrepGeometry::findVertexName(const int& id) +const std::string BrepGeometry::findVertexName(int id) { return getVertexName(findVertex(id)); } -const std::string BrepGeometry::findEdgeName(const int& id) +const std::string BrepGeometry::findEdgeName(int id) { return getEdgeName(findEdge(id)); } -const std::string BrepGeometry::findFaceName(const int& id) +const std::string BrepGeometry::findFaceName(int id) { return getFaceName(findFace(id)); } -const std::string BrepGeometry::findSolidName(const int& id) +const std::string BrepGeometry::findSolidName(int id) { return getSolidName(findSolid(id)); } // ----------------------------- -void BrepGeometry::changeVertexName(const int& id, const std::string& name) -throw (XAO_Exception) +void BrepGeometry::changeVertexName(int id, const std::string& name) { setVertexName(findVertex(id), name); } -void BrepGeometry::changeEdgeName(const int& id, const std::string& name) -throw (XAO_Exception) +void BrepGeometry::changeEdgeName(int id, const std::string& name) { setEdgeName(findEdge(id), name); } -void BrepGeometry::changeFaceName(const int& id, const std::string& name) -throw (XAO_Exception) +void BrepGeometry::changeFaceName(int id, const std::string& name) { setFaceName(findFace(id), name); } -void BrepGeometry::changeSolidName(const int& id, const std::string& name) -throw (XAO_Exception) +void BrepGeometry::changeSolidName(int id, const std::string& name) { setSolidName(findSolid(id), name); } diff --git a/src/XAO/XAO_BrepGeometry.hxx b/src/XAO/XAO_BrepGeometry.hxx index e0cd8f9de..f34b17c44 100644 --- a/src/XAO/XAO_BrepGeometry.hxx +++ b/src/XAO/XAO_BrepGeometry.hxx @@ -61,7 +61,7 @@ namespace XAO * Gets the format of the geometry. * @return the format of the geometry. */ - virtual const XAO::Format getFormat() { return XAO::BREP; } + virtual XAO::Format getFormat() { return XAO::BREP; } /** * Gets the shape as a string. @@ -79,13 +79,13 @@ namespace XAO * Writes shape to a file * @param fileName the path to the file */ - virtual void writeShapeFile(const std::string& fileName) throw (XAO_Exception); + virtual void writeShapeFile(const std::string& fileName) ; /** * Reads shape from a file * @param fileName the path to the file */ - virtual void readShapeFile(const std::string& fileName) throw (XAO_Exception); + virtual void readShapeFile(const std::string& fileName) ; #ifdef SWIG %pythoncode %{ @@ -115,14 +115,14 @@ namespace XAO * @param vertexA * @param vertexB */ - void getEdgeVertices(const int& edgeIndex, int& vertexA, int& vertexB); + void getEdgeVertices(int edgeIndex, int& vertexA, int& vertexB); /** * Gets the number of wires of a face (including holes). * @param faceIndex the index of the face. * @return the number of wires. */ - const int countFaceWires(const int& faceIndex); + int countFaceWires(int faceIndex); /** * Gets the indices of the wires of the face. @@ -130,14 +130,14 @@ namespace XAO * @param wireIndex the index of the wire. * @return the list of wires for the given face. */ - std::vector getFaceEdges(const int& faceIndex, const int& wireIndex); + std::vector getFaceEdges(int faceIndex, int wireIndex); /** * Gets the number of shells of a solid (including cavities). * @param solidIndex the index of the solid. * @return the number of shells. */ - const int countSolidShells(const int& solidIndex); + int countSolidShells(int solidIndex); /** * Gets the indices of the shells of the solids. @@ -145,7 +145,7 @@ namespace XAO * @param shellIndex the index of the shell (for the given solid). * @return the list of shells for the given solid. */ - std::vector getSolidFaces(const int& solidIndex, const int& shellIndex); + std::vector getSolidFaces(int solidIndex, int shellIndex); /** * Gets the coordinates of a vertex. @@ -154,179 +154,179 @@ namespace XAO * @param yCoord the Y coordinate. * @param zCoord the Z coordinate. */ - void getVertexXYZ(const int& vertexIndex, double& xCoord, double& yCoord, double& zCoord) - throw (XAO_Exception); + void getVertexXYZ(int vertexIndex, double& xCoord, double& yCoord, double& zCoord) + ; /** * Gets the length of an edge. * @param index the index of the edge. * @return the length of the edge. */ - const double getEdgeLength(const int& index); + double getEdgeLength(int index); /** * Gets the are of a face. * @param index the index of a face. * @return the area of the face. */ - const double getFaceArea(const int& index); + double getFaceArea(int index); /** * Gets the volume of a solid. * @param index the index of the solid. * @return the volume of the solid. */ - const double getSolidVolume(const int& index); + double getSolidVolume(int index); /** * Gets the ID of a vertex. * @param index the index of the vertex. * @return the ID of the vertex. */ - const int getVertexID(const int& index); + int getVertexID(int index); /** * Gets the ID of an edge. * @param index the index of the edge. * @return the ID of the edge. */ - const int getEdgeID(const int& index); + int getEdgeID(int index); /** * Gets the ID of a face. * @param index the index of the face. * @return the ID of the face. */ - const int getFaceID(const int& index); + int getFaceID(int index); /** * Gets the ID of a solid. * @param index the index of the solid. * @return the ID of the solid. */ - const int getSolidID(const int& index); + int getSolidID(int index); /** * Sets the ID of a vertex. * @param index the index of the vertex to set. * @param id the id to set. */ - void setVertexID(const int& index, const int& id); + void setVertexID(int index, int id); /** * Sets the ID of an edge. * @param index the index of the edge to set. * @param id the id to set. */ - void setEdgeID(const int& index, const int& id); + void setEdgeID(int index, int id); /** * Sets the ID of a face. * @param index the index of the face to set. * @param id the id to set. */ - void setFaceID(const int& index, const int& id); + void setFaceID(int index, int id); /** * Sets the ID of a solid. * @param index the index of the solid to set. * @param id the id to set. */ - void setSolidID(const int& index, const int& id); + void setSolidID(int index, int id); /** * Finds a vertex with its ID. * @param id the ID of the vertex. * @return the index of the vertex. */ - const int findVertex(const int& id); + int findVertex(int id); /** * Finds an edge with its ID. * @param id the ID of the edge. * @return the index of the edge. */ - const int findEdge(const int& id); + int findEdge(int id); /** * Finds a face with its ID. * @param id the ID of the face. * @return the index of the face. */ - const int findFace(const int& id); + int findFace(int id); /** * Finds a solid with its ID. * @param id the ID of the solid. * @return th index of the solid. */ - const int findSolid(const int& id); + int findSolid(int id); /** * Finds the name of a vertex with its ID. * @param id the ID of the vertex. * @return the name of the vertex. */ - const std::string findVertexName(const int& id); + const std::string findVertexName(int id); /** * Finds the name of an edge with its ID. * @param id the ID of the edge. * @return the name of the edge. */ - const std::string findEdgeName(const int& id); + const std::string findEdgeName(int id); /** * Finds the name of a face with its ID. * @param id the ID of the face. * @return the name of the face. */ - const std::string findFaceName(const int& id); + const std::string findFaceName(int id); /** * Finds the name of a solid with its ID. * @param id the ID of the solid. * @return the name of the solid. */ - const std::string findSolidName(const int& id); + const std::string findSolidName(int id); /** * Changes the name of a vertex. * @param id the ID of the vertex. * @param name the name to set. */ - void changeVertexName(const int& id, const std::string& name) throw (XAO_Exception); + void changeVertexName(int id, const std::string& name) ; /** * Changes the name of an edge. * @param id the ID of the edge * @param name the name to set. */ - void changeEdgeName(const int& id, const std::string& name) throw (XAO_Exception); + void changeEdgeName(int id, const std::string& name) ; /** * Changes the name of a face. * @param id the ID of the face. * @param name the name to set. */ - void changeFaceName(const int& id, const std::string& name) throw (XAO_Exception); + void changeFaceName(int id, const std::string& name) ; /** * Changes the name of a solid. * @param id the ID of the solid. * @param name the name to set. */ - void changeSolidName(const int& id, const std::string& name) throw (XAO_Exception); + void changeSolidName(int id, const std::string& name) ; private: void initIds(); void initListIds(const TopAbs_ShapeEnum& shapeType, GeometricElementList& eltList); - TopoDS_Shape getSubShape(const TopoDS_Shape& mainShape, const TopAbs_ShapeEnum& shapeType, const int& shapeIndex) - throw (XAO_Exception); - const int countGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType); - std::vector getGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType, const XAO::Dimension& dim); - const int findElement(const XAO::Dimension& dim, const int& id) - throw (XAO_Exception); + TopoDS_Shape getSubShape(const TopoDS_Shape& mainShape, const TopAbs_ShapeEnum& shapeType, int shapeIndex) + ; + int countGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType); + std::vector getGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType, XAO::Dimension dim); + int findElement(XAO::Dimension dim, int id) + ; private: TopoDS_Shape m_shape; diff --git a/src/XAO/XAO_DoubleField.cxx b/src/XAO/XAO_DoubleField.cxx index fd93623f2..42449819e 100644 --- a/src/XAO/XAO_DoubleField.cxx +++ b/src/XAO/XAO_DoubleField.cxx @@ -24,25 +24,25 @@ using namespace XAO; -DoubleField::DoubleField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name) +DoubleField::DoubleField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name) : Field(dimension, nbElements, nbComponents, name) { } -Step* DoubleField::addNewStep(const int& step) -throw (XAO_Exception) +Step* DoubleField::addNewStep(int step) + { return addStep(step, 0); } -DoubleStep* DoubleField::addStep(const int& step) -throw (XAO_Exception) +DoubleStep* DoubleField::addStep(int step) + { return addStep(step, 0); } -DoubleStep* DoubleField::addStep(const int& step, const int& stamp) -throw (XAO_Exception) +DoubleStep* DoubleField::addStep(int step, int stamp) + { if (hasStep(step)) throw XAO_Exception(MsgBuilder() << "Step with number " << step << " already exists."); @@ -52,8 +52,8 @@ throw (XAO_Exception) return bstep; } -DoubleStep* DoubleField::getStep(const int& index) -throw (XAO_Exception) +DoubleStep* DoubleField::getStep(int index) + { checkStepIndex(index); return (DoubleStep*)m_steps[index]; diff --git a/src/XAO/XAO_DoubleField.hxx b/src/XAO/XAO_DoubleField.hxx index 55ba47a89..21d703045 100644 --- a/src/XAO/XAO_DoubleField.hxx +++ b/src/XAO/XAO_DoubleField.hxx @@ -49,18 +49,18 @@ namespace XAO * @param nbComponents the number of components. * @param name the name of the field. */ - DoubleField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name); + DoubleField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name); - virtual const XAO::Type getType() { return XAO::DOUBLE; } + virtual XAO::Type getType() { return XAO::DOUBLE; } - virtual Step* addNewStep(const int& step) throw (XAO_Exception); + virtual Step* addNewStep(int step) ; /** * Adds a new step. * @param step the number of the step. * @return the newly created step. */ - DoubleStep* addStep(const int& step) throw (XAO_Exception); + DoubleStep* addStep(int step) ; /** * Adds a new step. @@ -68,14 +68,14 @@ namespace XAO * @param stamp the stamp of the step. * @return the newly created step. */ - DoubleStep* addStep(const int& step, const int& stamp) throw (XAO_Exception); + DoubleStep* addStep(int step, int stamp) ; /** * Gets the step of given index. * @param index the index. * @return the step for the given index. */ - DoubleStep* getStep(const int& index) throw (XAO_Exception); + DoubleStep* getStep(int index) ; }; } diff --git a/src/XAO/XAO_DoubleStep.cxx b/src/XAO/XAO_DoubleStep.cxx index 34fa09695..991df7b36 100644 --- a/src/XAO/XAO_DoubleStep.cxx +++ b/src/XAO/XAO_DoubleStep.cxx @@ -23,7 +23,7 @@ using namespace XAO; -DoubleStep::DoubleStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents) +DoubleStep::DoubleStep(int step, int stamp, int nbElements, int nbComponents) { m_nbElements = nbElements; m_nbComponents = nbComponents; @@ -56,8 +56,8 @@ std::vector DoubleStep::getValues() return result; } -std::vector DoubleStep::getElement(const int& element) -throw (XAO_Exception) +std::vector DoubleStep::getElement(int element) + { checkElementIndex(element); @@ -65,8 +65,8 @@ throw (XAO_Exception) return result; } -std::vector DoubleStep::getComponent(const int& component) -throw (XAO_Exception) +std::vector DoubleStep::getComponent(int component) + { checkComponentIndex(component); @@ -83,8 +83,8 @@ throw (XAO_Exception) return result; } -const double DoubleStep::getValue(const int& element, const int& component) -throw (XAO_Exception) +double DoubleStep::getValue(int element, int component) + { checkElementIndex(element); checkComponentIndex(component); @@ -92,14 +92,14 @@ throw (XAO_Exception) return m_values[element][component]; } -const std::string DoubleStep::getStringValue(const int& element, const int& component) -throw (XAO_Exception) +const std::string DoubleStep::getStringValue(int element, int component) + { return XaoUtils::doubleToString(getValue(element, component)); } void DoubleStep::setValues(const std::vector& values) -throw (XAO_Exception) + { checkNbValues(values.size()); @@ -112,8 +112,8 @@ throw (XAO_Exception) } } -void DoubleStep::setElement(const int& element, const std::vector& elements) -throw (XAO_Exception) +void DoubleStep::setElement(int element, const std::vector& elements) + { checkElementIndex(element); checkNbComponents(elements.size()); @@ -122,8 +122,8 @@ throw (XAO_Exception) m_values[element][i] = elements[i]; } -void DoubleStep::setComponent(const int& component, const std::vector& components) -throw (XAO_Exception) +void DoubleStep::setComponent(int component, const std::vector& components) + { checkElementIndex(component); checkNbElements(components.size()); @@ -132,8 +132,8 @@ throw (XAO_Exception) m_values[i][component] = components[i]; } -void DoubleStep::setValue(const int& element, const int& component, const double& value) -throw (XAO_Exception) +void DoubleStep::setValue(int element, int component, double value) + { checkElementIndex(element); checkComponentIndex(component); @@ -141,8 +141,8 @@ throw (XAO_Exception) m_values[element][component] = value; } -void DoubleStep::setStringValue(const int& element, const int& component, const std::string& value) -throw (XAO_Exception) +void DoubleStep::setStringValue(int element, int component, const std::string& value) + { setValue(element, component, XaoUtils::stringToDouble(value)); } diff --git a/src/XAO/XAO_DoubleStep.hxx b/src/XAO/XAO_DoubleStep.hxx index ae8516ea5..bc67334ca 100644 --- a/src/XAO/XAO_DoubleStep.hxx +++ b/src/XAO/XAO_DoubleStep.hxx @@ -48,9 +48,9 @@ namespace XAO * @param nbElements the number elements of the geometry. * @param nbComponents the number of components of the field. */ - DoubleStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents); + DoubleStep(int step, int stamp, int nbElements, int nbComponents); - virtual const XAO::Type getType() { return XAO::DOUBLE; } + virtual XAO::Type getType() { return XAO::DOUBLE; } /** * Gets all the values of the step as a list. @@ -63,14 +63,14 @@ namespace XAO * @param element the index of the element. * @return a vector containing all the values for the given element. */ - std::vector getElement(const int& element) throw (XAO_Exception); + std::vector getElement(int element) ; /** * Gets all the values for a given component. * @param component the index of the component. * @return a vector containing all the values for the given component. */ - std::vector getComponent(const int& component) throw (XAO_Exception); + std::vector getComponent(int component) ; /** * Gets the value for an element and a component. @@ -78,27 +78,27 @@ namespace XAO * @param component the index of the component. * @return the value for the given element and component. */ - const double getValue(const int& element, const int& component) throw (XAO_Exception); + double getValue(int element, int component) ; /** * Sets all the values from a list. * @param values the list of values to set. */ - void setValues(const std::vector& values) throw (XAO_Exception); + void setValues(const std::vector& values) ; /** * Sets the values for an element. * @param element the index of the element to set. * @param elements the values to set. */ - void setElement(const int& element, const std::vector& elements) throw (XAO_Exception); + void setElement(int element, const std::vector& elements) ; /** * Sets the values for a component. * @param component the index of the component to set. * @param components the values to set. */ - void setComponent(const int& component, const std::vector& components) throw (XAO_Exception); + void setComponent(int component, const std::vector& components) ; /** * Sets the value for an element and a component. @@ -106,10 +106,10 @@ namespace XAO * @param component the index of the component. * @param value the value. */ - void setValue(const int& element, const int& component, const double& value) throw (XAO_Exception); + void setValue(int element, int component, double value) ; - virtual const std::string getStringValue(const int& element, const int& component) throw (XAO_Exception); - virtual void setStringValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception); + virtual const std::string getStringValue(int element, int component) ; + virtual void setStringValue(int element, int component, const std::string& value) ; private: std::vector< std::vector > m_values; diff --git a/src/XAO/XAO_Exception.hxx b/src/XAO/XAO_Exception.hxx index 3d76f9c0d..10da10787 100644 --- a/src/XAO/XAO_Exception.hxx +++ b/src/XAO/XAO_Exception.hxx @@ -41,13 +41,13 @@ namespace XAO { } - virtual ~XAO_Exception() throw() {}; + virtual ~XAO_Exception() noexcept {}; /** * Returns the error message. * @return the error message. */ - virtual const char* what() const throw () + virtual const char* what() const noexcept { return m_message; } diff --git a/src/XAO/XAO_Field.cxx b/src/XAO/XAO_Field.cxx index de7daac38..6c2eeb16f 100644 --- a/src/XAO/XAO_Field.cxx +++ b/src/XAO/XAO_Field.cxx @@ -33,8 +33,8 @@ using namespace XAO; // ------------------------------------------------------- -Field::Field(const XAO::Dimension& dimension, - const int& nbElements, const int& nbComponents, const std::string& name) +Field::Field(XAO::Dimension dimension, + int nbElements, int nbComponents, const std::string& name) : m_name(name), m_dimension(dimension), m_nbComponents(nbComponents), m_components(nbComponents, ""), m_nbElements(nbElements) @@ -47,9 +47,8 @@ Field::~Field() delete m_steps[i]; } -Field* Field::createField(const XAO::Type& type, const XAO::Dimension& dimension, - const int& nbElements, const int& nbComponents, const std::string& name) -throw (XAO_Exception) +Field* Field::createField(XAO::Type type, XAO::Dimension dimension, + int nbElements, int nbComponents, const std::string& name) { if (type == XAO::BOOLEAN) return new BooleanField(dimension, nbElements, nbComponents, name); @@ -63,22 +62,19 @@ throw (XAO_Exception) throw XAO_Exception(MsgBuilder() << "Bad Type: " << type); } -const std::string Field::getComponentName(const int& index) -throw (XAO_Exception) +const std::string Field::getComponentName(int index) { checkComponent(index); return m_components[index]; } -void Field::setComponentName(const int& index, const std::string& name) -throw (XAO_Exception) +void Field::setComponentName(int index, const std::string& name) { checkComponent(index); m_components[index] = name; } void Field::setComponentsNames(const std::vector& names) -throw (XAO_Exception) { for (unsigned int i = 0; i < names.size(); ++i) { @@ -103,7 +99,7 @@ bool Field::removeStep(Step* step) return false; } -bool Field::hasStep(const int& step) +bool Field::hasStep(int step) { std::vector::iterator it = m_steps.begin(); for (; it != m_steps.end(); ++it) @@ -116,8 +112,7 @@ bool Field::hasStep(const int& step) return false; } -void Field::checkComponent(const int& component) -throw (XAO_Exception) +void Field::checkComponent(int component) { if (component < m_nbComponents && component >= 0) return; @@ -126,8 +121,7 @@ throw (XAO_Exception) << m_nbComponents-1 << "]: " << component); } -void Field::checkStepIndex(const int& step) -throw (XAO_Exception) +void Field::checkStepIndex(int step) { if (step < (int)m_steps.size() && step >= 0) return; diff --git a/src/XAO/XAO_Field.hxx b/src/XAO/XAO_Field.hxx index 3f8296aed..1d0756994 100644 --- a/src/XAO/XAO_Field.hxx +++ b/src/XAO/XAO_Field.hxx @@ -52,8 +52,8 @@ namespace XAO * @param nbComponents the number of components. * @param name the name of the field. */ - Field(const XAO::Dimension& dimension, - const int& nbElements, const int& nbComponents, const std::string& name); + Field(XAO::Dimension dimension, + int nbElements, int nbComponents, const std::string& name); public: /** @@ -65,10 +65,9 @@ namespace XAO * @name the name of the field. * @return the created field. */ - static Field* createField(const XAO::Type& type, const XAO::Dimension& dimension, - const int& nbElements, const int& nbComponents, - const std::string& name = std::string("")) - throw (XAO_Exception); + static Field* createField(XAO::Type type, XAO::Dimension dimension, + int nbElements, int nbComponents, + const std::string& name = std::string("")); /** * Destructor. @@ -79,7 +78,7 @@ namespace XAO * Gets the Type of the field. * @return the Type of the field. */ - virtual const XAO::Type getType() = 0; + virtual XAO::Type getType() = 0; /** * Gets the name of the Field. @@ -103,7 +102,7 @@ namespace XAO * Gets the Dimension of the Field. * @return the Dimension of the Field. */ - const XAO::Dimension getDimension() const + XAO::Dimension getDimension() const { return m_dimension; } @@ -112,7 +111,7 @@ namespace XAO * Gets the number of elements of each step. * @return the number of elements of each step. */ - const int countElements() const + int countElements() const { return m_nbElements; } @@ -121,7 +120,7 @@ namespace XAO * Gets the number of components. * @return the number of components. */ - const int countComponents() const + int countComponents() const { return m_nbComponents; } @@ -130,7 +129,7 @@ namespace XAO * Gets the number of values for each step. * @return the number of values for each step. */ - const int countValues() const + int countValues() const { return m_nbElements * m_nbComponents; } @@ -139,34 +138,34 @@ namespace XAO * Gets the number of the steps. * @return the number of steps. */ - const int countSteps() const { return m_steps.size(); } + int countSteps() const { return m_steps.size(); } /** * Gets the name of a component. * @param index the index of the component to get. * @return the name of the component for the given index. */ - const std::string getComponentName(const int& index) throw (XAO_Exception); + const std::string getComponentName(int index); /** * Sets the name of a component. * @param componentIndex the index of the component to set. * @param name the name to set. */ - void setComponentName(const int& componentIndex, const std::string& name) throw (XAO_Exception); + void setComponentName(int componentIndex, const std::string& name); /** * Sets the name of the components. * @param names the names to set. */ - void setComponentsNames(const std::vector& names) throw (XAO_Exception); + void setComponentsNames(const std::vector& names); /** * Adds a new step of the same type than the field. * @param number the numer of the step. * @return the new create step. */ - virtual Step* addNewStep(const int& number) throw (XAO_Exception) = 0; + virtual Step* addNewStep(int number) = 0; /** * Remove a step. @@ -180,7 +179,7 @@ namespace XAO * @param step the step number. * @return true if the field has a step for the given number. */ - bool hasStep(const int& step); + bool hasStep(int step); /** * Returns the first step. @@ -195,8 +194,8 @@ namespace XAO stepIterator end() { return m_steps.end(); } protected: - void checkComponent(const int& component) throw (XAO_Exception); - void checkStepIndex(const int& step) throw (XAO_Exception); + void checkComponent(int component) ; + void checkStepIndex(int step) ; protected: /** The name of the Field. */ diff --git a/src/XAO/XAO_GeometricElement.cxx b/src/XAO/XAO_GeometricElement.cxx index cee2fc9ea..68d9bd2f4 100644 --- a/src/XAO/XAO_GeometricElement.cxx +++ b/src/XAO/XAO_GeometricElement.cxx @@ -40,7 +40,7 @@ GeometricElement::~GeometricElement() { } -const bool GeometricElement::hasName() +bool GeometricElement::hasName() { return !m_name.empty(); } @@ -50,12 +50,12 @@ GeometricElementList::GeometricElementList() setSize(0); } -GeometricElementList::GeometricElementList(const int& count) +GeometricElementList::GeometricElementList(int count) { setSize(count); } -void GeometricElementList::setSize(const int& nb) +void GeometricElementList::setSize(int nb) { m_count = nb; m_elements.clear(); @@ -65,8 +65,7 @@ void GeometricElementList::setSize(const int& nb) } } -void GeometricElementList::checkElementIndex(const int& index) const -throw (XAO_Exception) +void GeometricElementList::checkElementIndex(int index) const { if (m_count >= 0 && index < m_count) return; @@ -75,51 +74,44 @@ throw (XAO_Exception) << m_count-1 << "]: " << index); } -void GeometricElementList::setElement(const int& index, const std::string& name, const std::string& reference) -throw (XAO_Exception) +void GeometricElementList::setElement(int index, const std::string& name, const std::string& reference) { checkElementIndex(index); m_elements[index].setName(name); m_elements[index].setReference(reference); } -const std::string GeometricElementList::getName(const int& index) -throw (XAO_Exception) +const std::string GeometricElementList::getName(int index) { checkElementIndex(index); return m_elements[index].getName(); } -void GeometricElementList::setName(const int& index, const std::string& name) -throw (XAO_Exception) +void GeometricElementList::setName(int index, const std::string& name) { checkElementIndex(index); m_elements[index].setName(name); } -const bool GeometricElementList::hasName(const int& index) -throw (XAO_Exception) +bool GeometricElementList::hasName(int index) { checkElementIndex(index); return m_elements[index].hasName(); } -const std::string GeometricElementList::getReference(const int& index) -throw (XAO_Exception) +const std::string GeometricElementList::getReference(int index) { checkElementIndex(index); return m_elements[index].getReference(); } -void GeometricElementList::setReference(const int& index, const std::string& name) -throw (XAO_Exception) +void GeometricElementList::setReference(int index, const std::string& name) { checkElementIndex(index); m_elements[index].setReference(name); } -const int GeometricElementList::getIndexByReference(const std::string& ref) -throw (XAO_Exception) +int GeometricElementList::getIndexByReference(const std::string& ref) { for (int index = 0; index < m_count; ++index) { diff --git a/src/XAO/XAO_GeometricElement.hxx b/src/XAO/XAO_GeometricElement.hxx index 9dba418df..f57ebdfb3 100644 --- a/src/XAO/XAO_GeometricElement.hxx +++ b/src/XAO/XAO_GeometricElement.hxx @@ -78,7 +78,7 @@ namespace XAO * Checks if the element has a name. * @return true if the element has a name, false otherwise. */ - const bool hasName(); + bool hasName(); /** * Gets the reference of the element. @@ -120,7 +120,7 @@ namespace XAO * Constructor with size. * \param nb the size to set. */ - GeometricElementList(const int& nb); + GeometricElementList(int nb); /** * Destructor. @@ -131,14 +131,14 @@ namespace XAO * Gets the size of the list. * \return the size of the list. */ - const int getSize() const { return m_count; } + int getSize() const { return m_count; } /** * Sets the size of the list. * \param nb the size to set. * \warning the list will be cleared. */ - void setSize(const int& nb); + void setSize(int nb); /** * Sets the name and the reference of an element. @@ -147,28 +147,28 @@ namespace XAO * \param reference the reference to set. * \throw XAO_Exception if index is bigger than the size of the list. */ - void setElement(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception); + void setElement(int index, const std::string& name, const std::string& reference); /** * Gets the name of an element. * \param index the index of the element to set. * \return the name of the element with the given index. * \throw XAO_Exception if index is bigger than the size of the list. */ - const std::string getName(const int& index) throw (XAO_Exception); + const std::string getName(int index); /** * Sets the name of an element. * \param index the index of the element. * \param name the name to set. * \throw XAO_Exception if index is bigger than the size of the list. */ - void setName(const int& index, const std::string& name) throw (XAO_Exception); + void setName(int index, const std::string& name); /** * Checks if an element has a name. * @param index the index of the element. * @return true if the element has a name, false otherwise. */ - const bool hasName(const int& index) throw (XAO_Exception); + bool hasName(int index); /** * Gets the reference of an element. @@ -176,21 +176,21 @@ namespace XAO * \return the reference of the element. * \throw XAO_Exception if index is bigger than the size of the list. */ - const std::string getReference(const int& index) throw (XAO_Exception); + const std::string getReference(int index); /** * Sets the reference of an element. * \param index the index of the element to set. * \param reference the reference to set. * \throw XAO_Exception if index is bigger than the size of the list. */ - void setReference(const int& index, const std::string& reference) throw (XAO_Exception); + void setReference(int index, const std::string& reference); /** * Gets the index of an element using its reference. * \param reference the searched reference. * \return the index of the element or -1 if no element found. */ - const int getIndexByReference(const std::string& reference) throw (XAO_Exception); + int getIndexByReference(const std::string& reference); /** * Iterator on the element of the list. @@ -210,7 +210,7 @@ namespace XAO iterator end() { return m_elements.end(); } private: - void checkElementIndex(const int& index) const throw (XAO_Exception); + void checkElementIndex(int index) const; private: int m_count; diff --git a/src/XAO/XAO_Geometry.cxx b/src/XAO/XAO_Geometry.cxx index 25e1c98c6..bf8d52573 100644 --- a/src/XAO/XAO_Geometry.cxx +++ b/src/XAO/XAO_Geometry.cxx @@ -30,14 +30,12 @@ Geometry::Geometry(const std::string& name) m_readOnly = false; } -Geometry* Geometry::createGeometry(const XAO::Format& format) -throw (XAO_Exception) +Geometry* Geometry::createGeometry(XAO::Format format) { return createGeometry(format, ""); } -Geometry* Geometry::createGeometry(const XAO::Format& format, const std::string& name) -throw (XAO_Exception) +Geometry* Geometry::createGeometry(XAO::Format format, const std::string& name) { if (format == XAO::BREP) return new BrepGeometry(name); @@ -50,14 +48,12 @@ Geometry::~Geometry() } void Geometry::checkReadOnly() -throw (XAO_Exception) { if (m_readOnly) throw XAO_Exception("Geometry is read only."); } -const int Geometry::countElements(const XAO::Dimension& dim) const -throw (XAO_Exception) +int Geometry::countElements(XAO::Dimension dim) const { if (dim == XAO::VERTEX) return countVertices(); @@ -73,8 +69,7 @@ throw (XAO_Exception) throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim); } -const std::string Geometry::getElementReference(const XAO::Dimension& dim, const int& index) -throw (XAO_Exception) +const std::string Geometry::getElementReference(XAO::Dimension dim, int index) { if (dim == XAO::VERTEX) return getVertexReference(index); @@ -88,8 +83,7 @@ throw (XAO_Exception) throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim); } -const int Geometry::getElementIndexByReference(const XAO::Dimension& dim, const std::string& reference) -throw (XAO_Exception) +int Geometry::getElementIndexByReference(XAO::Dimension dim, const std::string& reference) { if (dim == XAO::VERTEX) return getVertexIndexByReference(reference); @@ -103,8 +97,7 @@ throw (XAO_Exception) throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim); } -GeometricElementList::iterator Geometry::begin(const XAO::Dimension& dim) -throw (XAO_Exception) +GeometricElementList::iterator Geometry::begin(XAO::Dimension dim) { if (dim == XAO::VERTEX) return m_vertices.begin(); @@ -118,8 +111,7 @@ throw (XAO_Exception) throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim); } -GeometricElementList::iterator Geometry::end(const XAO::Dimension& dim) -throw (XAO_Exception) +GeometricElementList::iterator Geometry::end(XAO::Dimension dim) { if (dim == XAO::VERTEX) return m_vertices.end(); @@ -133,64 +125,64 @@ throw (XAO_Exception) throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim); } -void Geometry::setCountVertices(const int& nb) throw (XAO_Exception) +void Geometry::setCountVertices(int nb) { checkReadOnly(); m_vertices.setSize(nb); } -void Geometry::setCountEdges(const int& nb) throw (XAO_Exception) +void Geometry::setCountEdges(int nb) { checkReadOnly(); m_edges.setSize(nb); } -void Geometry::setCountFaces(const int& nb) throw (XAO_Exception) +void Geometry::setCountFaces(int nb) { checkReadOnly(); m_faces.setSize(nb); } -void Geometry::setCountSolids(const int& nb) throw (XAO_Exception) +void Geometry::setCountSolids(int nb) { checkReadOnly(); m_solids.setSize(nb); } -void Geometry::setVertexReference(const int& index, const std::string& reference) throw (XAO_Exception) +void Geometry::setVertexReference(int index, const std::string& reference) { checkReadOnly(); m_vertices.setReference(index, reference); } -void Geometry::setEdgeReference(const int& index, const std::string& reference) throw (XAO_Exception) +void Geometry::setEdgeReference(int index, const std::string& reference) { checkReadOnly(); m_edges.setReference(index, reference); } -void Geometry::setFaceReference(const int& index, const std::string& reference) throw (XAO_Exception) +void Geometry::setFaceReference(int index, const std::string& reference) { checkReadOnly(); m_faces.setReference(index, reference); } -void Geometry::setSolidReference(const int& index, const std::string& reference) throw (XAO_Exception) +void Geometry::setSolidReference(int index, const std::string& reference) { checkReadOnly(); m_solids.setReference(index, reference); } -void Geometry::setVertex(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception) +void Geometry::setVertex(int index, const std::string& name, const std::string& reference) { checkReadOnly(); m_vertices.setElement(index, name, reference); } -void Geometry::setEdge(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception) +void Geometry::setEdge(int index, const std::string& name, const std::string& reference) { checkReadOnly(); m_edges.setElement(index, name, reference); } -void Geometry::setFace(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception) +void Geometry::setFace(int index, const std::string& name, const std::string& reference) { checkReadOnly(); m_faces.setElement(index, name, reference); } -void Geometry::setSolid(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception) +void Geometry::setSolid(int index, const std::string& name, const std::string& reference) { checkReadOnly(); m_solids.setElement(index, name, reference); diff --git a/src/XAO/XAO_Geometry.hxx b/src/XAO/XAO_Geometry.hxx index 2ac3d5588..210450cf9 100644 --- a/src/XAO/XAO_Geometry.hxx +++ b/src/XAO/XAO_Geometry.hxx @@ -55,7 +55,7 @@ namespace XAO * @param format the format of the geometry. * @return the created geometry. */ - static Geometry* createGeometry(const XAO::Format& format) throw (XAO_Exception); + static Geometry* createGeometry(XAO::Format format) ; /** * Constructor. @@ -63,8 +63,7 @@ namespace XAO * @name name the name of the geometry. * @return the created geometry. */ - static Geometry* createGeometry(const XAO::Format& format, const std::string& name) - throw (XAO_Exception); + static Geometry* createGeometry(XAO::Format format, const std::string& name); /** Destructor. */ virtual ~Geometry(); @@ -90,63 +89,63 @@ namespace XAO * Gets the format of the geometry. * @return the format of the geometry. */ - virtual const XAO::Format getFormat() = 0; + virtual XAO::Format getFormat() = 0; virtual const std::string getShapeString() = 0; virtual void setShapeString(const std::string& shape) = 0; virtual void writeShapeFile(const std::string& fileName) = 0; virtual void readShapeFile(const std::string& fileName) = 0; - const int countElements(const XAO::Dimension& dim) const throw (XAO_Exception); - const int countVertices() const { return m_vertices.getSize(); } - const int countEdges() const { return m_edges.getSize(); } - const int countFaces() const { return m_faces.getSize(); } - const int countSolids() const { return m_solids.getSize(); } - - void setCountVertices(const int& nb) throw (XAO_Exception); - void setCountEdges(const int& nb) throw (XAO_Exception); - void setCountFaces(const int& nb) throw (XAO_Exception); - void setCountSolids(const int& nb) throw (XAO_Exception); - - const std::string getVertexName(const int& index) throw (XAO_Exception) { return m_vertices.getName(index); } - const std::string getEdgeName(const int& index) throw (XAO_Exception) { return m_edges.getName(index); } - const std::string getFaceName(const int& index) throw (XAO_Exception) { return m_faces.getName(index); } - const std::string getSolidName(const int& index) throw (XAO_Exception) { return m_solids.getName(index); } - - void setVertexName(const int& index, const std::string& name) throw (XAO_Exception) { m_vertices.setName(index, name); } - void setEdgeName(const int& index, const std::string& name) throw (XAO_Exception) { m_edges.setName(index, name); } - void setFaceName(const int& index, const std::string& name) throw (XAO_Exception) { m_faces.setName(index, name); } - void setSolidName(const int& index, const std::string& name) throw (XAO_Exception) { m_solids.setName(index, name); } - - const bool hasVertexName(const int& index) throw (XAO_Exception) { return m_vertices.hasName(index); } - const bool hasEdgeName(const int& index) throw (XAO_Exception) { return m_edges.hasName(index); } - const bool hasFaceName(const int& index) throw (XAO_Exception) { return m_faces.hasName(index); } - const bool hasSolidName(const int& index) throw (XAO_Exception) { return m_solids.hasName(index); } - - const std::string getVertexReference(const int& index) throw (XAO_Exception) { return m_vertices.getReference(index); } - const std::string getEdgeReference(const int& index) throw (XAO_Exception) { return m_edges.getReference(index); } - const std::string getFaceReference(const int& index) throw (XAO_Exception) { return m_faces.getReference(index); } - const std::string getSolidReference(const int& index) throw (XAO_Exception) { return m_solids.getReference(index); } - const std::string getElementReference(const XAO::Dimension& dim, const int& index) throw (XAO_Exception); - - void setVertexReference(const int& index, const std::string& reference) throw (XAO_Exception); - void setEdgeReference(const int& index, const std::string& reference) throw (XAO_Exception); - void setFaceReference(const int& index, const std::string& reference) throw (XAO_Exception); - void setSolidReference(const int& index, const std::string& reference) throw (XAO_Exception); - - void setVertex(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception); - void setEdge(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception); - void setFace(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception); - void setSolid(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception); - - const int getVertexIndexByReference(const std::string& reference) { return m_vertices.getIndexByReference(reference); } - const int getEdgeIndexByReference(const std::string& reference) { return m_edges.getIndexByReference(reference); } - const int getFaceIndexByReference(const std::string& reference) { return m_faces.getIndexByReference(reference); } - const int getSolidIndexByReference(const std::string& reference) { return m_solids.getIndexByReference(reference); } - const int getElementIndexByReference(const XAO::Dimension& dim, const std::string& reference) throw (XAO_Exception); - - GeometricElementList::iterator begin(const XAO::Dimension& dim) throw (XAO_Exception); - GeometricElementList::iterator end(const XAO::Dimension& dim) throw (XAO_Exception); + int countElements(XAO::Dimension dim) const ; + int countVertices() const { return m_vertices.getSize(); } + int countEdges() const { return m_edges.getSize(); } + int countFaces() const { return m_faces.getSize(); } + int countSolids() const { return m_solids.getSize(); } + + void setCountVertices(int nb); + void setCountEdges(int nb); + void setCountFaces(int nb); + void setCountSolids(int nb); + + const std::string getVertexName(int index) { return m_vertices.getName(index); } + const std::string getEdgeName(int index) { return m_edges.getName(index); } + const std::string getFaceName(int index) { return m_faces.getName(index); } + const std::string getSolidName(int index) { return m_solids.getName(index); } + + void setVertexName(int index, const std::string& name) { m_vertices.setName(index, name); } + void setEdgeName(int index, const std::string& name) { m_edges.setName(index, name); } + void setFaceName(int index, const std::string& name) { m_faces.setName(index, name); } + void setSolidName(int index, const std::string& name) { m_solids.setName(index, name); } + + bool hasVertexName(int index) { return m_vertices.hasName(index); } + bool hasEdgeName(int index) { return m_edges.hasName(index); } + bool hasFaceName(int index) { return m_faces.hasName(index); } + bool hasSolidName(int index) { return m_solids.hasName(index); } + + const std::string getVertexReference(int index) { return m_vertices.getReference(index); } + const std::string getEdgeReference(int index) { return m_edges.getReference(index); } + const std::string getFaceReference(int index) { return m_faces.getReference(index); } + const std::string getSolidReference(int index) { return m_solids.getReference(index); } + const std::string getElementReference(XAO::Dimension dim, int index) ; + + void setVertexReference(int index, const std::string& reference) ; + void setEdgeReference(int index, const std::string& reference) ; + void setFaceReference(int index, const std::string& reference) ; + void setSolidReference(int index, const std::string& reference) ; + + void setVertex(int index, const std::string& name, const std::string& reference) ; + void setEdge(int index, const std::string& name, const std::string& reference) ; + void setFace(int index, const std::string& name, const std::string& reference) ; + void setSolid(int index, const std::string& name, const std::string& reference) ; + + int getVertexIndexByReference(const std::string& reference) { return m_vertices.getIndexByReference(reference); } + int getEdgeIndexByReference(const std::string& reference) { return m_edges.getIndexByReference(reference); } + int getFaceIndexByReference(const std::string& reference) { return m_faces.getIndexByReference(reference); } + int getSolidIndexByReference(const std::string& reference) { return m_solids.getIndexByReference(reference); } + int getElementIndexByReference(XAO::Dimension dim, const std::string& reference) ; + + GeometricElementList::iterator begin(XAO::Dimension dim) ; + GeometricElementList::iterator end(XAO::Dimension dim) ; /** * Verifies if the geometry is read only. @@ -160,7 +159,7 @@ namespace XAO void setReadOnly() { m_readOnly = true; } protected: - void checkReadOnly() throw (XAO_Exception); + void checkReadOnly() ; protected: std::string m_name; diff --git a/src/XAO/XAO_Group.cxx b/src/XAO/XAO_Group.cxx index 07e5485cd..00ea8ab67 100644 --- a/src/XAO/XAO_Group.cxx +++ b/src/XAO/XAO_Group.cxx @@ -24,8 +24,7 @@ using namespace XAO; -Group::Group(const XAO::Dimension& dim, const int& nbElements, const std::string& name) -throw (XAO_Exception) +Group::Group(XAO::Dimension dim, int nbElements, const std::string& name) { if (dim == XAO::WHOLE) throw XAO_Exception("Dimension WHOLE is not valid for group."); @@ -40,8 +39,7 @@ Group::~Group() { } -void Group::checkIndex(const int& element) -throw (XAO_Exception) +void Group::checkIndex(int element) { if (element < (int)m_elements.size() && element >= 0) return; @@ -50,12 +48,12 @@ throw (XAO_Exception) << m_elements.size()-1 << "]: " << element); } -void Group::add(const int& value) +void Group::add(int value) { m_elements.insert(value); } -void Group::remove(const int& value) +void Group::remove(int value) { m_elements.erase(value); } diff --git a/src/XAO/XAO_Group.hxx b/src/XAO/XAO_Group.hxx index 1a8a01cfd..2279df62d 100644 --- a/src/XAO/XAO_Group.hxx +++ b/src/XAO/XAO_Group.hxx @@ -44,8 +44,7 @@ namespace XAO * @param nbElements the number of geometrical elements for the dimension in the geometry. * @param name the name of the group. */ - Group(const XAO::Dimension& dim, const int& nbElements, const std::string& name = std::string("")) - throw (XAO_Exception); + Group(XAO::Dimension dim, int nbElements, const std::string& name = std::string("")); /** * Destructor. @@ -73,7 +72,7 @@ namespace XAO * Gets the dimension of the group. * \return the dimension of the group. */ - const XAO::Dimension getDimension() + XAO::Dimension getDimension() { return m_dimension; } @@ -82,7 +81,7 @@ namespace XAO * Gets the numbers of elements in the geometry of the same type than the group. * \return the number of elements in the associated geometry. */ - const int getNbElements() + int getNbElements() { return m_nbElements; } @@ -91,7 +90,7 @@ namespace XAO * Gets the number of elements in the group. * \return the number of elements. */ - const int count() const + int count() const { return m_elements.size(); } @@ -102,7 +101,7 @@ namespace XAO * \return the reference of the element. * \note use begin() and end() if you need to iterate. */ - const int get(const int& index) + int get(int index) { checkIndex(index); std::set::iterator it = m_elements.begin(); @@ -114,13 +113,13 @@ namespace XAO * Adds an element to the group. * \param value the index of the element to add. */ - void add(const int& value); + void add(int value); /** * Removes an element from the group. * \param value the index of the element to remove. */ - void remove(const int& value); + void remove(int value); /** * Gets an iterator on the first element in the group. @@ -140,8 +139,7 @@ namespace XAO * @param element * @throw XAO_Exception if element is bigger than the number of elements. */ - void checkIndex(const int& element) - throw (XAO_Exception); + void checkIndex(int element); private: /** The name of the group. */ diff --git a/src/XAO/XAO_IntegerField.cxx b/src/XAO/XAO_IntegerField.cxx index b7980a75e..05b9976b2 100644 --- a/src/XAO/XAO_IntegerField.cxx +++ b/src/XAO/XAO_IntegerField.cxx @@ -24,25 +24,25 @@ using namespace XAO; -IntegerField::IntegerField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name) +IntegerField::IntegerField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name) : Field(dimension, nbElements, nbComponents, name) { } -Step* IntegerField::addNewStep(const int& step) -throw (XAO_Exception) +Step* IntegerField::addNewStep(int step) + { return addStep(step, 0); } -IntegerStep* IntegerField::addStep(const int& step) -throw (XAO_Exception) +IntegerStep* IntegerField::addStep(int step) + { return addStep(step, 0); } -IntegerStep* IntegerField::addStep(const int& step, const int& stamp) -throw (XAO_Exception) +IntegerStep* IntegerField::addStep(int step, int stamp) + { if (hasStep(step)) throw XAO_Exception(MsgBuilder() << "Step with number " << step << " already exists."); @@ -52,8 +52,8 @@ throw (XAO_Exception) return bstep; } -IntegerStep* IntegerField::getStep(const int& index) -throw (XAO_Exception) +IntegerStep* IntegerField::getStep(int index) + { checkStepIndex(index); return (IntegerStep*)m_steps[index]; diff --git a/src/XAO/XAO_IntegerField.hxx b/src/XAO/XAO_IntegerField.hxx index 38fd961ac..fcf6f8630 100644 --- a/src/XAO/XAO_IntegerField.hxx +++ b/src/XAO/XAO_IntegerField.hxx @@ -49,18 +49,18 @@ namespace XAO * @param nbComponents the number of components. * @param name the name of the field. */ - IntegerField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name); + IntegerField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name); - virtual const XAO::Type getType() { return XAO::INTEGER; } + virtual XAO::Type getType() { return XAO::INTEGER; } - virtual Step* addNewStep(const int& step) throw (XAO_Exception); + virtual Step* addNewStep(int step) ; /** * Adds a new step. * @param step the number of the step. * @return the newly created step. */ - IntegerStep* addStep(const int& step) throw (XAO_Exception); + IntegerStep* addStep(int step) ; /** * Adds a new step. @@ -68,14 +68,14 @@ namespace XAO * @param stamp the stamp of the step. * @return the newly created step. */ - IntegerStep* addStep(const int& step, const int& stamp) throw (XAO_Exception); + IntegerStep* addStep(int step, int stamp) ; /** * Gets the step of given index. * @param index the index of the step. * @return the step for the given index. */ - IntegerStep* getStep(const int& index) throw (XAO_Exception); + IntegerStep* getStep(int index) ; }; } diff --git a/src/XAO/XAO_IntegerStep.cxx b/src/XAO/XAO_IntegerStep.cxx index dbd2f5ef0..0159c0f87 100644 --- a/src/XAO/XAO_IntegerStep.cxx +++ b/src/XAO/XAO_IntegerStep.cxx @@ -23,7 +23,7 @@ using namespace XAO; -IntegerStep::IntegerStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents) +IntegerStep::IntegerStep(int step, int stamp, int nbElements, int nbComponents) { m_nbElements = nbElements; m_nbComponents = nbComponents; @@ -56,8 +56,8 @@ std::vector IntegerStep::getValues() return result; } -std::vector IntegerStep::getElement(const int& element) -throw (XAO_Exception) +std::vector IntegerStep::getElement(int element) + { checkElementIndex(element); @@ -65,8 +65,8 @@ throw (XAO_Exception) return result; } -std::vector IntegerStep::getComponent(const int& component) -throw (XAO_Exception) +std::vector IntegerStep::getComponent(int component) + { checkComponentIndex(component); @@ -83,8 +83,8 @@ throw (XAO_Exception) return result; } -const int IntegerStep::getValue(const int& element, const int& component) -throw (XAO_Exception) +int IntegerStep::getValue(int element, int component) + { checkElementIndex(element); checkComponentIndex(component); @@ -92,14 +92,14 @@ throw (XAO_Exception) return m_values[element][component]; } -const std::string IntegerStep::getStringValue(const int& element, const int& component) -throw (XAO_Exception) +const std::string IntegerStep::getStringValue(int element, int component) + { return XaoUtils::intToString(getValue(element, component)); } void IntegerStep::setValues(const std::vector& values) -throw (XAO_Exception) + { checkNbValues(values.size()); @@ -112,8 +112,8 @@ throw (XAO_Exception) } } -void IntegerStep::setElement(const int& element, const std::vector& elements) -throw (XAO_Exception) +void IntegerStep::setElement(int element, const std::vector& elements) + { checkElementIndex(element); checkNbComponents(elements.size()); @@ -122,8 +122,8 @@ throw (XAO_Exception) m_values[element][i] = elements[i]; } -void IntegerStep::setComponent(const int& component, const std::vector& components) -throw (XAO_Exception) +void IntegerStep::setComponent(int component, const std::vector& components) + { checkElementIndex(component); checkNbElements(components.size()); @@ -132,8 +132,8 @@ throw (XAO_Exception) m_values[i][component] = components[i]; } -void IntegerStep::setValue(const int& element, const int& component, const int& value) -throw (XAO_Exception) +void IntegerStep::setValue(int element, int component, int value) + { checkElementIndex(element); checkComponentIndex(component); @@ -141,8 +141,8 @@ throw (XAO_Exception) m_values[element][component] = value; } -void IntegerStep::setStringValue(const int& element, const int& component, const std::string& value) -throw (XAO_Exception) +void IntegerStep::setStringValue(int element, int component, const std::string& value) + { setValue(element, component, XaoUtils::stringToInt(value)); } diff --git a/src/XAO/XAO_IntegerStep.hxx b/src/XAO/XAO_IntegerStep.hxx index 7b4ca7da7..a3df1ca19 100644 --- a/src/XAO/XAO_IntegerStep.hxx +++ b/src/XAO/XAO_IntegerStep.hxx @@ -49,9 +49,9 @@ namespace XAO * @param nbElements the number elements of the geometry. * @param nbComponents the number of components of the field. */ - IntegerStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents); + IntegerStep(int step, int stamp, int nbElements, int nbComponents); - virtual const XAO::Type getType() { return XAO::INTEGER; } + virtual XAO::Type getType() { return XAO::INTEGER; } /** * Gets all the values of the step as a list. @@ -64,14 +64,14 @@ namespace XAO * @param element the index of the element. * @return a vector containing all the values for the given element. */ - std::vector getElement(const int& element) throw (XAO_Exception); + std::vector getElement(int element) ; /** * Gets all the values for a given component. * @param component the index of the component. * @return a vector containing all the values for the given component. */ - std::vector getComponent(const int& component) throw (XAO_Exception); + std::vector getComponent(int component) ; /** * Gets the value for an element and a component. @@ -79,27 +79,27 @@ namespace XAO * @param component the index of the component. * @return the value for the given element and component. */ - const int getValue(const int& element, const int& component) throw (XAO_Exception); + int getValue(int element, int component) ; /** * Sets all the values from a list. * @param values the list of values to set. */ - void setValues(const std::vector& values) throw (XAO_Exception); + void setValues(const std::vector& values) ; /** * Sets the values for an element. * @param element the index of the element to set. * @param elements the values to set. */ - void setElement(const int& element, const std::vector& elements) throw (XAO_Exception); + void setElement(int element, const std::vector& elements) ; /** * Sets the values for a component. * @param component the index of the component to set. * @param components the values to set. */ - void setComponent(const int& component, const std::vector& components) throw (XAO_Exception); + void setComponent(int component, const std::vector& components) ; /** * Sets the value for an element and a component. @@ -107,10 +107,10 @@ namespace XAO * @param component the index of the component. * @param value the value. */ - void setValue(const int& element, const int& component, const int& value) throw (XAO_Exception); + void setValue(int element, int component, int value) ; - virtual const std::string getStringValue(const int& element, const int& component) throw (XAO_Exception); - virtual void setStringValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception); + virtual const std::string getStringValue(int element, int component) ; + virtual void setStringValue(int element, int component, const std::string& value) ; private: std::vector< std::vector > m_values; diff --git a/src/XAO/XAO_Step.cxx b/src/XAO/XAO_Step.cxx index fb29f9ab9..4214a9d78 100644 --- a/src/XAO/XAO_Step.cxx +++ b/src/XAO/XAO_Step.cxx @@ -28,8 +28,7 @@ using namespace XAO; -void Step::checkElementIndex(const int& element) -throw (XAO_Exception) +void Step::checkElementIndex(int element) { if (element < m_nbElements && element >= 0) return; @@ -38,8 +37,7 @@ throw (XAO_Exception) << m_nbElements-1 << "]: " << element); } -void Step::checkComponentIndex(const int& component) -throw (XAO_Exception) +void Step::checkComponentIndex(int component) { if (component < m_nbComponents && component >= 0) return; @@ -48,8 +46,7 @@ throw (XAO_Exception) << m_nbComponents-1 << "]: " << component); } -void Step::checkNbElements(const int& nbElements) -throw (XAO_Exception) +void Step::checkNbElements(int nbElements) { if (nbElements == m_nbElements) return; @@ -58,8 +55,7 @@ throw (XAO_Exception) << ", expected " << m_nbElements); } -void Step::checkNbComponents(const int& nbComponents) -throw (XAO_Exception) +void Step::checkNbComponents(int nbComponents) { if (nbComponents == m_nbComponents) return; @@ -68,8 +64,7 @@ throw (XAO_Exception) << ", expected " << m_nbComponents); } -void Step::checkNbValues(const int& nbValues) -throw (XAO_Exception) +void Step::checkNbValues(int nbValues) { if (nbValues == m_nbElements * m_nbComponents) return; diff --git a/src/XAO/XAO_Step.hxx b/src/XAO/XAO_Step.hxx index 66bdf0297..ef7aa3ae2 100644 --- a/src/XAO/XAO_Step.hxx +++ b/src/XAO/XAO_Step.hxx @@ -51,49 +51,49 @@ namespace XAO * Gets the type of the step. * @return */ - virtual const XAO::Type getType() = 0; + virtual XAO::Type getType() = 0; /** * Gets the step index. * @return the index of the step. */ - const int getStep() { return m_step; } + int getStep() { return m_step; } /** * Sets the number of the step. * @param step the index to set. */ - void setStep(const int& step) { m_step = step; } + void setStep(int step) { m_step = step; } /** * Gets the stamp of the index. * @return the stamp of the index. */ - const int getStamp() { return m_stamp; } + int getStamp() { return m_stamp; } /** * Sets the stamp of the index. * @param stamp the stamp to set. */ - void setStamp(const int& stamp) { m_stamp = stamp; } + void setStamp(int stamp) { m_stamp = stamp; } /** * Gets the number of components of the step. * @return the number of components. */ - const int countComponents() { return m_nbComponents; } + int countComponents() { return m_nbComponents; } /** * Gets the number of elements for the step. * @return the number of elements. */ - const int countElements() { return m_nbElements; } + int countElements() { return m_nbElements; } /** * Gets the number of values for the step. * @return the number of values. */ - const int countValues() { return m_nbElements * m_nbComponents; } + int countValues() { return m_nbElements * m_nbComponents; } /** * Gets a value as a string. @@ -101,7 +101,7 @@ namespace XAO * @param component the index of the component. * @return the value as a string. */ - virtual const std::string getStringValue(const int& element, const int& component) = 0; + virtual const std::string getStringValue(int element, int component) = 0; /** * Sets a value as a string @@ -110,37 +110,37 @@ namespace XAO * @param value the string value. * @throw XAO_Exception if the value is not valid. */ - virtual void setStringValue(const int& element, const int& component, const std::string& value) = 0; + virtual void setStringValue(int element, int component, const std::string& value) = 0; protected: /** * Checks that given element index is in the range of element indexes. * @param element the index to check. */ - void checkElementIndex(const int& element) throw (XAO_Exception); + void checkElementIndex(int element); /** * Checks that given component index is in the range of component indexes. * @param component the index to check. */ - void checkComponentIndex(const int& component)throw (XAO_Exception); + void checkComponentIndex(int component); /** * Checks that the given number of elements is correct. * @param nbElements the number of elements to check. */ - void checkNbElements(const int& nbElements)throw (XAO_Exception); + void checkNbElements(int nbElements); /** * Checks that the given number of components is correct. * @param nbComponents the number of components to check. */ - void checkNbComponents(const int& nbComponents)throw (XAO_Exception); + void checkNbComponents(int nbComponents); /** * checks that the given number of values is correct. * @param nbValues the number of values to check. */ - void checkNbValues(const int& nbValues)throw (XAO_Exception); + void checkNbValues(int nbValues); protected: /** the index of the step. */ diff --git a/src/XAO/XAO_StringField.cxx b/src/XAO/XAO_StringField.cxx index 63bd027da..33eb6da7a 100644 --- a/src/XAO/XAO_StringField.cxx +++ b/src/XAO/XAO_StringField.cxx @@ -24,25 +24,25 @@ using namespace XAO; -StringField::StringField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name) +StringField::StringField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name) : Field(dimension, nbElements, nbComponents, name) { } -Step* StringField::addNewStep(const int& step) -throw (XAO_Exception) +Step* StringField::addNewStep(int step) + { return addStep(step, 0); } -StringStep* StringField::addStep(const int& step) -throw (XAO_Exception) +StringStep* StringField::addStep(int step) + { return addStep(step, 0); } -StringStep* StringField::addStep(const int& step, const int& stamp) -throw (XAO_Exception) +StringStep* StringField::addStep(int step, int stamp) + { if (hasStep(step)) throw XAO_Exception(MsgBuilder() << "Step with number " << step << " already exists."); @@ -52,8 +52,8 @@ throw (XAO_Exception) return bstep; } -StringStep* StringField::getStep(const int& index) -throw (XAO_Exception) +StringStep* StringField::getStep(int index) + { checkStepIndex(index); return (StringStep*)m_steps[index]; diff --git a/src/XAO/XAO_StringField.hxx b/src/XAO/XAO_StringField.hxx index 8788a1274..b64baf57c 100644 --- a/src/XAO/XAO_StringField.hxx +++ b/src/XAO/XAO_StringField.hxx @@ -48,18 +48,18 @@ namespace XAO * @param nbComponents the number of components. * @param name the name of the field. */ - StringField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name); + StringField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name); - virtual const XAO::Type getType() { return XAO::STRING; } + virtual XAO::Type getType() { return XAO::STRING; } - virtual Step* addNewStep(const int& step) throw (XAO_Exception); + virtual Step* addNewStep(int step) ; /** * Adds a new step. * @param step the number of the step. * @return the newly created step. */ - StringStep* addStep(const int& step) throw (XAO_Exception); + StringStep* addStep(int step) ; /** * Adds a new step. @@ -67,14 +67,14 @@ namespace XAO * @param stamp the stamp of the step. * @return the newly created step. */ - StringStep* addStep(const int& step, const int& stamp) throw (XAO_Exception); + StringStep* addStep(int step, int stamp) ; /** * Gets the step of given index. * @param index the index of the step. * @return the step for the given index. */ - StringStep* getStep(const int& index) throw (XAO_Exception); + StringStep* getStep(int index) ; }; } diff --git a/src/XAO/XAO_StringStep.cxx b/src/XAO/XAO_StringStep.cxx index 7c1d40e98..18e28e79b 100644 --- a/src/XAO/XAO_StringStep.cxx +++ b/src/XAO/XAO_StringStep.cxx @@ -22,7 +22,7 @@ using namespace XAO; -StringStep::StringStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents) +StringStep::StringStep(int step, int stamp, int nbElements, int nbComponents) { m_nbElements = nbElements; m_nbComponents = nbComponents; @@ -55,8 +55,8 @@ std::vector StringStep::getValues() return result; } -std::vector StringStep::getElement(const int& element) -throw (XAO_Exception) +std::vector StringStep::getElement(int element) + { checkElementIndex(element); @@ -64,8 +64,8 @@ throw (XAO_Exception) return result; } -std::vector StringStep::getComponent(const int& component) -throw (XAO_Exception) +std::vector StringStep::getComponent(int component) + { checkComponentIndex(component); @@ -82,8 +82,8 @@ throw (XAO_Exception) return result; } -const std::string StringStep::getValue(const int& element, const int& component) -throw (XAO_Exception) +const std::string StringStep::getValue(int element, int component) + { checkElementIndex(element); checkComponentIndex(component); @@ -91,14 +91,14 @@ throw (XAO_Exception) return m_values[element][component]; } -const std::string StringStep::getStringValue(const int& element, const int& component) -throw (XAO_Exception) +const std::string StringStep::getStringValue(int element, int component) + { return getValue(element, component); } void StringStep::setValues(const std::vector& values) -throw (XAO_Exception) + { checkNbValues(values.size()); @@ -111,8 +111,8 @@ throw (XAO_Exception) } } -void StringStep::setElement(const int& element, const std::vector& elements) -throw (XAO_Exception) +void StringStep::setElement(int element, const std::vector& elements) + { checkElementIndex(element); checkNbComponents(elements.size()); @@ -121,8 +121,8 @@ throw (XAO_Exception) m_values[element][i] = elements[i]; } -void StringStep::setComponent(const int& component, const std::vector& components) -throw (XAO_Exception) +void StringStep::setComponent(int component, const std::vector& components) + { checkElementIndex(component); checkNbElements(components.size()); @@ -131,8 +131,8 @@ throw (XAO_Exception) m_values[i][component] = components[i]; } -void StringStep::setValue(const int& element, const int& component, const std::string& value) -throw (XAO_Exception) +void StringStep::setValue(int element, int component, const std::string& value) + { checkElementIndex(element); checkComponentIndex(component); @@ -140,8 +140,8 @@ throw (XAO_Exception) m_values[element][component] = value; } -void StringStep::setStringValue(const int& element, const int& component, const std::string& value) -throw (XAO_Exception) +void StringStep::setStringValue(int element, int component, const std::string& value) + { setValue(element, component, value); } diff --git a/src/XAO/XAO_StringStep.hxx b/src/XAO/XAO_StringStep.hxx index c26fd942d..c03775cf8 100644 --- a/src/XAO/XAO_StringStep.hxx +++ b/src/XAO/XAO_StringStep.hxx @@ -49,9 +49,9 @@ namespace XAO * @param nbElements the number elements of the geometry. * @param nbComponents the number of components of the field. */ - StringStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents); + StringStep(int step, int stamp, int nbElements, int nbComponents); - virtual const XAO::Type getType() { return XAO::STRING; } + virtual XAO::Type getType() { return XAO::STRING; } /** * Gets all the values of the step as a list. @@ -64,14 +64,14 @@ namespace XAO * @param element the index of the element. * @return a vector containing all the values for the given element. */ - std::vector getElement(const int& element) throw (XAO_Exception); + std::vector getElement(int element) ; /** * Gets all the values for a given component. * @param component the index of the component. * @return a vector containing all the values for the given component. */ - std::vector getComponent(const int& component) throw (XAO_Exception); + std::vector getComponent(int component) ; /** * Gets the value for an element and a component. @@ -79,27 +79,27 @@ namespace XAO * @param component the index of the component. * @return the value for the given element and component. */ - const std::string getValue(const int& element, const int& component) throw (XAO_Exception); + const std::string getValue(int element, int component) ; /** * Sets all the values from a list. * @param values the list of values to set. */ - void setValues(const std::vector& values) throw (XAO_Exception); + void setValues(const std::vector& values) ; /** * Sets the values for an element. * @param element the index of the element to set. * @param elements the values to set. */ - void setElement(const int& element, const std::vector& elements) throw (XAO_Exception); + void setElement(int element, const std::vector& elements) ; /** * Sets the values for a component. * @param component the index of the component to set. * @param components the values to set. */ - void setComponent(const int& component, const std::vector& components) throw (XAO_Exception); + void setComponent(int component, const std::vector& components) ; /** * Sets the value for an element and a component. @@ -107,10 +107,10 @@ namespace XAO * @param component the index of the component. * @param value the value. */ - void setValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception); + void setValue(int element, int component, const std::string& value) ; - virtual const std::string getStringValue(const int& element, const int& component) throw (XAO_Exception); - virtual void setStringValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception); + virtual const std::string getStringValue(int element, int component) ; + virtual void setStringValue(int element, int component, const std::string& value) ; private: std::vector< std::vector > m_values; diff --git a/src/XAO/XAO_Xao.cxx b/src/XAO/XAO_Xao.cxx index c9bdf0e6a..c5e2645e4 100644 --- a/src/XAO/XAO_Xao.cxx +++ b/src/XAO/XAO_Xao.cxx @@ -69,13 +69,13 @@ Xao::~Xao() } } -const int Xao::countGroups() const +int Xao::countGroups() const { return m_groups.size(); } -Group* Xao::getGroup(const int& index) -throw (XAO_Exception) +Group* Xao::getGroup(int index) + { checkGroupIndex(index); @@ -89,8 +89,8 @@ throw (XAO_Exception) return NULL; } -Group* Xao::addGroup(const XAO::Dimension& dim, const std::string& name) -throw (XAO_Exception) +Group* Xao::addGroup(XAO::Dimension dim, const std::string& name) + { checkGeometry(); checkGroupDimension(dim); @@ -115,19 +115,19 @@ bool Xao::removeGroup(Group* group) return res; } -const int Xao::countFields() const +int Xao::countFields() const { return m_fields.size(); } -const XAO::Type Xao::getFieldType(const int& index) -throw (XAO_Exception) +XAO::Type Xao::getFieldType(int index) + { return getField(index)->getType(); } -Field* Xao::getField(const int& index) -throw (XAO_Exception) +Field* Xao::getField(int index) + { checkFieldIndex(index); @@ -141,8 +141,8 @@ throw (XAO_Exception) throw XAO_Exception("Field not found."); } -BooleanField* Xao::getBooleanField(const int& index) -throw (XAO_Exception) +BooleanField* Xao::getBooleanField(int index) + { Field* field = getField(index); if (field->getType() != XAO::BOOLEAN) @@ -150,8 +150,8 @@ throw (XAO_Exception) return (BooleanField*)field; } -DoubleField* Xao::getDoubleField(const int& index) -throw (XAO_Exception) +DoubleField* Xao::getDoubleField(int index) + { Field* field = getField(index); if (field->getType() != XAO::DOUBLE) @@ -159,8 +159,8 @@ throw (XAO_Exception) return (DoubleField*)field; } -IntegerField* Xao::getIntegerField(const int& index) -throw (XAO_Exception) +IntegerField* Xao::getIntegerField(int index) + { Field* field = getField(index); if (field->getType() != XAO::INTEGER) @@ -168,8 +168,8 @@ throw (XAO_Exception) return (IntegerField*)field; } -StringField* Xao::getStringField(const int& index) -throw (XAO_Exception) +StringField* Xao::getStringField(int index) + { Field* field = getField(index); if (field->getType() != XAO::STRING) @@ -177,8 +177,8 @@ throw (XAO_Exception) return (StringField*)field; } -Field* Xao::addField(const XAO::Type& type, const XAO::Dimension& dim, const int& nbComponents, const std::string& name) -throw (XAO_Exception) +Field* Xao::addField(XAO::Type type, XAO::Dimension dim, int nbComponents, const std::string& name) + { checkGeometry(); int nbElts = m_geometry->countElements(dim); @@ -187,8 +187,8 @@ throw (XAO_Exception) return field; } -IntegerField* Xao::addIntegerField(const XAO::Dimension& dim, const int& nbComponents, const std::string& name) -throw (XAO_Exception) +IntegerField* Xao::addIntegerField(XAO::Dimension dim, int nbComponents, const std::string& name) + { checkGeometry(); int nbElts = m_geometry->countElements(dim); @@ -196,8 +196,8 @@ throw (XAO_Exception) m_fields.push_back(field); return field; } -BooleanField* Xao::addBooleanField(const XAO::Dimension& dim, const int& nbComponents, const std::string& name) -throw (XAO_Exception) +BooleanField* Xao::addBooleanField(XAO::Dimension dim, int nbComponents, const std::string& name) + { checkGeometry(); int nbElts = m_geometry->countElements(dim); @@ -205,8 +205,8 @@ throw (XAO_Exception) m_fields.push_back(field); return field; } -DoubleField* Xao::addDoubleField(const XAO::Dimension& dim, const int& nbComponents, const std::string& name) -throw (XAO_Exception) +DoubleField* Xao::addDoubleField(XAO::Dimension dim, int nbComponents, const std::string& name) + { checkGeometry(); int nbElts = m_geometry->countElements(dim); @@ -214,8 +214,8 @@ throw (XAO_Exception) m_fields.push_back(field); return field; } -StringField* Xao::addStringField(const XAO::Dimension& dim, const int& nbComponents, const std::string& name) -throw (XAO_Exception) +StringField* Xao::addStringField(XAO::Dimension dim, int nbComponents, const std::string& name) + { checkGeometry(); int nbElts = m_geometry->countElements(dim); @@ -241,7 +241,7 @@ bool Xao::removeField(Field* field) return res; } -const bool Xao::exportXAO(const std::string& fileName, const std::string& shapeFileName) +bool Xao::exportXAO(const std::string& fileName, const std::string& shapeFileName) { return XaoExporter::saveToFile(this, fileName, shapeFileName); } @@ -251,25 +251,23 @@ const std::string Xao::getXML() return XaoExporter::saveToXml(this); } -const bool Xao::importXAO(const std::string& fileName) +bool Xao::importXAO(const std::string& fileName) { return XaoExporter::readFromFile(fileName, this); } -const bool Xao::setXML(const std::string& xml) +bool Xao::setXML(const std::string& xml) { return XaoExporter::setXML(xml, this); } void Xao::checkGeometry() const -throw(XAO_Exception) { if (m_geometry == NULL) throw XAO_Exception("Geometry is null"); } -void Xao::checkGroupIndex(const int& index) const -throw(XAO_Exception) +void Xao::checkGroupIndex(int index) const { if (index >= 0 && index < countGroups()) return; @@ -278,8 +276,7 @@ throw(XAO_Exception) << countGroups()-1 << "]: " << index); } -void Xao::checkFieldIndex(const int& index) const -throw(XAO_Exception) +void Xao::checkFieldIndex(int index) const { if (index >= 0 && index < countFields()) return; @@ -288,8 +285,7 @@ throw(XAO_Exception) << countFields()-1 << "]: " << index); } -void Xao::checkGroupDimension(const XAO::Dimension& dim) const -throw(XAO_Exception) +void Xao::checkGroupDimension(XAO::Dimension dim) const { if (dim == XAO::WHOLE) throw XAO_Exception(MsgBuilder() << "Invalid dimension for group: " << dim); diff --git a/src/XAO/XAO_Xao.hxx b/src/XAO/XAO_Xao.hxx index 8a005cb66..d5fe9c49a 100644 --- a/src/XAO/XAO_Xao.hxx +++ b/src/XAO/XAO_Xao.hxx @@ -115,7 +115,7 @@ namespace XAO * Sets the geometry. * \param geometry the geometry to set. */ - void setGeometry(Geometry* geometry) throw (XAO_Exception) + void setGeometry(Geometry* geometry) { if (m_geometry != NULL) throw XAO_Exception("Geometry already set."); @@ -131,20 +131,20 @@ namespace XAO * Gets the number of groups. * \return the number of groups. */ - const int countGroups() const; + int countGroups() const; /** * Gets a group. * \param index the index of the wanted group. * \return the group. */ - Group* getGroup(const int& index) throw (XAO_Exception); + Group* getGroup(int index) ; /** * Adds a group. * \param dim the dimension of the group. * \param name the name of the group. * \return the created group. */ - Group* addGroup(const XAO::Dimension& dim, const std::string& name = std::string("")) throw (XAO_Exception); + Group* addGroup(XAO::Dimension dim, const std::string& name = std::string("")) ; /** * Removes a group. * \param group the group to remove. @@ -160,26 +160,26 @@ namespace XAO * Gets the number of fields. * \return the number of fields. */ - const int countFields() const; + int countFields() const; /** * Gets the type of a field. * \param index the index of the wanted field. * \return the type of the field. */ - const XAO::Type getFieldType(const int& index) throw (XAO_Exception); + XAO::Type getFieldType(int index) ; /** * Gets a field. * \param index the index of the wanted field. * \return the field. */ - Field* getField(const int& index) throw (XAO_Exception); + Field* getField(int index) ; - BooleanField* getBooleanField(const int& index) throw (XAO_Exception); - DoubleField* getDoubleField(const int& index) throw (XAO_Exception); - IntegerField* getIntegerField(const int& index) throw (XAO_Exception); - StringField* getStringField(const int& index) throw (XAO_Exception); + BooleanField* getBooleanField(int index) ; + DoubleField* getDoubleField(int index) ; + IntegerField* getIntegerField(int index) ; + StringField* getStringField(int index) ; /** * Adds a field. @@ -189,18 +189,18 @@ namespace XAO * \param name the name of the field. * \return the created field. */ - Field* addField(const XAO::Type& type, const XAO::Dimension& dim, const int& nbComponents, + Field* addField(XAO::Type type, XAO::Dimension dim, int nbComponents, const std::string& name = std::string("")) - throw (XAO_Exception); + ; - BooleanField* addBooleanField(const XAO::Dimension& dim, const int& nbComponents, - const std::string& name = std::string("")) throw (XAO_Exception); - IntegerField* addIntegerField(const XAO::Dimension& dim, const int& nbComponents, - const std::string& name = std::string("")) throw (XAO_Exception); - DoubleField* addDoubleField(const XAO::Dimension& dim, const int& nbComponents, - const std::string& name = std::string("")) throw (XAO_Exception); - StringField* addStringField(const XAO::Dimension& dim, const int& nbComponents, - const std::string& name = std::string("")) throw (XAO_Exception); + BooleanField* addBooleanField(XAO::Dimension dim, int nbComponents, + const std::string& name = std::string("")) ; + IntegerField* addIntegerField(XAO::Dimension dim, int nbComponents, + const std::string& name = std::string("")) ; + DoubleField* addDoubleField(XAO::Dimension dim, int nbComponents, + const std::string& name = std::string("")) ; + StringField* addStringField(XAO::Dimension dim, int nbComponents, + const std::string& name = std::string("")) ; /** * Removes a field. @@ -218,7 +218,7 @@ namespace XAO * \param shapeFileName if not empty, export the shape to this external file. * \return true is the export is successful. */ - const bool exportXAO(const std::string& fileName, const std::string& shapeFileName); + bool exportXAO(const std::string& fileName, const std::string& shapeFileName); /** * Gets the XML corresponding to this XAO. * \return the XML as a string. @@ -230,19 +230,19 @@ namespace XAO * \param fileName the name of the file to import. * \return true if the import is successful. */ - const bool importXAO(const std::string& fileName); + bool importXAO(const std::string& fileName); /** * Sets an XML describing an XAO format to this object. * \param xml the XML to set. * \return true if the import is successful. */ - const bool setXML(const std::string& xml); + bool setXML(const std::string& xml); private: - void checkGeometry() const throw (XAO_Exception); - void checkGroupIndex(const int& index) const throw (XAO_Exception); - void checkFieldIndex(const int& index) const throw (XAO_Exception); - void checkGroupDimension(const XAO::Dimension& dim) const throw (XAO_Exception); + void checkGeometry() const ; + void checkGroupIndex(int index) const ; + void checkFieldIndex(int index) const ; + void checkGroupDimension(XAO::Dimension dim) const ; private: /** The author of the file. */ diff --git a/src/XAO/XAO_XaoExporter.cxx b/src/XAO/XAO_XaoExporter.cxx index 5f0230681..b371b47fc 100644 --- a/src/XAO/XAO_XaoExporter.cxx +++ b/src/XAO/XAO_XaoExporter.cxx @@ -116,14 +116,14 @@ namespace { void parseStepElementNode(xmlNodePtr eltNode, Step* step); std::string readStringProp(xmlNodePtr node, const xmlChar* attribute, - const bool& required, const std::string& defaultValue, + bool required, const std::string& defaultValue, const std::string& exception = std::string("")); int readIntegerProp(xmlNodePtr node, const xmlChar* attribute, - const bool& required, const int& defaultValue, + bool required, int defaultValue, const std::string& exception = std::string("")); std::string readStringProp(xmlNodePtr node, const xmlChar* attribute, - const bool& required, const std::string& defaultValue, + bool required, const std::string& defaultValue, const std::string& exception /*= std::string() */) { xmlChar* strAttr = xmlGetProp(node, attribute); @@ -147,7 +147,7 @@ namespace { } int readIntegerProp(xmlNodePtr node, const xmlChar* attribute, - const bool& required, const int& defaultValue, + bool required, int defaultValue, const std::string& exception /*= std::string() */) { xmlChar* strAttr = xmlGetProp(node, attribute); @@ -298,7 +298,7 @@ namespace { } } - void exportStep(Step* step, Field* field, xmlNodePtr nodeSteps) + void exportStep(Step* step, Field* /*field*/, xmlNodePtr nodeSteps) { xmlNodePtr nodeStep = xmlNewChild(nodeSteps, 0, C_TAG_STEP, 0); xmlNewProp(nodeStep, C_ATTR_STEP_NUMBER, BAD_CAST XaoUtils::intToString(step->getStep()).c_str()); @@ -378,7 +378,7 @@ namespace { xaoObject->setGeometry(geometry); } - void parseShapeNode(xmlDocPtr doc, xmlNodePtr shapeNode, Geometry* geometry) + void parseShapeNode(xmlDocPtr /*doc*/, xmlNodePtr shapeNode, Geometry* geometry) { if (geometry->getFormat() == XAO::BREP) { @@ -638,8 +638,8 @@ namespace { } } -const bool XaoExporter::saveToFile(Xao* xaoObject, const std::string& fileName, const std::string& shapeFileName) -throw (XAO_Exception) +bool XaoExporter::saveToFile(Xao* xaoObject, const std::string& fileName, const std::string& shapeFileName) + { xmlDocPtr doc = exportXMLDoc(xaoObject, shapeFileName); xmlSaveFormatFileEnc(fileName.c_str(), doc, "UTF-8", 1); // format = 1 for node indentation @@ -649,7 +649,7 @@ throw (XAO_Exception) } const std::string XaoExporter::saveToXml(Xao* xaoObject) -throw (XAO_Exception) + { xmlDocPtr doc = exportXMLDoc(xaoObject, ""); @@ -662,8 +662,8 @@ throw (XAO_Exception) return (char*)xmlbuff; } -const bool XaoExporter::readFromFile(const std::string& fileName, Xao* xaoObject) -throw (XAO_Exception) +bool XaoExporter::readFromFile(const std::string& fileName, Xao* xaoObject) + { // parse the file and get the DOM int options = XML_PARSE_HUGE | XML_PARSE_NOCDATA; @@ -677,8 +677,8 @@ throw (XAO_Exception) return true; } -const bool XaoExporter::setXML(const std::string& xml, Xao* xaoObject) -throw (XAO_Exception) +bool XaoExporter::setXML(const std::string& xml, Xao* xaoObject) + { int options = XML_PARSE_HUGE | XML_PARSE_NOCDATA; xmlDocPtr doc = xmlReadDoc(BAD_CAST xml.c_str(), "", NULL, options); diff --git a/src/XAO/XAO_XaoExporter.hxx b/src/XAO/XAO_XaoExporter.hxx index 6367bebe2..5ab64cd6b 100644 --- a/src/XAO/XAO_XaoExporter.hxx +++ b/src/XAO/XAO_XaoExporter.hxx @@ -47,8 +47,8 @@ namespace XAO * @param shapeFileName if not empty save the shape in an this external file. * @return true if the export was successful, false otherwise. */ - static const bool saveToFile(Xao* xaoObject, const std::string& fileName, const std::string& shapeFileName) - throw (XAO_Exception); + static bool saveToFile(Xao* xaoObject, const std::string& fileName, const std::string& shapeFileName) + ; /** * Saves the XAO object to a XML string. @@ -56,7 +56,7 @@ namespace XAO * @return the XML string. */ static const std::string saveToXml(Xao* xaoObject) - throw (XAO_Exception); + ; /** * Reads a XAO object from a file. @@ -64,8 +64,8 @@ namespace XAO * @param xaoObject the XAO object. * @return true if the XAO object was read successful, false otherwise. */ - static const bool readFromFile(const std::string& fileName, Xao* xaoObject) - throw (XAO_Exception); + static bool readFromFile(const std::string& fileName, Xao* xaoObject) + ; /** * Reads a XAO object from an XML string. @@ -73,8 +73,8 @@ namespace XAO * @param xaoObject the XAO object. * @return true if the XAO object was read successful, false otherwise. */ - static const bool setXML(const std::string& xml, Xao* xaoObject) - throw (XAO_Exception); + static bool setXML(const std::string& xml, Xao* xaoObject) + ; }; } diff --git a/src/XAO/XAO_XaoUtils.cxx b/src/XAO/XAO_XaoUtils.cxx index ed832be14..682128bd1 100644 --- a/src/XAO/XAO_XaoUtils.cxx +++ b/src/XAO/XAO_XaoUtils.cxx @@ -27,15 +27,14 @@ using namespace XAO; -const std::string XaoUtils::intToString(const int& value) +std::string XaoUtils::intToString(int value) { std::ostringstream str; str << value; return str.str(); } -const int XaoUtils::stringToInt(const std::string& value) -throw(XAO_Exception) +int XaoUtils::stringToInt(const std::string& value) { int res; std::istringstream convert(value); @@ -44,15 +43,14 @@ throw(XAO_Exception) return res; } -const std::string XaoUtils::doubleToString(const double& value) +std::string XaoUtils::doubleToString(double value) { std::ostringstream str; str << value; return str.str(); } -const double XaoUtils::stringToDouble(const std::string& value) -throw(XAO_Exception) +double XaoUtils::stringToDouble(const std::string& value) { double res; std::istringstream convert(value); @@ -61,15 +59,12 @@ throw(XAO_Exception) return res; } -const std::string XaoUtils::booleanToString(const bool& value) +std::string XaoUtils::booleanToString(bool value) { - if (value) - return "true"; - return "false"; + return value ? "true" : "false"; } -const bool XaoUtils::stringToBoolean(const std::string& value) -throw(XAO_Exception) +bool XaoUtils::stringToBoolean(const std::string& value) { if (value == "true" || value == "1") return true; @@ -79,8 +74,7 @@ throw(XAO_Exception) throw XAO_Exception(MsgBuilder() << "Invalid boolean value: " << value); } -const std::string XaoUtils::dimensionToString(const XAO::Dimension& dimension) -throw(XAO_Exception) +std::string XaoUtils::dimensionToString(XAO::Dimension dimension) { if (dimension == XAO::VERTEX) return "vertex"; @@ -96,8 +90,7 @@ throw(XAO_Exception) throw XAO_Exception(MsgBuilder() << "Bad dimension: " << dimension); } -const XAO::Dimension XaoUtils::stringToDimension(const std::string& dimension) -throw(XAO_Exception) +XAO::Dimension XaoUtils::stringToDimension(const std::string& dimension) { if (dimension == "vertex") return XAO::VERTEX; @@ -113,8 +106,7 @@ throw(XAO_Exception) throw XAO_Exception(MsgBuilder() << "Bad dimension: " << dimension); } -const std::string XaoUtils::fieldTypeToString(const XAO::Type& type) -throw(XAO_Exception) +std::string XaoUtils::fieldTypeToString(XAO::Type type) { if (type ==XAO:: BOOLEAN) return "boolean"; @@ -128,8 +120,7 @@ throw(XAO_Exception) throw XAO_Exception(MsgBuilder() << "Bad type: " << type); } -const XAO::Type XaoUtils::stringToFieldType(const std::string& type) -throw(XAO_Exception) +XAO::Type XaoUtils::stringToFieldType(const std::string& type) { if (type == "boolean") return XAO::BOOLEAN; @@ -143,8 +134,7 @@ throw(XAO_Exception) throw XAO_Exception(MsgBuilder() << "Bad type: " << type); } -const std::string XaoUtils::shapeFormatToString(const XAO::Format& format) -throw(XAO_Exception) +std::string XaoUtils::shapeFormatToString(XAO::Format format) { if (format == XAO::BREP) return "BREP"; @@ -154,8 +144,7 @@ throw(XAO_Exception) throw XAO_Exception(MsgBuilder() << "Bad format: " << format); } -const XAO::Format XaoUtils::stringToShapeFormat(const std::string& format) -throw(XAO_Exception) +XAO::Format XaoUtils::stringToShapeFormat(const std::string& format) { if (format == "BREP") return XAO::BREP; diff --git a/src/XAO/XAO_XaoUtils.hxx b/src/XAO/XAO_XaoUtils.hxx index add0a2569..254be054a 100644 --- a/src/XAO/XAO_XaoUtils.hxx +++ b/src/XAO/XAO_XaoUtils.hxx @@ -78,7 +78,7 @@ namespace XAO * \param value the integer to convert. * \return the string. */ - static const std::string intToString(const int& value); + static std::string intToString(int value); /** * Converts a string into an integer. @@ -86,28 +86,28 @@ namespace XAO * \return the integer value. * \throw XAO_Exception if value cannot be converted to string. */ - static const int stringToInt(const std::string& value) throw(XAO_Exception); + static int stringToInt(const std::string& value); /** * Converts a double into a string. * \param value the double to convert. * \return the string. */ - static const std::string doubleToString(const double& value); + static std::string doubleToString(double value); /** * Converts a string into a double. * \param value the string to convert. * \return the double value. * \throw XAO_Exception if value cannot be converted to string. */ - static const double stringToDouble(const std::string& value) throw(XAO_Exception); + static double stringToDouble(const std::string& value); /** * Converts a boolean into a string. * \param value the boolean to convert. * \return the string. */ - static const std::string booleanToString(const bool& value); + static std::string booleanToString(bool value); /** * Converts a string into a boolean. * \param value the string to convert. @@ -115,7 +115,7 @@ namespace XAO * \throw XAO_Exception if value cannot be converted to boolean. * \note accepted values are "true", "1", "false", "0". */ - static const bool stringToBoolean(const std::string& value) throw(XAO_Exception); + static bool stringToBoolean(const std::string& value); /** * Converts a Dimension to string. @@ -123,7 +123,7 @@ namespace XAO * \return the dimension as a string. * \throw XAO_Exception */ - static const std::string dimensionToString(const XAO::Dimension& dimension) throw(XAO_Exception); + static std::string dimensionToString(XAO::Dimension dimension); /** * Converts a string into a Dimension. @@ -131,7 +131,7 @@ namespace XAO * \return the converted Dimension. * \throw XAO_Exception if dimension cannot be converted. */ - static const XAO::Dimension stringToDimension(const std::string& dimension) throw(XAO_Exception); + static XAO::Dimension stringToDimension(const std::string& dimension); /** * Converts a Type to string. @@ -139,7 +139,7 @@ namespace XAO * \return the Type as a string. * \throw XAO_Exception */ - static const std::string fieldTypeToString(const XAO::Type& type) throw(XAO_Exception); + static std::string fieldTypeToString(XAO::Type type); /** * Converts a string into a Type. @@ -147,7 +147,7 @@ namespace XAO * \return the converted Type. * \throw XAO_Exception if type cannot be converted. */ - static const XAO::Type stringToFieldType(const std::string& type) throw(XAO_Exception); + static XAO::Type stringToFieldType(const std::string& type); /** * Converts a Format to string. @@ -155,7 +155,7 @@ namespace XAO * \return the Format as a string. * \throw XAO_Exception */ - static const std::string shapeFormatToString(const XAO::Format& format) throw(XAO_Exception); + static std::string shapeFormatToString(XAO::Format format); /** * Converts a string into a Format. @@ -163,7 +163,7 @@ namespace XAO * \return the converted Format. * \throw XAO_Exception if format cannot be converted. */ - static const XAO::Format stringToShapeFormat(const std::string& format) throw(XAO_Exception); + static XAO::Format stringToShapeFormat(const std::string& format); }; /** diff --git a/src/XAO/tests/XaoTest.cxx b/src/XAO/tests/XaoTest.cxx index ff733203b..0ce43802f 100644 --- a/src/XAO/tests/XaoTest.cxx +++ b/src/XAO/tests/XaoTest.cxx @@ -81,8 +81,8 @@ void XaoTest::testFields() CPPUNIT_ASSERT_EQUAL(3, fi->countComponents()); Field* fb = obj.addField(XAO::BOOLEAN, XAO::FACE, 3); - Field* fd = obj.addField(XAO::DOUBLE, XAO::FACE, 3); - Field* fs = obj.addField(XAO::STRING, XAO::FACE, 3); + /*Field* fd = */obj.addField(XAO::DOUBLE, XAO::FACE, 3); + /*Field* fs = */obj.addField(XAO::STRING, XAO::FACE, 3); CPPUNIT_ASSERT_EQUAL(4, obj.countFields()); CPPUNIT_ASSERT_THROW(obj.getField(10), XAO_Exception); diff --git a/src/XAOPlugin/XAOPlugin_Driver.cxx b/src/XAOPlugin/XAOPlugin_Driver.cxx index 769a31738..01b15f2fa 100644 --- a/src/XAOPlugin/XAOPlugin_Driver.cxx +++ b/src/XAOPlugin/XAOPlugin_Driver.cxx @@ -110,5 +110,5 @@ bool XAOPlugin_Driver::GetCreationInformation(std::string& theOperat return true; } -IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver) diff --git a/src/XAOPlugin/XAOPlugin_Driver.hxx b/src/XAOPlugin/XAOPlugin_Driver.hxx index 1484c3acf..525130a4f 100644 --- a/src/XAOPlugin/XAOPlugin_Driver.hxx +++ b/src/XAOPlugin/XAOPlugin_Driver.hxx @@ -25,7 +25,7 @@ #include "GEOM_BaseDriver.hxx" -DEFINE_STANDARD_HANDLE(XAOPlugin_Driver, GEOM_BaseDriver); +DEFINE_STANDARD_HANDLE(XAOPlugin_Driver, GEOM_BaseDriver) class XAOPlugin_Driver: public GEOM_BaseDriver { diff --git a/src/XAOPlugin/XAOPlugin_ExportDlg.cxx b/src/XAOPlugin/XAOPlugin_ExportDlg.cxx index e1df0531b..376387049 100644 --- a/src/XAOPlugin/XAOPlugin_ExportDlg.cxx +++ b/src/XAOPlugin/XAOPlugin_ExportDlg.cxx @@ -396,7 +396,7 @@ GEOM::GEOM_IOperations_ptr XAOPlugin_ExportDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool XAOPlugin_ExportDlg::isValid(QString& msg) +bool XAOPlugin_ExportDlg::isValid(QString& /*msg*/) { // check shape if (ledShape->text().isEmpty()) diff --git a/src/XAOPlugin/XAOPlugin_IECallBack.cxx b/src/XAOPlugin/XAOPlugin_IECallBack.cxx index d199d04c6..a6b78c56e 100644 --- a/src/XAOPlugin/XAOPlugin_IECallBack.cxx +++ b/src/XAOPlugin/XAOPlugin_IECallBack.cxx @@ -49,7 +49,7 @@ XAOPlugin_IECallBack::~XAOPlugin_IECallBack() bool XAOPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal, const TCollection_AsciiString& theFileName, - const TCollection_AsciiString& theFormatName, + const TCollection_AsciiString& /*theFormatName*/, const TCollection_AsciiString& theShapeFileName ) { XAOPlugin_IOperations* aPluginOperations = XAOPlugin_OperationsCreator::get( GetEngine() ); @@ -73,7 +73,7 @@ XAOPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal, */ //============================================================================= Handle(TColStd_HSequenceOfTransient) -XAOPlugin_IECallBack::Import( const TCollection_AsciiString& theFormatName, +XAOPlugin_IECallBack::Import( const TCollection_AsciiString& /*theFormatName*/, const TCollection_AsciiString& theFileName ) { XAOPlugin_IOperations* aPluginOperations = XAOPlugin_OperationsCreator::get( GetEngine() ); diff --git a/src/XAOPlugin/XAOPlugin_IOperations.cxx b/src/XAOPlugin/XAOPlugin_IOperations.cxx index 7e02ed4d1..57e08bcbd 100644 --- a/src/XAOPlugin/XAOPlugin_IOperations.cxx +++ b/src/XAOPlugin/XAOPlugin_IOperations.cxx @@ -182,7 +182,7 @@ bool XAOPlugin_IOperations::exportGroups( std::list groupLi void XAOPlugin_IOperations::exportFields( std::list fieldList, XAO::Xao* xaoObject, - XAO::BrepGeometry* geometry ) + XAO::BrepGeometry* /*geometry*/ ) { std::list::iterator fieldIterator = fieldList.begin(); while (fieldIterator != fieldList.end()) diff --git a/src/XAOPlugin/XAOPlugin_ImportDlg.cxx b/src/XAOPlugin/XAOPlugin_ImportDlg.cxx index cf2e3f8ef..84a4ec2f9 100644 --- a/src/XAOPlugin/XAOPlugin_ImportDlg.cxx +++ b/src/XAOPlugin/XAOPlugin_ImportDlg.cxx @@ -242,7 +242,7 @@ GEOM::GEOM_IOperations_ptr XAOPlugin_ImportDlg::createOperation() // function : isValid // purpose : //================================================================================= -bool XAOPlugin_ImportDlg::isValid(QString& msg) +bool XAOPlugin_ImportDlg::isValid(QString& /*msg*/) { // check file name if (ledFileName->text().isEmpty())