in forward declaration replace class keyword when struct is expected

comment out unused parameters
This commit is contained in:
wmayer 2016-12-29 17:52:39 +01:00
parent 35b76c5205
commit 3114df352d
18 changed files with 54 additions and 42 deletions

View File

@ -31,7 +31,7 @@ class SMESH_Mesh;
class StdMeshers_FaceSide;
class TopoDS_Edge;
class TopoDS_Face;
struct _QuadFaceGrid;
class _QuadFaceGrid;
/*!
* \brief Computes hexahedral mesh on a box with composite sides

View File

@ -29,7 +29,7 @@
#include <TColgp_HArray1OfPnt.hxx>
#include <TColgp_HArray1OfVec.hxx>
class SMESH_Mesh;
class SMESH_ElementSearcher;
struct SMESH_ElementSearcher;
class SMDS_MeshElement;
class SMDS_MeshNode;
class SMDS_MeshFace;

View File

@ -780,7 +780,7 @@ SMESH_Hypothesis::Hypothesis_Status
// shape
bool isAlgo = ( !anHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO );
bool isAlgo = !( anHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO );
int event = isAlgo ? SMESH_subMesh::REMOVE_ALGO : SMESH_subMesh::REMOVE_HYP;
SMESH_subMesh *subMesh = GetSubMesh(aSubShape);

View File

@ -29,6 +29,7 @@ uint32_t Gui::GUIApplicationNativeEventAware::lastButtons = 0;
natural_t messageType,
void *messageArgument)
{
Q_UNUSED(connection)
//printf("tdx_drv_handler\n");
//printf("connection: %X\n", connection);
//printf("messageType %c%c%c%c\n", messageType/0x1000000, messageType/0x10000, messageType/0x100, messageType);

View File

@ -133,7 +133,7 @@ namespace Gui
public:
Edge_writer(const GraphEW &graphEWIn) : graphEW(graphEWIn) {}
template <class EdgeW>
void operator()(std::ostream& out, const EdgeW& edgeW) const
void operator()(std::ostream& out, const EdgeW& /*edgeW*/) const
{
out << "[label=\"";
out << "edge";

View File

@ -737,7 +737,7 @@ void FemVTKTools::exportFluidicResult(const App::DocumentObject* res, vtkSmartPo
vars.push_back("TurbulenceDissipationRate");
vars.push_back("TurbulenceSpecificDissipation");
for(auto const& var: vars){
App::PropertyFloatList* field;
App::PropertyFloatList* field = nullptr;
if (res->getPropertyByName(var))
field = static_cast<App::PropertyFloatList*>(res->getPropertyByName(var));
if(!field && !field->getValues().empty()) {

View File

@ -105,7 +105,7 @@ PyObject *PropertyPostDataObject::getPyObject(void)
return new PyObject();
}
void PropertyPostDataObject::setPyObject(PyObject *value)
void PropertyPostDataObject::setPyObject(PyObject * /*value*/)
{
}
@ -167,7 +167,7 @@ unsigned int PropertyPostDataObject::getMemSize (void) const
return m_dataObject->GetActualMemorySize();
}
void PropertyPostDataObject::getPaths(std::vector<App::ObjectIdentifier> &paths) const
void PropertyPostDataObject::getPaths(std::vector<App::ObjectIdentifier> & /*paths*/) const
{
// paths.push_back(App::ObjectIdentifier(getContainer()) << App::ObjectIdentifier::Component::SimpleComponent(getName())
// << App::ObjectIdentifier::Component::SimpleComponent(App::ObjectIdentifier::String("ShapeType")));

View File

@ -143,7 +143,7 @@ ViewProviderPointMarker::~ViewProviderPointMarker()
// TaskDialog
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskDlgPost::TaskDlgPost(Gui::ViewProviderDocumentObject *view,bool newObj)
TaskDlgPost::TaskDlgPost(Gui::ViewProviderDocumentObject *view)
: TaskDialog(), m_view(view)
{
assert(view);
@ -336,6 +336,7 @@ TaskPostClip::TaskPostClip(ViewProviderDocumentObject* view, App::PropertyLink*
assert(view->isDerivedFrom(ViewProviderFemPostClip::getClassTypeId()));
assert(function);
Q_UNUSED(function)
fwidget = NULL;
@ -392,7 +393,7 @@ void TaskPostClip::collectImplicitFunctions() {
}
}
void TaskPostClip::on_CreateButton_triggered(QAction* a) {
void TaskPostClip::on_CreateButton_triggered(QAction*) {
collectImplicitFunctions();
recompute();
@ -827,14 +828,14 @@ void TaskPostWarpVector::on_Value_valueChanged(double v) {
ui->Slider->blockSignals(false);
}
void TaskPostWarpVector::on_Max_valueChanged(double v) {
void TaskPostWarpVector::on_Max_valueChanged(double) {
ui->Slider->blockSignals(true);
ui->Slider->setValue((ui->Value->value() - ui->Min->value()) / (ui->Max->value() - ui->Min->value())*100.);
ui->Slider->blockSignals(false);
}
void TaskPostWarpVector::on_Min_valueChanged(double v) {
void TaskPostWarpVector::on_Min_valueChanged(double) {
ui->Slider->blockSignals(true);
ui->Slider->setValue((ui->Value->value() - ui->Min->value()) / (ui->Max->value() - ui->Min->value())*100.);
@ -848,6 +849,7 @@ TaskPostCut::TaskPostCut(ViewProviderDocumentObject* view, App::PropertyLink* fu
assert(view->isDerivedFrom(ViewProviderFemPostCut::getClassTypeId()));
assert(function);
Q_UNUSED(function)
fwidget = NULL;
@ -900,7 +902,7 @@ void TaskPostCut::collectImplicitFunctions() {
}
}
void TaskPostCut::on_CreateButton_triggered(QAction* a) {
void TaskPostCut::on_CreateButton_triggered(QAction*) {
collectImplicitFunctions();
recompute();

View File

@ -125,7 +125,7 @@ class TaskDlgPost : public Gui::TaskView::TaskDialog
Q_OBJECT
public:
TaskDlgPost(Gui::ViewProviderDocumentObject *view, bool newObj=false);
TaskDlgPost(Gui::ViewProviderDocumentObject *view);
~TaskDlgPost();
void appendBox(TaskPostBox* box);
@ -198,7 +198,7 @@ public:
virtual void applyPythonCode();
private Q_SLOTS:
void on_CreateButton_triggered(QAction* a);
void on_CreateButton_triggered(QAction*);
void on_FunctionBox_currentIndexChanged(int idx);
void on_InsideOut_toggled(bool val);
void on_CutCells_toggled(bool val);
@ -206,7 +206,7 @@ private Q_SLOTS:
private:
void collectImplicitFunctions();
App::PropertyLink* m_functionProperty;
//App::PropertyLink* m_functionProperty;
QWidget* proxy;
Ui_TaskPostClip* ui;
FunctionWidget* fwidget;
@ -276,8 +276,8 @@ public:
private Q_SLOTS:
void on_Slider_valueChanged(int v);
void on_Value_valueChanged(double v);
void on_Max_valueChanged(double v);
void on_Min_valueChanged(double v);
void on_Max_valueChanged(double);
void on_Min_valueChanged(double);
void on_Vector_currentIndexChanged(int idx);
private:
@ -298,13 +298,13 @@ public:
virtual void applyPythonCode();
private Q_SLOTS:
void on_CreateButton_triggered(QAction* a);
void on_CreateButton_triggered(QAction*);
void on_FunctionBox_currentIndexChanged(int idx);
private:
void collectImplicitFunctions();
App::PropertyLink* m_functionProperty;
//App::PropertyLink* m_functionProperty;
QWidget* proxy;
Ui_TaskPostCut* ui;
FunctionWidget* fwidget;

View File

@ -437,7 +437,7 @@ void PlaneWidget::onChange(const App::Property& p) {
setBlockObjectUpdates(false);
}
void PlaneWidget::normalChanged(double val) {
void PlaneWidget::normalChanged(double) {
if(!blockObjectUpdates()) {
Base::Vector3d vec(ui->normalX->value(), ui->normalY->value(), ui->normalZ->value());
@ -445,7 +445,7 @@ void PlaneWidget::normalChanged(double val) {
}
}
void PlaneWidget::originChanged(double val) {
void PlaneWidget::originChanged(double) {
if(!blockObjectUpdates()) {
Base::Vector3d vec(ui->originX->value(), ui->originY->value(), ui->originZ->value());
@ -594,7 +594,7 @@ void SphereWidget::onChange(const App::Property& p) {
setBlockObjectUpdates(false);
}
void SphereWidget::centerChanged(double val) {
void SphereWidget::centerChanged(double) {
if(!blockObjectUpdates()) {
Base::Vector3d vec(ui->centerX->value(), ui->centerY->value(), ui->centerZ->value());
@ -602,7 +602,7 @@ void SphereWidget::centerChanged(double val) {
}
}
void SphereWidget::radiusChanged(double val) {
void SphereWidget::radiusChanged(double) {
if(!blockObjectUpdates()) {
static_cast<Fem::FemPostSphereFunction*>(getObject())->Radius.setValue(ui->radius->value());

View File

@ -133,24 +133,24 @@ public:
//creates the widget used in the task dalogs, either for the function itself or for
//the fiter using it
virtual FunctionWidget* createControlWidget() {return NULL;};
virtual FunctionWidget* createControlWidget() {return NULL;}
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
virtual void onChanged(const App::Property* prop);
void setAutoScale(bool value) {m_autoscale = value;};
bool autoScale() {return m_autoscale;};
void setAutoScale(bool value) {m_autoscale = value;}
bool autoScale() {return m_autoscale;}
bool isDragging() {return m_isDragging;};
bool isDragging() {return m_isDragging;}
virtual SoTransformManip* setupManipulator();
virtual void draggerUpdate(SoDragger* m) {};
SoTransformManip* getManipulator() {return m_manip;};
SoSeparator* getGeometryNode() {return m_geometrySeperator;};
SoScale* getScaleNode() {return m_scale;};
SoTransform* getTransformNode() {return m_transform;};
virtual void draggerUpdate(SoDragger*) {}
SoTransformManip* getManipulator() {return m_manip;}
SoSeparator* getGeometryNode() {return m_geometrySeperator;}
SoScale* getScaleNode() {return m_scale;}
SoTransform* getTransformNode() {return m_transform;}
private:
static void dragStartCallback(void * data, SoDragger * d);
@ -178,8 +178,8 @@ public:
virtual void setViewProvider(ViewProviderFemPostFunction* view);
private Q_SLOTS:
void originChanged(double val);
void normalChanged(double val);
void originChanged(double);
void normalChanged(double);
private:
Ui_PlaneWidget* ui;
@ -214,8 +214,8 @@ public:
virtual void setViewProvider(ViewProviderFemPostFunction* view);
private Q_SLOTS:
void centerChanged(double val);
void radiusChanged(double val);
void centerChanged(double);
void radiusChanged(double);
private:
Ui_SphereWidget* ui;

View File

@ -409,7 +409,7 @@ void ViewProviderFemPostObject::update3D() {
void ViewProviderFemPostObject::WritePointData(vtkPoints* points, vtkDataArray* normals, vtkDataArray* tcoords) {
Q_UNUSED(tcoords)
double *p;
int i;
@ -618,7 +618,7 @@ void ViewProviderFemPostObject::show(void) {
}
void ViewProviderFemPostObject::OnChange(Base::Subject< int >& rCaller, int rcReason) {
void ViewProviderFemPostObject::OnChange(Base::Subject< int >& /*rCaller*/, int /*rcReason*/) {
bool ResetColorBarRange = false;
WriteColorData(ResetColorBarRange);
}

View File

@ -481,6 +481,9 @@ eRefType AttachEngine::getShapeType(const TopoDS_Shape& sh)
case GeomAbs_BezierCurve:
case GeomAbs_BSplineCurve:
case GeomAbs_OtherCurve:
#if OCC_VERSION_HEX >= 0x070000
case GeomAbs_OffsetCurve:
#endif
return rtCurve;
}
}break;

View File

@ -398,7 +398,7 @@ bool GeomCurve::closestParameterToBasicCurve(const Base::Vector3d& point, double
if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))){
Handle_Geom_TrimmedCurve tc = Handle_Geom_TrimmedCurve::DownCast(handle());
Handle_Geom_Curve bc = Handle_Geom_Curve::DownCast(tc->BasisCurve());
Handle_Geom_Curve bc = tc->BasisCurve();
try {
if (!bc.IsNull()) {
gp_Pnt pnt(point.x,point.y,point.z);

View File

@ -309,7 +309,7 @@ bool Geom2dCurve::closestParameterToBasicCurve(const Base::Vector2d& point, doub
if (c->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))){
Handle_Geom2d_TrimmedCurve tc = Handle_Geom2d_TrimmedCurve::DownCast(handle());
Handle_Geom2d_Curve bc = Handle_Geom2d_Curve::DownCast(tc->BasisCurve());
Handle_Geom2d_Curve bc = tc->BasisCurve();
try {
if (!bc.IsNull()) {
gp_Pnt2d pnt(point.x,point.y);

View File

@ -233,6 +233,7 @@ int Part::ImportStepParts(App::Document *pcDoc, const char* Name)
return 0;
}
#if OCC_VERSION_HEX < 0x070000
static void findStyledSR (const Handle(StepVisual_StyledItem) &style,
Handle(StepShape_ShapeRepresentation)& aSR)
{
@ -251,10 +252,13 @@ static void findStyledSR (const Handle(StepVisual_StyledItem) &style,
break;
}
}
#endif
bool Part::ReadColors (const Handle(XSControl_WorkSession) &WS, std::map<int, Quantity_Color>& hash_col)
{
#if OCC_VERSION_HEX >= 0x070000
(void)WS;
(void)hash_col;
return Standard_False;
#else
STEPConstruct_Styles Styles (WS);
@ -387,6 +391,7 @@ bool Part::ReadColors (const Handle(XSControl_WorkSession) &WS, std::map<int, Qu
bool Part::ReadNames (const Handle(XSControl_WorkSession) &WS)
{
#if OCC_VERSION_HEX >= 0x070000
(void)WS;
return Standard_False;
#else
// get starting data

View File

@ -143,6 +143,7 @@ bool EdgeWalker::setSize(int size)
m_g.clear();
for (int i = 0; i < size; i++) {
boost::adjacency_list<>::vertex_descriptor vd = boost::add_vertex(m_g);
(void)vd;
}
return true;
}

View File

@ -83,8 +83,8 @@ private:
std::string saveSym;
std::string saveLabel;
bool saveHorizSectionLine;
bool saveArrowUpSection;
//bool saveHorizSectionLine;
//bool saveArrowUpSection;
Base::Vector3d saveSectionProjDir;
Base::Vector3d saveSectionOrigin;
Base::Vector3d saveSectionNormal;