fight warnings c++17, fix minor warnings. Build NETGENPLUGIN finished

This commit is contained in:
SALOME 2020-08-26 08:59:41 +03:00
parent e3644a44d0
commit a7f81ddd39
13 changed files with 31 additions and 31 deletions

View File

@ -116,7 +116,7 @@ NETGENPluginGUI_HypothesisCreator::~NETGENPluginGUI_HypothesisCreator()
{ {
} }
bool NETGENPluginGUI_HypothesisCreator::checkParams(QString& msg) const bool NETGENPluginGUI_HypothesisCreator::checkParams(QString& /*msg*/) const
{ {
NetgenHypothesisData data_old, data_new; NetgenHypothesisData data_old, data_new;
readParamsFromHypo( data_old ); readParamsFromHypo( data_old );

View File

@ -63,7 +63,7 @@ public:
NETGENPluginGUI_HypothesisCreator( const QString& ); NETGENPluginGUI_HypothesisCreator( const QString& );
virtual ~NETGENPluginGUI_HypothesisCreator(); virtual ~NETGENPluginGUI_HypothesisCreator();
virtual bool checkParams(QString& msg) const; virtual bool checkParams(QString& /*msg*/) const;
virtual QString helpPage() const; virtual QString helpPage() const;
protected: protected:

View File

@ -642,8 +642,8 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load)
* \retval bool - always false * \retval bool - always false
*/ */
//================================================================================ //================================================================================
bool NETGENPlugin_Hypothesis::SetParametersByMesh(const SMESH_Mesh* theMesh, bool NETGENPlugin_Hypothesis::SetParametersByMesh(const SMESH_Mesh* /*theMesh*/,
const TopoDS_Shape& theShape) const TopoDS_Shape& /*theShape*/)
{ {
return false; return false;
} }

View File

@ -156,7 +156,7 @@ public:
* \param theShape - the geometry of interest * \param theShape - the geometry of interest
* \retval bool - always false * \retval bool - always false
*/ */
virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); virtual bool SetParametersByMesh(const SMESH_Mesh* /*theMesh*/, const TopoDS_Shape& /*theShape*/);
/*! /*!
* \brief Initialize my parameter values by default parameters. * \brief Initialize my parameter values by default parameters.

View File

@ -711,7 +711,7 @@ std::string NETGENPlugin_Hypothesis_i::getMethodOfParameter(const int paramIndex
bool bool
NETGENPlugin_Hypothesis_i::getObjectsDependOn( std::vector< std::string > & entryArray, NETGENPlugin_Hypothesis_i::getObjectsDependOn( std::vector< std::string > & entryArray,
std::vector< int > & subIDArray ) const std::vector< int > & /*subIDArray*/ ) const
{ {
typedef ::NETGENPlugin_Hypothesis THyp; typedef ::NETGENPlugin_Hypothesis THyp;
@ -733,7 +733,7 @@ NETGENPlugin_Hypothesis_i::getObjectsDependOn( std::vector< std::string > & entr
bool bool
NETGENPlugin_Hypothesis_i::setObjectsDependOn( std::vector< std::string > & entryArray, NETGENPlugin_Hypothesis_i::setObjectsDependOn( std::vector< std::string > & entryArray,
std::vector< int > & subIDArray ) std::vector< int > & /*subIDArray*/ )
{ {
typedef ::NETGENPlugin_Hypothesis THyp; typedef ::NETGENPlugin_Hypothesis THyp;

View File

@ -133,11 +133,11 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis_i:
// Return geometry this hypothesis depends on. Return false if there is no geometry parameter // 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; std::vector< int > & /*subIDArray*/ ) const;
// Set new geometry instead of that returned by getObjectsDependOn() // 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 ); std::vector< int > & /*subIDArray*/ );
protected: protected:

View File

@ -205,7 +205,7 @@ namespace
list< TopoDS_Edge > getConnectedEdges( const TopoDS_Edge& edge, list< TopoDS_Edge > getConnectedEdges( const TopoDS_Edge& edge,
const TopoDS_Face& face, const TopoDS_Face& face,
const set< SMESH_subMesh* > & computedSM, const set< SMESH_subMesh* > & /*computedSM*/,
const SMESH_MesherHelper& helper, const SMESH_MesherHelper& helper,
map< SMESH_subMesh*, set< int > >& addedEdgeSM2Faces) map< SMESH_subMesh*, set< int > >& addedEdgeSM2Faces)
{ {
@ -3712,7 +3712,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap)
return true; return true;
} }
double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* /*holder*/,
const int * algoProgressTic, const int * algoProgressTic,
const double * algoProgress) const const double * algoProgress) const
{ {

View File

@ -132,7 +132,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Mesher
bool Evaluate(MapShapeNbElems& aResMap); bool Evaluate(MapShapeNbElems& aResMap);
double GetProgress(const SMESH_Algo* holder, double GetProgress(const SMESH_Algo* /*holder*/,
const int * algoProgressTic, const int * algoProgressTic,
const double * algoProgress) const; const double * algoProgress) const;

View File

@ -852,8 +852,8 @@ bool NETGENPlugin_Remesher_2D::Compute(SMESH_Mesh& theMesh,
*/ */
//============================================================================= //=============================================================================
bool NETGENPlugin_Remesher_2D::Compute(SMESH_Mesh& theMesh, bool NETGENPlugin_Remesher_2D::Compute(SMESH_Mesh& /*theMesh*/,
const TopoDS_Shape& theShape) const TopoDS_Shape& /*theShape*/)
{ {
return false; return false;
} }
@ -887,9 +887,9 @@ double NETGENPlugin_Remesher_2D::GetProgress() const
*/ */
//============================================================================= //=============================================================================
bool NETGENPlugin_Remesher_2D::Evaluate(SMESH_Mesh& aMesh, bool NETGENPlugin_Remesher_2D::Evaluate(SMESH_Mesh& /*aMesh*/,
const TopoDS_Shape& aShape, const TopoDS_Shape& /*aShape*/,
MapShapeNbElems& aResMap) MapShapeNbElems& /*aResMap*/)
{ {
return false; return false;
} }

View File

@ -43,16 +43,16 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Remesher_2D: public SMESH_2D_Algo
virtual bool Compute(SMESH_Mesh & theMesh, SMESH_MesherHelper* theHelper); virtual bool Compute(SMESH_Mesh & theMesh, SMESH_MesherHelper* theHelper);
virtual bool Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape); virtual bool Compute(SMESH_Mesh& /*theMesh*/, const TopoDS_Shape& /*theShape*/);
virtual void CancelCompute(); virtual void CancelCompute();
virtual double GetProgress() const; virtual double GetProgress() const;
virtual bool Evaluate(SMESH_Mesh& theMesh, virtual bool Evaluate(SMESH_Mesh& /*theMesh*/,
const TopoDS_Shape& theShape, const TopoDS_Shape& /*theShape*/,
MapShapeNbElems& theResMap); MapShapeNbElems& /*theResMap*/);
protected: protected:

View File

@ -236,7 +236,7 @@ int NETGENPlugin_SimpleHypothesis_2D_i::getParamIndex(const TCollection_AsciiStr
//================================================================================ //================================================================================
std::string NETGENPlugin_SimpleHypothesis_2D_i::getMethodOfParameter(const int paramIndex, std::string NETGENPlugin_SimpleHypothesis_2D_i::getMethodOfParameter(const int paramIndex,
int nbVars) const int /*nbVars*/) const
{ {
switch ( paramIndex ) { switch ( paramIndex ) {
case 0: return GetImpl()->GetNumberOfSegments() ? "SetNumberOfSegments" : "SetLocalLength"; case 0: return GetImpl()->GetNumberOfSegments() ? "SetNumberOfSegments" : "SetLocalLength";

View File

@ -79,18 +79,18 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_2D_i:
// method used to convert variable parameters stored in an old study // method used to convert variable parameters stored in an old study
// into myMethod2VarParams. It should return a method name for an index of // into myMethod2VarParams. It should return a method name for an index of
// variable parameters. Index is countered from zero // variable parameters. Index is countered from zero
virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; virtual std::string getMethodOfParameter(const int paramIndex, int /*nbVars*/) const;
// Methods for copying mesh definition to other geometry // Methods for copying mesh definition to other geometry
// Return geometry this hypothesis depends on. Return false if there is no geometry parameter // 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 { return 0; } std::vector< int > & /*subIDArray*/ ) const { return 0; }
// Set new geometry instead of that returned by getObjectsDependOn() // 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 ) { return true; } std::vector< int > & /*subIDArray*/ ) { return true; }
}; };
#endif #endif

View File

@ -63,12 +63,12 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_3D_i:
// Methods for copying mesh definition to other geometry // Methods for copying mesh definition to other geometry
// Return geometry this hypothesis depends on. Return false if there is no geometry parameter // 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 { return 0; } std::vector< int > & /*subIDArray*/ ) const { return 0; }
// Set new geometry instead of that returned by getObjectsDependOn() // 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 ) { return true; } std::vector< int > & /*subIDArray*/ ) { return true; }
}; };
#endif #endif