fight warnings, c++17. Fix minor warnings. Build SMESH finished

This commit is contained in:
Viktor UZLOV 2020-08-28 18:03:59 +03:00
parent f83eeba172
commit a9f7e28cba
60 changed files with 153 additions and 153 deletions

View File

@ -72,7 +72,7 @@ public:
namespace PluginUtils
{
PLUGINUTILS_EXPORT QString PrintDoubleValue( double, int = 16 );
};
}
#endif // _GEOMSELECTIONTOOLS_H_

View File

@ -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();

View File

@ -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

View File

@ -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:

View File

@ -55,7 +55,7 @@ namespace SMESH
FirstEntityTypeFilter = FirstGeometryTypeFilter + SMDSGeom_NONE,
LastFilter = FirstEntityTypeFilter + SMDSEntity_Last
};
};
}
/*
Class : SMESHGUI_Filter

View File

@ -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<int> 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<int, QString>& 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);

View File

@ -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());

View File

@ -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;

View File

@ -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 };

View File

@ -72,7 +72,7 @@ namespace SMESH
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI_MergeDlg : public QDialog
{
Q_OBJECT;
Q_OBJECT
public:
SMESHGUI_MergeDlg( SMESHGUI*, int );

View File

@ -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 );

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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;

View File

@ -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 );

View File

@ -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*/)
{

View File

@ -534,7 +534,7 @@ namespace StdMeshersGUI
//================================================================================
QWidget* LineDelegate::createEditor( QWidget* parent,
const QStyleOptionViewItem& opt,
const QStyleOptionViewItem& /*opt*/,
const QModelIndex& index) const
{
QWidget* w = 0;

View File

@ -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;

View File

@ -224,7 +224,7 @@ void StdMeshersGUI_LayerDistributionParamWdg::onEdit()
}
}
void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int result )
void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int /*result*/ )
{
if ( myDlg )
{

View File

@ -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 );

View File

@ -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
{

View File

@ -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,

View File

@ -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";
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;
};

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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);

View File

@ -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

View File

@ -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;
};

View File

@ -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";

View File

@ -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;

View File

@ -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;
};

View File

@ -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;
};

View File

@ -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;
};

View File

@ -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

View File

@ -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;
};

View File

@ -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 );
}

View File

@ -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*/);
};

View File

@ -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 )

View File

@ -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

View File

@ -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 )

View File

@ -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

View File

@ -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 )

View File

@ -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

View File

@ -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 );
}

View File

@ -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*/);
};
// ======================================================

View File

@ -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

View File

@ -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

View File

@ -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 );
}

View File

@ -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

View File

@ -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;
};

View File

@ -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;

View File

@ -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 );
};

View File

@ -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;

View File

@ -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;

View File

@ -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 T, class TIsApplicable = SMESH::ApplicableToAny>
class StdHypothesisCreator_i : public HypothesisCreator_i< T >
@ -253,7 +253,7 @@ STDMESHERS_I_EXPORT
aCreator = new StdHypothesisCreator_i<StdMeshers_PolygonPerFace_2D_i>;
else if (strcmp(aHypName, "PolyhedronPerSolid_3D") == 0)
aCreator = new StdHypothesisCreator_i<StdMeshers_PolyhedronPerSolid_3D_i>;
else ;
//else ;
return aCreator;
}