From: Viktor UZLOV Date: Fri, 28 Aug 2020 15:03:59 +0000 (+0300) Subject: fight warnings, c++17. Fix minor warnings. Build SMESH finished X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a9f7e28cba695e50fcae50a483ae37f32af4ce84;p=modules%2Fsmesh.git fight warnings, c++17. Fix minor warnings. Build SMESH finished --- diff --git a/src/PluginUtils/GeomSelectionTools.h b/src/PluginUtils/GeomSelectionTools.h index 6228f3492..3df7d90fe 100644 --- a/src/PluginUtils/GeomSelectionTools.h +++ b/src/PluginUtils/GeomSelectionTools.h @@ -72,7 +72,7 @@ public: namespace PluginUtils { PLUGINUTILS_EXPORT QString PrintDoubleValue( double, int = 16 ); -}; +} #endif // _GEOMSELECTIONTOOLS_H_ diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx index 5a51a1a63..cc158fb1d 100644 --- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx @@ -1274,7 +1274,7 @@ void SMESHGUI_AddQuadraticElementDlg::enterEvent (QEvent*) // purpose : //================================================================================= -void SMESHGUI_AddQuadraticElementDlg::onReverse (int state) +void SMESHGUI_AddQuadraticElementDlg::onReverse (int /*state*/) { mySimulation->SetVisibility(false); displaySimulation(); @@ -1449,7 +1449,7 @@ void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity ) // purpose : //================================================================================= -void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCol ) +void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int /*theRow*/, int /*theCol*/ ) { myCurrentLineEdit = 0; displaySimulation(); @@ -1461,7 +1461,7 @@ void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCo // purpose : //================================================================================= -void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int theRow, int theCol) +void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int /*theRow*/, int /*theCol*/) { myCurrentLineEdit = 0; displaySimulation(); diff --git a/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx b/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx index ef2402872..598665a6e 100644 --- a/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx +++ b/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx @@ -214,7 +214,7 @@ bool SMESHGUI_FieldSelectorWdg::GetSelectedFields() /*! * \brief SLOT called when a tree item is checked */ -void SMESHGUI_FieldSelectorWdg::onItemCheck(QTreeWidgetItem * item, int column) +void SMESHGUI_FieldSelectorWdg::onItemCheck(QTreeWidgetItem * item, int /*column*/) { myTree->blockSignals( true ); if ( !item->parent() ) // mesh item diff --git a/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.h b/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.h index 37e28256a..79ea1d3b5 100644 --- a/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.h +++ b/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.h @@ -50,7 +50,7 @@ class SMESHGUI_EXPORT SMESHGUI_FieldSelectorWdg : public QGroupBox private slots: - void onItemCheck(QTreeWidgetItem * item, int column); + void onItemCheck(QTreeWidgetItem * item, int /*column*/); private: diff --git a/src/SMESHGUI/SMESHGUI_Filter.h b/src/SMESHGUI/SMESHGUI_Filter.h index b8579a199..1a9ef3143 100644 --- a/src/SMESHGUI/SMESHGUI_Filter.h +++ b/src/SMESHGUI/SMESHGUI_Filter.h @@ -55,7 +55,7 @@ namespace SMESH FirstEntityTypeFilter = FirstGeometryTypeFilter + SMDSGeom_NONE, LastFilter = FirstEntityTypeFilter + SMDSEntity_Last }; -}; +} /* Class : SMESHGUI_Filter diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index 5d7f16093..27ae2a813 100644 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx @@ -697,7 +697,7 @@ void SMESHGUI_FilterTable::ComboDelegate::setModelData( QWidget* editor, void SMESHGUI_FilterTable::ComboDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, - const QModelIndex& index ) const + const QModelIndex& /*index*/ ) const { editor->setGeometry( option.rect ); } @@ -1776,7 +1776,7 @@ static QList entityTypes( const int theType ) // Purpose : Provides reaction on change of criterion //======================================================================= -void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, const int entityType) +void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int /*col*/, const int entityType) { int aType = entityType == -1 ? GetType() : entityType; Table* aTable = myTables[ aType ]; @@ -2377,7 +2377,7 @@ const QMap& SMESHGUI_FilterTable::getCompare() const // Purpose : Create table //======================================================================= SMESHGUI_FilterTable::Table* SMESHGUI_FilterTable::createTable (QWidget* theParent, - const int theType) + const int /*theType*/) { // create table Table* aTable= new Table(0, 6, theParent); diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx index 9c6782979..251bcc78c 100644 --- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx @@ -592,7 +592,7 @@ namespace SMESH SMESH::SMESH_Hypothesis_ptr CreateHypothesis(const QString& aHypType, const QString& aHypName, - const bool isAlgo) + const bool /*isAlgo*/) { if(MYDEBUG) MESSAGE("Create " << aHypType.toLatin1().data() << " with name " << aHypName.toLatin1().data()); diff --git a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx index 69cf9cc61..ceff2a4d2 100644 --- a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx +++ b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx @@ -316,7 +316,7 @@ void SMESHGUI_Make2DFrom3DOp::selectionDone() } } -SUIT_SelectionFilter* SMESHGUI_Make2DFrom3DOp::createFilter( const int theId ) const +SUIT_SelectionFilter* SMESHGUI_Make2DFrom3DOp::createFilter( const int /*theId*/ ) const { SMESHGUI_Make2DFrom3DOp* me = (SMESHGUI_Make2DFrom3DOp*) this; diff --git a/src/SMESHGUI/SMESHGUI_Measurements.h b/src/SMESHGUI/SMESHGUI_Measurements.h index 83ee72ea3..66ecc6e0c 100644 --- a/src/SMESHGUI/SMESHGUI_Measurements.h +++ b/src/SMESHGUI/SMESHGUI_Measurements.h @@ -46,7 +46,7 @@ class SMESHGUI_MeshEditPreview; class SMESHGUI_EXPORT SMESHGUI_MinDistance : public QWidget { - Q_OBJECT; + Q_OBJECT enum { NoTgt, FirstTgt, SecondTgt }; enum { OriginTgt, NodeTgt, ElementTgt, ObjectTgt }; @@ -95,7 +95,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_BoundingBox : public QWidget { - Q_OBJECT; + Q_OBJECT enum { ObjectsSrc, NodesSrc, ElementsSrc }; @@ -141,7 +141,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_BasicProperties : public QWidget { - Q_OBJECT; + Q_OBJECT public: //! Property type @@ -172,7 +172,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_Angle : public QWidget { - Q_OBJECT; + Q_OBJECT public: @@ -206,7 +206,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_MeasureDlg : public QDialog { - Q_OBJECT; + Q_OBJECT enum { NodeMode, ElemMode }; diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.h b/src/SMESHGUI/SMESHGUI_MergeDlg.h index 684629c34..5cecfd2f6 100644 --- a/src/SMESHGUI/SMESHGUI_MergeDlg.h +++ b/src/SMESHGUI/SMESHGUI_MergeDlg.h @@ -72,7 +72,7 @@ namespace SMESH //================================================================================= class SMESHGUI_EXPORT SMESHGUI_MergeDlg : public QDialog { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_MergeDlg( SMESHGUI*, int ); diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.h b/src/SMESHGUI/SMESHGUI_MeshInfo.h index e01d5af26..1358a65ed 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.h +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.h @@ -71,7 +71,7 @@ public: class SMESHGUI_EXPORT SMESHGUI_BaseInfo : public SMESHGUI_Info { - Q_OBJECT; + Q_OBJECT enum { @@ -158,7 +158,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_ElemInfo : public SMESHGUI_Info { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_ElemInfo( QWidget* = 0 ); @@ -205,7 +205,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_SimpleElemInfo : public SMESHGUI_ElemInfo { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_SimpleElemInfo( QWidget* = 0 ); @@ -223,7 +223,7 @@ private slots: class SMESHGUI_EXPORT SMESHGUI_TreeElemInfo : public SMESHGUI_ElemInfo { - Q_OBJECT; + Q_OBJECT class ItemDelegate; class ItemCreator; @@ -251,7 +251,7 @@ private: class InfoComputor: public QObject { - Q_OBJECT; + Q_OBJECT public: enum { GrpSize, GrpNbNodes }; @@ -271,7 +271,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_AddInfo : public SMESHGUI_Info { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_AddInfo( QWidget* = 0 ); @@ -307,7 +307,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_CtrlInfo : public SMESHGUI_Info { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_CtrlInfo( QWidget* = 0 ); @@ -354,7 +354,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_MeshInfoDlg : public QDialog { - Q_OBJECT; + Q_OBJECT enum { NodeMode, ElemMode, GroupMode }; @@ -409,7 +409,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_CtrlInfoDlg : public QDialog { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_CtrlInfoDlg( QWidget* = 0 ); diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index f143b0136..10366f210 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -882,7 +882,7 @@ void SMESHGUI_MeshOp::availableHyps( const int theDim, THypDataList& theDataList, HypothesisData* thePrevAlgoData, HypothesisData* theNextAlgoData, - const QString& theMeshType) + const QString& /*theMeshType*/) { theDataList.clear(); theHyps.clear(); @@ -1434,7 +1434,7 @@ void SMESHGUI_MeshOp::onEditHyp( const int theHypType, const int theIndex ) * 1 = accepted */ //================================================================================ -void SMESHGUI_MeshOp::onHypoEdited( int result ) +void SMESHGUI_MeshOp::onHypoEdited( int /*result*/ ) { int obj = myDlg->getActiveObject(); onActivateObject( obj ); // Issue 0020170. Restore filters @@ -2975,7 +2975,7 @@ void SMESHGUI_MeshOp::updateHypoSets() * \param theIndex - Index of current type of mesh */ //================================================================================ -void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int theTabIndex, const int theIndex ) +void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int /*theTabIndex*/, const int /*theIndex*/ ) { setFilteredAlgoData(); } diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx index cf0bde0fd..f143bb17e 100644 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx @@ -369,7 +369,7 @@ SMESH::NumericalFunctor_ptr SMESHGUI_MultiEditDlg::getNumericalFunctor() aNF = aFilterMgr->CreateMultiConnection2D(); else if (myComboBoxFunctor->currentText() == tr("MIN_DIAG_ELEMENTS")) aNF = aFilterMgr->CreateMaxElementLength2D(); - else; + //else; return aNF._retn(); } diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx index fbed2f350..876bee262 100644 --- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx @@ -385,7 +385,7 @@ void SMESHGUI_RenumberingDlg::ActivateThisDialog() // function : enterEvent() // purpose : //================================================================================= -void SMESHGUI_RenumberingDlg::enterEvent(QEvent* e) +void SMESHGUI_RenumberingDlg::enterEvent(QEvent* /*e*/) { if (GroupConstructors->isEnabled()) return; diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx index a1ba78b12..fe8ad5618 100644 --- a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx @@ -1798,7 +1798,7 @@ void SMESHGUI_SewingDlg::ActivateThisDialog() // function : enterEvent() // purpose : //================================================================================= -void SMESHGUI_SewingDlg::enterEvent (QEvent* e) +void SMESHGUI_SewingDlg::enterEvent (QEvent* /*e*/) { if (!ConstructorsBox->isEnabled()) { SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ); diff --git a/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx b/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx index 5615d9345..4b4294cd5 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx @@ -150,7 +150,7 @@ namespace VISCOUS_2D // Treat events void ProcessEvent(const int event, const int eventType, - SMESH_subMesh* subMesh, + SMESH_subMesh* /*subMesh*/, EventListenerData* data, const SMESH_Hypothesis* /*hyp*/) { diff --git a/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx index a1a4f6712..3d1c01608 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx @@ -534,7 +534,7 @@ namespace StdMeshersGUI //================================================================================ QWidget* LineDelegate::createEditor( QWidget* parent, - const QStyleOptionViewItem& opt, + const QStyleOptionViewItem& /*opt*/, const QModelIndex& index) const { QWidget* w = 0; diff --git a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx index 33c0fd684..e61e5d369 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx @@ -75,7 +75,7 @@ StdMeshersGUI_FixedPointsParamWdg::LineDelegate::LineDelegate( QTreeWidget* pare } QWidget* StdMeshersGUI_FixedPointsParamWdg::LineDelegate::createEditor( QWidget* parent, - const QStyleOptionViewItem& option, + const QStyleOptionViewItem& /*option*/, const QModelIndex& index ) const { QWidget* w = 0; diff --git a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx index 5317368ea..acf1f2a85 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx @@ -224,7 +224,7 @@ void StdMeshersGUI_LayerDistributionParamWdg::onEdit() } } -void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int result ) +void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int /*result*/ ) { if ( myDlg ) { diff --git a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx index c6905e049..90d92443b 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx @@ -499,8 +499,8 @@ ItemDelegate::ItemDelegate( QObject* parent ) : QItemDelegate( parent ) */ QWidget* StdMeshersGUI_QuadrangleParamCreator:: ItemDelegate::createEditor( QWidget* parent, - const QStyleOptionViewItem& option, - const QModelIndex& index ) const + const QStyleOptionViewItem& /*option*/, + const QModelIndex& /*index*/ ) const { SMESHGUI_SpinBox* sb = new SMESHGUI_SpinBox( parent ); sb->RangeStepAndValidator( COORD_MIN, COORD_MAX, 10 ); diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx index 7772bc40e..b8d2c8863 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx @@ -1571,7 +1571,7 @@ QString StdMeshersGUI_StdHypothesisCreator::hypTypeName( const QString& t ) cons //purpose : is called from buildStdFrame() //======================================================================= -QWidget* StdMeshersGUI_StdHypothesisCreator::getCustomWidget( const StdParam & param, +QWidget* StdMeshersGUI_StdHypothesisCreator::getCustomWidget( const StdParam & /*param*/, QWidget* parent, const int index) const { @@ -1734,7 +1734,7 @@ void StdMeshersGUI_StdHypothesisCreator::valueChanged( QWidget* paramWidget) */ //================================================================================ -bool StdMeshersGUI_StdHypothesisCreator::initVariableName(SMESH::SMESH_Hypothesis_var theHyp, +bool StdMeshersGUI_StdHypothesisCreator::initVariableName(SMESH::SMESH_Hypothesis_var /*theHyp*/, StdParam & theParams, const char* theMethod) const { diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h index 59febb6c6..b9834b6a6 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h +++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h @@ -63,7 +63,7 @@ protected: virtual void onReject(); virtual void valueChanged( QWidget* ); - bool initVariableName(SMESH::SMESH_Hypothesis_var theHyp, StdParam& theParams, const char* theMethod) const; + bool initVariableName(SMESH::SMESH_Hypothesis_var /*theHyp*/, StdParam& theParams, const char* theMethod) const; QWidget* makeReverseEdgesWdg( SMESH::long_array_var edgeIDs, CORBA::String_var shapeEntry) const; void removeOldGroup(const char* oldName, diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx index 341dcb5da..88e0d8160 100644 --- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx @@ -163,7 +163,7 @@ CORBA::Boolean StdMeshers_Arithmetic1D_i::IsDimSupported( SMESH::Dimension type //================================================================================ std::string StdMeshers_Arithmetic1D_i::getMethodOfParameter(const int paramIndex, - int nbVars) const + int /*nbVars*/) const { return paramIndex == 0 ? "SetStartLength" : "SetEndLength"; } diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx index 0a2957150..1a5e88d35 100644 --- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx @@ -82,7 +82,7 @@ public: std::vector< int > & subIDArray ); protected: - virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; + virtual std::string getMethodOfParameter(const int paramIndex, int /*nbVars*/) const; }; #endif diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx index 4a592477d..d434b00b7 100644 --- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx @@ -67,10 +67,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx index 326f88afb..c3d8c21e0 100644 --- a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx @@ -163,10 +163,10 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i: // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx index 51f6b246b..2fc7e2b72 100644 --- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx @@ -66,10 +66,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_ImportSource1D_i.hxx b/src/StdMeshers_I/StdMeshers_ImportSource1D_i.hxx index e540d0603..8d137c6af 100644 --- a/src/StdMeshers_I/StdMeshers_ImportSource1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ImportSource1D_i.hxx @@ -69,12 +69,12 @@ class STDMESHERS_I_EXPORT StdMeshers_ImportSource1D_i: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } private: SMESH::string_array_var _groupEntries; std::vector< std::string > _groupIDs; diff --git a/src/StdMeshers_I/StdMeshers_ImportSource2D_i.hxx b/src/StdMeshers_I/StdMeshers_ImportSource2D_i.hxx index 39648b68e..4a71f0479 100644 --- a/src/StdMeshers_I/StdMeshers_ImportSource2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ImportSource2D_i.hxx @@ -69,12 +69,12 @@ class STDMESHERS_I_EXPORT StdMeshers_ImportSource2D_i: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } private: SMESH::string_array_var _groupEntries; std::vector< std::string > _groupIDs; diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.hxx b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.hxx index e93179219..2f8a1a1a2 100644 --- a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.hxx @@ -59,12 +59,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.hxx b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.hxx index 7a78eaa32..70832f484 100644 --- a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.hxx @@ -81,12 +81,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: // restore myMethod2VarParams by parameters stored in an old study virtual void setOldParameters (const char* theParameters); diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx index b9bee8123..404e95e20 100644 --- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx @@ -70,12 +70,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx index 91fb23c9c..9c471cfd8 100644 --- a/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx @@ -76,12 +76,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx index 86be0dda4..7d2433a41 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx @@ -137,7 +137,7 @@ CORBA::Boolean StdMeshers_MaxElementArea_i::IsDimSupported( SMESH::Dimension typ */ //================================================================================ -std::string StdMeshers_MaxElementArea_i::getMethodOfParameter(const int paramIndex, +std::string StdMeshers_MaxElementArea_i::getMethodOfParameter(const int /*paramIndex*/, int /*nbVars*/) const { return "SetMaxElementArea"; diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx index 2aa2e4138..379cef763 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx @@ -68,12 +68,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx index 547c3faaa..598f6e67b 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx @@ -67,12 +67,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_MaxLength_i.hxx b/src/StdMeshers_I/StdMeshers_MaxLength_i.hxx index 56f25158b..39b66e423 100644 --- a/src/StdMeshers_I/StdMeshers_MaxLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MaxLength_i.hxx @@ -82,12 +82,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx index 7c04e205d..730b93ac6 100644 --- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx @@ -55,12 +55,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: ::StdMeshers_NotConformAllowed* _impl; }; diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.hxx index ee1b2c0fb..df014dd24 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.hxx @@ -57,12 +57,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.hxx index fe4d73a33..d70ffe716 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.hxx @@ -73,12 +73,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx index eb1ffe8f3..07d58cb6e 100644 --- a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx @@ -63,7 +63,7 @@ StdMeshers_Prism_3D_i::~StdMeshers_Prism_3D_i() } //----------------------------------------------------------------------------- -bool StdMeshers_Prism_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) +bool StdMeshers_Prism_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_Prism_3D::IsApplicable( S, toCheckAll ); } diff --git a/src/StdMeshers_I/StdMeshers_Prism_3D_i.hxx b/src/StdMeshers_I/StdMeshers_Prism_3D_i.hxx index 0ffd21f1a..26446a491 100644 --- a/src/StdMeshers_I/StdMeshers_Prism_3D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Prism_3D_i.hxx @@ -79,7 +79,7 @@ public: ::StdMeshers_RadialPrism_3D* GetImpl(); // Return true if the algorithm is applicable to a shape - static bool IsApplicable(const TopoDS_Shape &S, bool toCheckAll, int dim); + static bool IsApplicable(const TopoDS_Shape &S, bool toCheckAll, int /*dim*/); }; diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx index 9416b4706..2d6d7fa5e 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx @@ -306,7 +306,7 @@ void StdMeshers_ProjectionSource1D_i::LoadFrom( const char* theStream ) bool StdMeshers_ProjectionSource1D_i::getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const + std::vector< int > & /*subIDArray*/ ) const { for ( int i = 0; i < NB_SHAPES; ++i ) entryArray.push_back( myShapeEntries[ i ]); @@ -322,7 +322,7 @@ StdMeshers_ProjectionSource1D_i::getObjectsDependOn( std::vector< std::string > bool StdMeshers_ProjectionSource1D_i::setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) + std::vector< int > & /*subIDArray*/ ) { TopoDS_Shape shapes[ NB_SHAPES ]; for ( int i = 0; i < NB_SHAPES; ++i ) diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.hxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.hxx index 3ec20f551..32ea45799 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.hxx @@ -113,11 +113,11 @@ public: // Return geometry this hypothesis depends on. Return false if there is no geometry parameter virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const; + std::vector< int > & /*subIDArray*/ ) const; // Set new geometry instead of that returned by getObjectsDependOn() virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ); + std::vector< int > & /*subIDArray*/ ); private: // keep entries because the same shape can be published several times with // different names and in this case a correct name can't be restored by a TopoDS_Shape diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx index 04535dcab..fd0c85e23 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx @@ -319,7 +319,7 @@ void StdMeshers_ProjectionSource2D_i::LoadFrom( const char* theStream ) bool StdMeshers_ProjectionSource2D_i::getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const + std::vector< int > & /*subIDArray*/ ) const { for ( int i = 0; i < NB_SHAPES; ++i ) entryArray.push_back( myShapeEntries[ i ]); @@ -335,7 +335,7 @@ StdMeshers_ProjectionSource2D_i::getObjectsDependOn( std::vector< std::string > bool StdMeshers_ProjectionSource2D_i::setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) + std::vector< int > & /*subIDArray*/ ) { TopoDS_Shape shapes[ NB_SHAPES ]; for ( int i = 0; i < NB_SHAPES; ++i ) diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.hxx b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.hxx index 855d57efd..33e4d56bf 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.hxx @@ -118,11 +118,11 @@ public: // Return geometry this hypothesis depends on. Return false if there is no geometry parameter virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const; + std::vector< int > & /*subIDArray*/ ) const; // Set new geometry instead of that returned by getObjectsDependOn() virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ); + std::vector< int > & /*subIDArray*/ ); private: // keep entries because the same shape can be published several times with // different names and in this case a correct name can't be restored by a TopoDS_Shape diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx index 86dc3949d..f81ef5294 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx @@ -320,7 +320,7 @@ void StdMeshers_ProjectionSource3D_i::LoadFrom( const char* theStream ) bool StdMeshers_ProjectionSource3D_i::getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const + std::vector< int > & /*subIDArray*/ ) const { for ( int i = 0; i < NB_SHAPES; ++i ) entryArray.push_back( myShapeEntries[ i ]); @@ -336,7 +336,7 @@ StdMeshers_ProjectionSource3D_i::getObjectsDependOn( std::vector< std::string > bool StdMeshers_ProjectionSource3D_i::setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) + std::vector< int > & /*subIDArray*/ ) { TopoDS_Shape shapes[ NB_SHAPES ]; for ( int i = 0; i < NB_SHAPES; ++i ) diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.hxx b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.hxx index 549a4bb77..55269c4f4 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.hxx @@ -119,11 +119,11 @@ public: // Return geometry this hypothesis depends on. Return false if there is no geometry parameter virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const; + std::vector< int > & /*subIDArray*/ ) const; // Set new geometry instead of that returned by getObjectsDependOn() virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ); + std::vector< int > & /*subIDArray*/ ); private: // keep entries because the same shape can be published several times with diff --git a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx index 85ef8e471..5a9b0cb97 100644 --- a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx @@ -67,7 +67,7 @@ StdMeshers_Projection_3D_i::~StdMeshers_Projection_3D_i() */ //================================================================================ -bool StdMeshers_Projection_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) +bool StdMeshers_Projection_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_Projection_3D::IsApplicable( S, toCheckAll ); } diff --git a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.hxx b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.hxx index 0fc97c809..abcafb0ac 100644 --- a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.hxx @@ -59,7 +59,7 @@ public: ::StdMeshers_Projection_3D* GetImpl(); // Return true if the algorithm is applicable to a shape - static bool IsApplicable(const TopoDS_Shape &S, bool toCheckAll, int dim); + static bool IsApplicable(const TopoDS_Shape &S, bool toCheckAll, int /*dim*/); }; // ====================================================== diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.hxx b/src/StdMeshers_I/StdMeshers_Propagation_i.hxx index 91e491a28..3cb292d4e 100644 --- a/src/StdMeshers_I/StdMeshers_Propagation_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Propagation_i.hxx @@ -54,10 +54,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; // ====================================================== @@ -77,10 +77,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx index 5d0d34755..66e1a2332 100644 --- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx +++ b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx @@ -60,10 +60,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx index b82f7faeb..909a070a0 100644 --- a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx @@ -89,7 +89,7 @@ StdMeshers_Quadrangle_2D_i::~StdMeshers_Quadrangle_2D_i() */ //============================================================================= -bool StdMeshers_Quadrangle_2D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) +bool StdMeshers_Quadrangle_2D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_Quadrangle_2D::IsApplicable( S, toCheckAll ); } diff --git a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx index 277024696..84d7c4a4a 100644 --- a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx +++ b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx @@ -61,10 +61,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx index 5a2c2fb5e..a66a18b95 100644 --- a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx +++ b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx @@ -67,12 +67,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx index 251a9eb56..fdf528912 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx @@ -293,7 +293,7 @@ void StdMeshers_ViscousLayers2D_i::UpdateAsMeshesRestored() //================================================================================ bool -StdMeshers_ViscousLayers2D_i::getObjectsDependOn( std::vector< std::string > & entryArray, +StdMeshers_ViscousLayers2D_i::getObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) const { const ::StdMeshers_ViscousLayers2D* impl = @@ -311,7 +311,7 @@ StdMeshers_ViscousLayers2D_i::getObjectsDependOn( std::vector< std::string > & e //================================================================================ bool -StdMeshers_ViscousLayers2D_i::setObjectsDependOn( std::vector< std::string > & entryArray, +StdMeshers_ViscousLayers2D_i::setObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) { std::vector< int > newIDs; diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.hxx b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.hxx index b5cd610ae..0b7c5f856 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.hxx @@ -82,11 +82,11 @@ class STDMESHERS_I_EXPORT StdMeshers_ViscousLayers2D_i: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) const; // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ); }; diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers_i.cxx b/src/StdMeshers_I/StdMeshers_ViscousLayers_i.cxx index 9bec93b8f..675bd087e 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers_i.cxx @@ -330,7 +330,7 @@ std::string StdMeshers_ViscousLayers_i::getMethodOfParameter(const int paramInde //================================================================================ bool -StdMeshers_ViscousLayers_i::getObjectsDependOn( std::vector< std::string > & entryArray, +StdMeshers_ViscousLayers_i::getObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) const { const ::StdMeshers_ViscousLayers* impl = @@ -348,7 +348,7 @@ StdMeshers_ViscousLayers_i::getObjectsDependOn( std::vector< std::string > & ent //================================================================================ bool -StdMeshers_ViscousLayers_i::setObjectsDependOn( std::vector< std::string > & entryArray, +StdMeshers_ViscousLayers_i::setObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) { std::vector< int > newIDs; diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers_i.hxx b/src/StdMeshers_I/StdMeshers_ViscousLayers_i.hxx index 3e3eaa28a..b5641ca21 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers_i.hxx @@ -80,11 +80,11 @@ class STDMESHERS_I_EXPORT StdMeshers_ViscousLayers_i: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) const; // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ); protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx index 2bd9e4eda..f8543803d 100644 --- a/src/StdMeshers_I/StdMeshers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_i.cxx @@ -84,12 +84,12 @@ namespace SMESH { class ApplicableToAny { public: - static bool IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) + static bool IsApplicable( const TopoDS_Shape &S, bool /*toCheckAll*/, int algoDim ) { return GenericHypothesisCreator_i::IsShapeOfDim( S, algoDim ); } }; -}; +} template class StdHypothesisCreator_i : public HypothesisCreator_i< T > @@ -253,7 +253,7 @@ STDMESHERS_I_EXPORT aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "PolyhedronPerSolid_3D") == 0) aCreator = new StdHypothesisCreator_i; - else ; + //else ; return aCreator; }