From 4be6a64abb4e060222937c8f151b8e41b3bf01ec Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 9 Aug 2025 10:22:03 -0500 Subject: [PATCH 1/8] Part: Remove unused arguments from isLinearEdge --- src/Mod/Part/App/TopoShape.h | 2 +- src/Mod/Part/App/TopoShapeExpansion.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index 78b3c2e231..816c539387 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -497,7 +497,7 @@ public: /// Checks whether the shape is a planar face bool isPlanar(double tol = 1.0e-7) const; // NOLINT /// Check if this shape is a single linear edge, works on BSplineCurve and BezierCurve - bool isLinearEdge(Base::Vector3d *dir = nullptr, Base::Vector3d *base = nullptr) const; + bool isLinearEdge() const; /// Check if this shape is a single planar face, works on BSplineSurface and BezierSurface bool isPlanarFace(double tol=1e-7) const; // NOLINT //@} diff --git a/src/Mod/Part/App/TopoShapeExpansion.cpp b/src/Mod/Part/App/TopoShapeExpansion.cpp index 405b64a97b..34c8dd6a9a 100644 --- a/src/Mod/Part/App/TopoShapeExpansion.cpp +++ b/src/Mod/Part/App/TopoShapeExpansion.cpp @@ -5314,7 +5314,7 @@ TopoShape TopoShape::splitWires(std::vector* inner, SplitWireReorient return TopoShape {}; } -bool TopoShape::isLinearEdge(Base::Vector3d* dir, Base::Vector3d* base) const +bool TopoShape::isLinearEdge() const { if (isNull() || getShape().ShapeType() != TopAbs_EDGE) { return false; From 3f85cf14d3b4d436eab0b0565292eb40d6e6e30b Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 9 Aug 2025 10:50:25 -0500 Subject: [PATCH 2/8] Gui: For Qt 6.5 and later, use ParseOptions in xml --- src/Gui/CommandView.cpp | 10 ++++++++++ src/Gui/DocumentRecovery.cpp | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 9c04617983..c3f841c7b6 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -480,6 +480,15 @@ void StdCmdFreezeViews::onRestoreViews() } QDomDocument xmlDocument; + +#if QT_VERSION >= QT_VERSION_CHECK(6,5,0) + if (const auto result = xmlDocument.setContent(&file, QDomDocument::ParseOption::UseNamespaceProcessing); !result) { + std::cerr << "Parse error in XML content at line " << result.errorLine + << ", column " << result.errorColumn << ": " + << qPrintable(result.errorMessage) << std::endl; + return; + } +#else QString errorStr; int errorLine; int errorColumn; @@ -491,6 +500,7 @@ void StdCmdFreezeViews::onRestoreViews() << (const char*)errorStr.toLatin1() << std::endl; return; } +#endif // get the root element QDomElement root = xmlDocument.documentElement(); diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp index 561b8cdd75..a02d768e94 100644 --- a/src/Gui/DocumentRecovery.cpp +++ b/src/Gui/DocumentRecovery.cpp @@ -469,6 +469,11 @@ DocumentRecoveryPrivate::XmlConfig DocumentRecoveryPrivate::readXmlFile(const QS if (!file.open(QFile::ReadOnly)) return cfg; +#if QT_VERSION >= QT_VERSION_CHECK(6,5,0) + if (!domDocument.setContent(&file, QDomDocument::ParseOption::UseNamespaceProcessing)) { + return cfg; + } +#else QString errorStr; int errorLine; int errorColumn; @@ -477,6 +482,7 @@ DocumentRecoveryPrivate::XmlConfig DocumentRecoveryPrivate::readXmlFile(const QS &errorColumn)) { return cfg; } +#endif QDomElement root = domDocument.documentElement(); if (root.tagName() != QLatin1String("AutoRecovery")) { From 545dadab4d55cad8e1daff06379129330b601fc9 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 9 Aug 2025 10:56:04 -0500 Subject: [PATCH 3/8] Gui: Remove unused variable from fuzzyMatch() --- src/Gui/Dialogs/DlgPreferencesImp.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Gui/Dialogs/DlgPreferencesImp.cpp b/src/Gui/Dialogs/DlgPreferencesImp.cpp index bf11f16ae5..66ff27056b 100644 --- a/src/Gui/Dialogs/DlgPreferencesImp.cpp +++ b/src/Gui/Dialogs/DlgPreferencesImp.cpp @@ -1722,7 +1722,6 @@ bool PreferencesSearchController::fuzzyMatch(const QString& searchText, const QS int targetIndex = 0; int consecutiveMatches = 0; int maxConsecutive = 0; - int totalMatches = 0; int firstMatchIndex = -1; int lastMatchIndex = -1; @@ -1733,7 +1732,6 @@ bool PreferencesSearchController::fuzzyMatch(const QString& searchText, const QS } lastMatchIndex = targetIndex; searchIndex++; - totalMatches++; consecutiveMatches++; maxConsecutive = qMax(maxConsecutive, consecutiveMatches); } else { From 780c49b6f028d509dfec224af06c90950e911efd Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 9 Aug 2025 11:11:39 -0500 Subject: [PATCH 4/8] Sketcher: Remove unused parameter from *ReferenceSelection --- src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h index 8eaa2a420c..2d052ed4e0 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h @@ -195,7 +195,6 @@ private: private: std::vector EditMarkers; - bool mousePressed = false; public: std::list getToolHints() const override From acf9827891d49bbfa1518d744931a5a7f6d1c309 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 9 Aug 2025 11:12:30 -0500 Subject: [PATCH 5/8] PD: Remove unused parameter from *ReferenceSelection --- src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp index 4bf62859b7..08332bbce4 100644 --- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp @@ -87,7 +87,7 @@ const QString TaskSketchBasedParameters::onAddSelection(const Gui::SelectionChan return refStr; } -void TaskSketchBasedParameters::startReferenceSelection(App::DocumentObject* profile, +void TaskSketchBasedParameters::startReferenceSelection(App::DocumentObject*, App::DocumentObject* base) { const auto* bodyViewProvider = getViewObject()->getBodyViewProvider(); @@ -107,7 +107,7 @@ void TaskSketchBasedParameters::startReferenceSelection(App::DocumentObject* pro } } -void TaskSketchBasedParameters::finishReferenceSelection(App::DocumentObject* profile, +void TaskSketchBasedParameters::finishReferenceSelection(App::DocumentObject*, App::DocumentObject* base) { if (!previouslyVisibleViewProvider) { From ece6353bd76d1480a68b1531172f1dd1f334fff4 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 9 Aug 2025 11:13:08 -0500 Subject: [PATCH 6/8] Part: Rename layout to avoid conflict --- src/Mod/Part/Gui/DlgSettingsGeneral.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.ui b/src/Mod/Part/Gui/DlgSettingsGeneral.ui index a5b605dbf5..ba4885c869 100644 --- a/src/Mod/Part/Gui/DlgSettingsGeneral.ui +++ b/src/Mod/Part/Gui/DlgSettingsGeneral.ui @@ -199,7 +199,7 @@ false - + From ff1932d55008b87ec3d52202c7d8e4beaeca171a Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 9 Aug 2025 11:13:58 -0500 Subject: [PATCH 7/8] FEM: remove unused variable from handlePropertyChange --- src/Mod/Fem/Gui/TaskPostBoxes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index 1166da49f8..2ee2b167b8 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -263,7 +263,7 @@ void TaskPostWidget::updateEnumerationList(App::PropertyEnumeration& prop, QComb box->setCurrentIndex(index); } -void TaskPostWidget::handlePropertyChange(const App::DocumentObject& obj, const App::Property& prop) +void TaskPostWidget::handlePropertyChange(const App::DocumentObject&, const App::Property& prop) { if (auto postobj = m_object.get()) { if (&prop == &postobj->Data) { From c4da72f55e5c6569e6544ed3b801938dfe0df9d6 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 9 Aug 2025 11:30:30 -0500 Subject: [PATCH 8/8] CAM: Eliminate C++11 compiler warning by explicitly defaulting copy --- src/Mod/CAM/libarea/clipper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Mod/CAM/libarea/clipper.cpp b/src/Mod/CAM/libarea/clipper.cpp index 7201194000..d11e36fd9a 100644 --- a/src/Mod/CAM/libarea/clipper.cpp +++ b/src/Mod/CAM/libarea/clipper.cpp @@ -302,6 +302,8 @@ public: , hi(_hi) {} + Int128& operator=(const Int128&) = default; + Int128& operator=(const long64& val) { lo = (ulong64)val;