From 9e4def7104b7e0d38edde7b9017f2c56acbe6e49 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 30 Apr 2024 16:23:23 +0200 Subject: [PATCH 1/3] Part: Remove cyclic dependency to Measure module Although there is no cyclic dependency between the shared libraries it's still odd to have it on source files --- src/Mod/Part/App/MeasureClient.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Mod/Part/App/MeasureClient.cpp b/src/Mod/Part/App/MeasureClient.cpp index 0c099a78a0..002ad7581b 100644 --- a/src/Mod/Part/App/MeasureClient.cpp +++ b/src/Mod/Part/App/MeasureClient.cpp @@ -53,13 +53,6 @@ #include #include -#include -#include -#include -#include -#include -#include - #include "VectorAdapter.h" #include "PartFeature.h" From 56f84c80429bd8fa869fa773e0f6d9ce5824fc9e Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 30 Apr 2024 16:59:31 +0200 Subject: [PATCH 2/3] Fix various compiler warnings: * fix -Wunused-parameter * fix -Wunused-function * fix -Wunused-private-field * fix -Wunused-variable * fix -Winconsistent-missing-override --- src/App/MeasureManagerPy.xml | 2 +- src/App/MeasureManagerPyImp.cpp | 6 +++--- src/Gui/TaskMeasure.h | 3 --- src/Mod/Measure/App/MeasureBase.h | 2 +- src/Mod/Measure/App/MeasureLength.h | 2 +- src/Mod/Measure/Gui/Command.cpp | 3 +-- src/Mod/Part/App/TopoShape.cpp | 1 + src/Mod/PartDesign/App/FeatureExtrude.cpp | 1 - src/Mod/PartDesign/App/FeatureSketchBased.cpp | 2 +- src/Mod/Sketcher/Gui/DrawSketchHandler.cpp | 1 - src/Mod/Start/App/ExamplesModel.cpp | 1 - src/Mod/Start/Gui/AppStartGui.cpp | 1 + tests/src/Mod/Part/App/TopoShapeExpansion.cpp | 1 + .../Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp | 10 +++++----- 14 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/App/MeasureManagerPy.xml b/src/App/MeasureManagerPy.xml index e2cd74efec..51b082c6ce 100644 --- a/src/App/MeasureManagerPy.xml +++ b/src/App/MeasureManagerPy.xml @@ -32,7 +32,7 @@ measureType : Measure.MeasureBasePython The actual measure type. - + getMeasureTypes() -> List[(id, label, pythonMeasureType)] diff --git a/src/App/MeasureManagerPyImp.cpp b/src/App/MeasureManagerPyImp.cpp index 46103b7f51..be7854b98e 100644 --- a/src/App/MeasureManagerPyImp.cpp +++ b/src/App/MeasureManagerPyImp.cpp @@ -63,7 +63,7 @@ PyObject* MeasureManagerPy::addMeasureType(PyObject *args) } -PyObject* MeasureManagerPy::getMeasureTypes(PyObject *args) +PyObject* MeasureManagerPy::getMeasureTypes() { Py::List types; for (auto & it : MeasureManager::getMeasureTypes()) { @@ -73,7 +73,7 @@ PyObject* MeasureManagerPy::getMeasureTypes(PyObject *args) type.setItem(2, Py::Object(it->pythonClass)); types.append(type); - } + } return Py::new_reference_to(types); -} \ No newline at end of file +} diff --git a/src/Gui/TaskMeasure.h b/src/Gui/TaskMeasure.h index ed92e6ab6e..e4d394fb6c 100644 --- a/src/Gui/TaskMeasure.h +++ b/src/Gui/TaskMeasure.h @@ -60,14 +60,11 @@ public: void setMeasureObject(Measure::MeasureBase* obj); private: - QColumnView* dialog{nullptr}; - void onSelectionChanged(const Gui::SelectionChanges& msg) override; Measure::MeasureBase *_mMeasureObject = nullptr; QLineEdit* valueResult{nullptr}; - QLabel* labelResult{nullptr}; QComboBox* modeSwitch{nullptr}; void removeObject(); diff --git a/src/Mod/Measure/App/MeasureBase.h b/src/Mod/Measure/App/MeasureBase.h index fe256dc940..42dd209d8c 100644 --- a/src/Mod/Measure/App/MeasureBase.h +++ b/src/Mod/Measure/App/MeasureBase.h @@ -67,7 +67,7 @@ public: virtual QString getResultString(); virtual std::vector getInputProps(); - virtual App::Property* getResultProp() {return {};}; + virtual App::Property* getResultProp() {return {};} virtual Base::Placement getPlacement(); // Return the objects that are measured diff --git a/src/Mod/Measure/App/MeasureLength.h b/src/Mod/Measure/App/MeasureLength.h index 3942925754..6904205a7e 100644 --- a/src/Mod/Measure/App/MeasureLength.h +++ b/src/Mod/Measure/App/MeasureLength.h @@ -63,7 +63,7 @@ public: App::Property* getResultProp() override {return &this->Length;} // Return a placement for the viewprovider, just use the first element for now - Base::Placement getPlacement(); + Base::Placement getPlacement() override; // Return the object we are measuring std::vector getSubject() const override; diff --git a/src/Mod/Measure/Gui/Command.cpp b/src/Mod/Measure/Gui/Command.cpp index f7cbe5442f..c47a5638af 100644 --- a/src/Mod/Measure/Gui/Command.cpp +++ b/src/Mod/Measure/Gui/Command.cpp @@ -29,5 +29,4 @@ using namespace std; void CreateMeasureCommands() { Base::Console().Message("Init MeasureGui\n"); - Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager(); -} \ No newline at end of file +} diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 7090a17108..cf6acf1ba1 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -4081,6 +4081,7 @@ bool TopoShape::findPlane(gp_Pln& pln, double tol, double atol) const } #else bool TopoShape::findPlane(gp_Pln &pln, double tol, double atol) const { + (void)atol; if(_Shape.IsNull()) return false; TopoDS_Shape shape = _Shape; diff --git a/src/Mod/PartDesign/App/FeatureExtrude.cpp b/src/Mod/PartDesign/App/FeatureExtrude.cpp index f5bdc15e57..0f51b74881 100644 --- a/src/Mod/PartDesign/App/FeatureExtrude.cpp +++ b/src/Mod/PartDesign/App/FeatureExtrude.cpp @@ -431,7 +431,6 @@ App::DocumentObjectExecReturn* FeatureExtrude::buildExtrusion(ExtrudeOptions opt bool makeface = options.testFlag(ExtrudeOption::MakeFace); bool fuse = options.testFlag(ExtrudeOption::MakeFuse); bool legacyPocket = options.testFlag(ExtrudeOption::LegacyPocket); - bool inverseDirection = options.testFlag(ExtrudeOption::InverseDirection); std::string method(Type.getValueAsString()); diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp index ebf18c3402..964f9fe014 100644 --- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp +++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp @@ -280,7 +280,7 @@ TopoDS_Shape ProfileBased::getVerifiedFace(bool silent) const { } TopoShape ProfileBased::getTopoShapeVerifiedFace(bool silent, - bool doFit, + [[maybe_unused]]bool doFit, // TODO: Remove parameter bool allowOpen, const App::DocumentObject* profile, const std::vector& _subs) const diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp index 8344a427b5..9bf503e569 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp @@ -996,7 +996,6 @@ void DrawSketchHandler::createAutoConstraints(const std::vector& geoId2); } break; case Sketcher::Symmetric: { - Sketcher::PointPos posId2 = cstr.PosId; Gui::cmdAppObjectArgs( sketchgui->getObject(), "addConstraint(Sketcher.Constraint('Symmetric',%d,1,%d,2,%d,%d)) ", diff --git a/src/Mod/Start/App/ExamplesModel.cpp b/src/Mod/Start/App/ExamplesModel.cpp index 9d6bb6d3b2..c1b8c10334 100644 --- a/src/Mod/Start/App/ExamplesModel.cpp +++ b/src/Mod/Start/App/ExamplesModel.cpp @@ -31,7 +31,6 @@ using namespace Start; -FC_LOG_LEVEL_INIT(ExamplesModel) ExamplesModel::ExamplesModel(QObject* parent) : DisplayedFilesModel(parent) diff --git a/src/Mod/Start/Gui/AppStartGui.cpp b/src/Mod/Start/Gui/AppStartGui.cpp index ad2898e9dc..561485d147 100644 --- a/src/Mod/Start/Gui/AppStartGui.cpp +++ b/src/Mod/Start/Gui/AppStartGui.cpp @@ -115,6 +115,7 @@ PyObject* initModule() PyMOD_INIT_FUNC(StartGui) { static StartGui::StartLauncher* launcher = new StartGui::StartLauncher(); + Q_UNUSED(launcher) Base::Console().Log("Loading GUI of Start module... "); PyObject* mod = StartGui::initModule(); diff --git a/tests/src/Mod/Part/App/TopoShapeExpansion.cpp b/tests/src/Mod/Part/App/TopoShapeExpansion.cpp index 44652a97d2..36ca66be35 100644 --- a/tests/src/Mod/Part/App/TopoShapeExpansion.cpp +++ b/tests/src/Mod/Part/App/TopoShapeExpansion.cpp @@ -1803,6 +1803,7 @@ TEST_F(TopoShapeExpansionTest, makeElementThickSolid) std::vector shapes = {subFaces[0], subFaces[1]}; // Act TopoShape& result = cube1TS.makeElementThickSolid(cube1TS, shapes, 0.1, 1e-07); + (void)result; auto elements = elementMap(cube1TS); // Assert EXPECT_EQ(cube1TS.countSubElements("Wire"), 16); diff --git a/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp b/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp index 64a1b579c1..e002cdedec 100644 --- a/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp +++ b/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp @@ -312,11 +312,11 @@ TEST_F(TopoShapeMakeShapeWithElementMapTests, findMakerOpInElementMap) EXPECT_EQ(tmpShape.getElementMapSize(), 26); // For all the mappedElements ... - for (const auto& mappedElement : tmpShape.getElementMap()) { - // TODO: This no longer works, it needs a different check. We don't set MAK - // EXPECT_NE(mappedElement.name.find(OpCodes::Maker), - // -1); // ... we check that there's the "MAK" OpCode - } + // for (const auto& mappedElement : tmpShape.getElementMap()) { + // TODO: This no longer works, it needs a different check. We don't set MAK + // EXPECT_NE(mappedElement.name.find(OpCodes::Maker), + // -1); // ... we check that there's the "MAK" OpCode + //} } } From 787573f9b34fc2ac28887c306cd1adb92c9cc36a Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 30 Apr 2024 17:00:27 +0200 Subject: [PATCH 3/3] Start: fix possible build failure --- src/Mod/Start/Gui/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index 863164955f..d120018941 100644 --- a/src/Mod/Start/Gui/CMakeLists.txt +++ b/src/Mod/Start/Gui/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} + ${COIN3D_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${QtCore_INCLUDE_DIRS} ${QtSvg_INCLUDE_DIRS}