From c96fd71e4f6a8d6cb6c40887e81fed1e913f6de1 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 3 Apr 2024 07:29:46 +0200 Subject: [PATCH] Fix several compiler warnings * fix -Winconsistent-missing-override * fix -Wunused-but-set-variable * fix -Wunused-parameter * fix -Wunused-lambda-capture * fix -Wunused-private-field * fix -Wpessimizing-move --- src/Gui/Application.cpp | 3 +-- src/Gui/WorkbenchSelector.cpp | 2 +- src/Mod/Part/App/FaceMaker.h | 8 ++++---- src/Mod/Part/App/PartFeature.cpp | 1 + src/Mod/Part/App/WireJoiner.cpp | 2 -- src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h | 2 +- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 3 +++ src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h | 2 -- tests/src/Mod/Part/App/PartFeature.cpp | 7 +++++-- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 4b033b6262..c3ba381216 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -803,8 +803,7 @@ void Application::createStandardOperations() void Application::slotNewDocument(const App::Document& Doc, bool isMainDoc) { #ifdef FC_DEBUG - std::map::const_iterator it = d->documents.find(&Doc); - assert(it==d->documents.end()); + assert(d->documents.find(&Doc) == d->documents.end()); #endif auto pDoc = new Gui::Document(const_cast(&Doc),this); d->documents[&Doc] = pDoc; diff --git a/src/Gui/WorkbenchSelector.cpp b/src/Gui/WorkbenchSelector.cpp index 08e8125cf2..3b1eca1e92 100644 --- a/src/Gui/WorkbenchSelector.cpp +++ b/src/Gui/WorkbenchSelector.cpp @@ -238,7 +238,7 @@ void WorkbenchTabWidget::buildPrefMenu() menu->addSeparator(); QAction* preferencesAction = menu->addAction(tr("Preferences")); - connect(preferencesAction, &QAction::triggered, this, [this]() { + connect(preferencesAction, &QAction::triggered, this, []() { Gui::Dialog::DlgPreferencesImp cDlg(getMainWindow()); cDlg.activateGroupPage(QString::fromUtf8("Workbenches"), 0); cDlg.exec(); diff --git a/src/Mod/Part/App/FaceMaker.h b/src/Mod/Part/App/FaceMaker.h index 663911922d..78e0553a8b 100644 --- a/src/Mod/Part/App/FaceMaker.h +++ b/src/Mod/Part/App/FaceMaker.h @@ -51,11 +51,11 @@ namespace Part class PartExport FaceMaker: public BRepBuilderAPI_MakeShape, public Base::BaseClass { Q_DECLARE_TR_FUNCTIONS(FaceMaker) - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: FaceMaker() {} - virtual ~FaceMaker() {} + ~FaceMaker() override {} void addTopoShape(const TopoShape &s); void useTopoCompound(const TopoShape &comp); @@ -90,7 +90,7 @@ public: #if OCC_VERSION_HEX >= 0x070600 void Build(const Message_ProgressRange& theRange = Message_ProgressRange()) override; #else - virtual void Build(); + void Build() override; #endif //fails to compile, huh! @@ -132,7 +132,7 @@ protected: */ class PartExport FaceMakerPublic : public FaceMaker { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: virtual std::string getUserFriendlyName() const = 0; virtual std::string getBriefExplanation() const = 0; diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp index 9c0cb0088c..16cb49dbfe 100644 --- a/src/Mod/Part/App/PartFeature.cpp +++ b/src/Mod/Part/App/PartFeature.cpp @@ -1186,6 +1186,7 @@ const App::PropertyComplexGeoData* Feature::getPropertyOfGeometry() const bool Feature::isElementMappingDisabled(App::PropertyContainer* container) { + (void)container; #ifdef FC_USE_TNP_FIX return false; #else diff --git a/src/Mod/Part/App/WireJoiner.cpp b/src/Mod/Part/App/WireJoiner.cpp index 0ec3d9a258..08b133cfb2 100644 --- a/src/Mod/Part/App/WireJoiner.cpp +++ b/src/Mod/Part/App/WireJoiner.cpp @@ -1728,9 +1728,7 @@ public: if (FC_LOG_INSTANCE.level() <= FC_LOGLEVEL_TRACE) { return; } - int idx = 0; for (auto &info : edges) { - ++idx; if (auto wire = info.wireInfo.get()) { // Originally here there was a call to the precompiler macro assertCheck(), which diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h index d581a446e6..18c854e0da 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h @@ -249,7 +249,7 @@ private: Obj->getSymmetric(listOfGeoIds, dummy1, dummy2, refGeoId, refPosId); for (auto* geo : symGeos) { - ShapeGeometry.emplace_back(std::move(std::unique_ptr(geo))); + ShapeGeometry.emplace_back(geo); } } } diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 2df37501bc..2f50450ca1 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -22,6 +22,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ +#include #include #include #include @@ -1747,6 +1748,8 @@ void ViewProviderSketch::moveConstraint(Sketcher::Constraint* Constr, int constN assert(int(geomlist.size()) == extGeoCount + intGeoCount); assert((Constr->First >= -extGeoCount && Constr->First < intGeoCount) || Constr->First != GeoEnum::GeoUndef); + boost::ignore_unused(intGeoCount); + boost::ignore_unused(extGeoCount); #endif if (Constr->Type == Distance || Constr->Type == DistanceX || Constr->Type == DistanceY diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h index 6e7568f073..63c733dcd9 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h @@ -59,8 +59,6 @@ protected: private: std::unique_ptr ui; TechDraw::LineGenerator* m_lineGenerator; - - bool m_blockLineStandardOnChanged{false}; }; } // namespace TechDrawGui diff --git a/tests/src/Mod/Part/App/PartFeature.cpp b/tests/src/Mod/Part/App/PartFeature.cpp index 8b234e5bbf..7b0522acf6 100644 --- a/tests/src/Mod/Part/App/PartFeature.cpp +++ b/tests/src/Mod/Part/App/PartFeature.cpp @@ -2,6 +2,7 @@ #include "gtest/gtest.h" +#include #include "Mod/Part/App/FeaturePartCommon.h" #include #include @@ -132,7 +133,6 @@ TEST_F(FeaturePartTest, create) TEST_F(FeaturePartTest, getElementHistory) { // Arrange - const char* name = "Part__Box"; const char* name2 = "Edge2"; // Edge, Vertex, or Face. will work here. // Act auto result = Feature::getElementHistory(_boxes[0], name2, true, false); @@ -156,6 +156,7 @@ TEST_F(FeaturePartTest, getRelatedElements) auto label1 = _common->Label.getValue(); auto label2 = _boxes[1]->Label.getValue(); const TopoShape& ts = _common->Shape.getShape(); + boost::ignore_unused(ts); auto result = Feature::getRelatedElements(_doc->getObject(label1), "Edge2", HistoryTraceType::followTypeChange, @@ -189,6 +190,9 @@ TEST_F(FeaturePartTest, getElementFromSource) auto label1 = _common->Label.getValue(); auto label2 = _boxes[1]->Label.getValue(); const TopoShape& ts = _common->Shape.getShape(); + boost::ignore_unused(label1); + boost::ignore_unused(label2); + boost::ignore_unused(ts); auto element = Feature::getElementFromSource(_common, "Part__Box001", // "Edge1", _boxes[0], @@ -204,7 +208,6 @@ TEST_F(FeaturePartTest, getSubObject) _common->Base.setValue(_boxes[0]); _common->Tool.setValue(_boxes[1]); App::DocumentObject sourceObject; - const char* sourceSubElement; PyObject* pyObj; // Act _common->execute();