diff --git a/src/Mod/Material/Gui/Array2D.cpp b/src/Mod/Material/Gui/Array2D.cpp index 234c608dfc..e2fc7d40f9 100644 --- a/src/Mod/Material/Gui/Array2D.cpp +++ b/src/Mod/Material/Gui/Array2D.cpp @@ -140,8 +140,6 @@ void Array2D::onDataChanged(const QModelIndex& topLeft, void Array2D::onContextMenu(const QPoint& pos) { - QModelIndex index = ui->tableView->indexAt(pos); - QMenu contextMenu(tr("Context menu"), this); contextMenu.addAction(&_deleteAction); diff --git a/src/Mod/Material/Gui/ListDelegate.h b/src/Mod/Material/Gui/ListDelegate.h index 8ff627a3f2..c336c54c50 100644 --- a/src/Mod/Material/Gui/ListDelegate.h +++ b/src/Mod/Material/Gui/ListDelegate.h @@ -54,10 +54,12 @@ public: protected: Materials::MaterialValue::ValueType getType(const QModelIndex& index) const override { + Q_UNUSED(index) return _type; } QString getUnits(const QModelIndex& index) const override { + Q_UNUSED(index) return _units; } QVariant getValue(const QModelIndex& index) const override; diff --git a/src/Mod/Material/Gui/MaterialDelegate.cpp b/src/Mod/Material/Gui/MaterialDelegate.cpp index d3787e6d46..414f4cc1b3 100644 --- a/src/Mod/Material/Gui/MaterialDelegate.cpp +++ b/src/Mod/Material/Gui/MaterialDelegate.cpp @@ -263,7 +263,7 @@ void MaterialDelegate::showImageModal(const QString& propertyName, QStandardItem dlg->adjustSize(); - connect(dlg, &QDialog::finished, this, [&](int result) {}); + //connect(dlg, &QDialog::finished, this, [&](int result) {}); dlg->exec(); } @@ -277,7 +277,7 @@ void MaterialDelegate::showListModal(const QString& propertyName, QStandardItem* dlg->adjustSize(); - connect(dlg, &QDialog::finished, this, [&](int result) {}); + //connect(dlg, &QDialog::finished, this, [&](int result) {}); dlg->exec(); } @@ -291,7 +291,7 @@ void MaterialDelegate::showMultiLineStringModal(const QString& propertyName, QSt dlg->adjustSize(); - connect(dlg, &QDialog::finished, this, [&](int result) {}); + //connect(dlg, &QDialog::finished, this, [&](int result) {}); dlg->exec(); } @@ -306,7 +306,7 @@ void MaterialDelegate::showArray2DModal(const QString& propertyName, QStandardIt dlg->adjustSize(); - connect(dlg, &QDialog::finished, this, [&](int result) {}); + //connect(dlg, &QDialog::finished, this, [&](int result) {}); dlg->exec(); } @@ -320,7 +320,7 @@ void MaterialDelegate::showArray3DModal(const QString& propertyName, QStandardIt dlg->adjustSize(); - connect(dlg, &QDialog::finished, this, [&](int result) {}); + //connect(dlg, &QDialog::finished, this, [&](int result) {}); dlg->exec(); } diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp index d2c3cc2508..defc306520 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.cpp +++ b/src/Mod/Material/Gui/MaterialsEditor.cpp @@ -63,8 +63,8 @@ MaterialsEditor::MaterialsEditor(QWidget* parent) : QDialog(parent) , ui(new Ui_MaterialsEditor) , _material(std::make_shared()) - , _edited(false) , _rendered(nullptr) + , _edited(false) , _recentMax(0) { ui->setupUi(this); diff --git a/src/Mod/Part/App/FaceMakerBullseye.h b/src/Mod/Part/App/FaceMakerBullseye.h index 7bd47fbde4..65d9c6c1b2 100644 --- a/src/Mod/Part/App/FaceMakerBullseye.h +++ b/src/Mod/Part/App/FaceMakerBullseye.h @@ -52,7 +52,7 @@ public: * planar or on the supplied plane, potentially speeding things up. * @param plane FIXME: the plane is not propagated if processing compounds. */ - void setPlane(const gp_Pln& plane); + void setPlane(const gp_Pln& plane) override; std::string getUserFriendlyName() const override; std::string getBriefExplanation() const override; diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp index 8759347ccd..95c9c650d4 100644 --- a/src/Mod/Part/App/Geometry.cpp +++ b/src/Mod/Part/App/Geometry.cpp @@ -1332,12 +1332,12 @@ GeomBSplineCurve::GeomBSplineCurve( const std::vector& poles, co TColStd_Array1OfReal k(1,knots.size()); TColStd_Array1OfInteger m(1,knots.size()); - for (int index = 1; index <= poles.size(); index++) { + for (std::size_t index = 1; index <= poles.size(); index++) { p.SetValue(index, gp_Pnt(poles[index -1].x,poles[index -1].y,poles[index -1].z)); w.SetValue(index, weights[index -1]); } - for (int index = 1; index <= knots.size(); index++) { + for (std::size_t index = 1; index <= knots.size(); index++) { k.SetValue(index, knots[index -1]); m.SetValue(index, multiplicities[index -1]); } diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 1ed836d493..2fa37d1018 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -1991,7 +1991,6 @@ TopoDS_Compound Hole::findHoles(const TopoDS_Shape& profileshape, builder.MakeCompound(holes); TopTools_IndexedMapOfShape edgeMap; TopExp::MapShapes(profileshape, TopAbs_EDGE, edgeMap); - int holePointsListSize = 0; std::vector holePointsList; for (int i = 1; i <= edgeMap.Extent(); i++) { bool dupCenter = false; diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp index 3674a81e5a..e50b604906 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp @@ -138,9 +138,6 @@ void ViewProviderTrajectory::updateData(const App::Property* prop) } pcLines->numVertices.set1Value(0, trak.getSize()); } - else if (prop == &pcTracObj->Base) { - Base::Placement loc = *(&pcTracObj->Base.getValue()); - } } void ViewProviderTrajectory::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) diff --git a/src/Mod/Sketcher/App/PythonConverter.cpp b/src/Mod/Sketcher/App/PythonConverter.cpp index a39349efac..af88bcf7cc 100644 --- a/src/Mod/Sketcher/App/PythonConverter.cpp +++ b/src/Mod/Sketcher/App/PythonConverter.cpp @@ -560,7 +560,7 @@ std::string PythonConverter::process(const Sketcher::Constraint* constraint, Geo [](const Sketcher::Constraint* constr, std::string& geoId1, std::string& geoId2, - std::string& geoId3) { + [[maybe_unused]] std::string& geoId3) { if (constr->Second == GeoEnum::GeoUndef) { return boost::str(boost::format("Sketcher.Constraint('DistanceX', %s, %f)") % geoId1 % constr->getValue()); diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp index df487b2b23..a86d8afcee 100644 --- a/src/Mod/Sketcher/App/Sketch.cpp +++ b/src/Mod/Sketcher/App/Sketch.cpp @@ -3389,7 +3389,7 @@ int Sketch::addDistanceConstraint(int geoId1, int geoId2, double* value, bool dr return ConstraintsCounter; } else { - GCS::Circle *c1, *c2; + GCS::Circle *c1 {}, *c2 {}; if (Geoms[geoId1].type == Circle) { c1 = &Circles[Geoms[geoId1].index]; } diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.ui b/src/Mod/Sketcher/Gui/SketcherSettings.ui index e7202a0aeb..bffa7599b6 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettings.ui @@ -251,7 +251,7 @@ This setting is only for the toolbar. Whichever you choose, all tools are always - + 0 diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index b9a439fc39..18e92f740c 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -1276,6 +1276,7 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe case STATUS_SKETCH_DragConstraint: case STATUS_SKETCH_StartRubberBand: case STATUS_SKETCH_UseRubberBand: + case STATUS_SELECT_Wire: break; } } @@ -3976,9 +3977,8 @@ void ViewProviderSketch::generateContextMenu() if (isBsplineKnotOrEndPoint(obj, geoId, posId)) { ++selectedBsplineKnots; } - if (Sketcher::PointPos::start != posId || Sketcher::PointPos::end != posId) { - ++selectedEndPoints; - } + + ++selectedEndPoints; } else if (name.substr(0, 4) == "Cons") { ++selectedConstraints;