diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 6b26c3bd47..12f35edfa0 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -478,6 +478,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; @@ -489,6 +498,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/Dialogs/DlgPreferencesImp.cpp b/src/Gui/Dialogs/DlgPreferencesImp.cpp index 4ca7b05590..82620bc29b 100644 --- a/src/Gui/Dialogs/DlgPreferencesImp.cpp +++ b/src/Gui/Dialogs/DlgPreferencesImp.cpp @@ -1719,7 +1719,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; @@ -1730,7 +1729,6 @@ bool PreferencesSearchController::fuzzyMatch(const QString& searchText, const QS } lastMatchIndex = targetIndex; searchIndex++; - totalMatches++; consecutiveMatches++; maxConsecutive = qMax(maxConsecutive, consecutiveMatches); } else { diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp index 14799c622c..bda6a42ee6 100644 --- a/src/Gui/DocumentRecovery.cpp +++ b/src/Gui/DocumentRecovery.cpp @@ -566,6 +566,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; @@ -574,6 +579,7 @@ DocumentRecoveryPrivate::XmlConfig DocumentRecoveryPrivate::readXmlFile(const QS &errorColumn)) { return cfg; } +#endif QDomElement root = domDocument.documentElement(); if (root.tagName() != QLatin1String("AutoRecovery")) { 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; diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index 977df6e5ee..ad107c0d8d 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -259,7 +259,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) { 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 d4ad8cfe9f..dbcfafc6a4 100644 --- a/src/Mod/Part/App/TopoShapeExpansion.cpp +++ b/src/Mod/Part/App/TopoShapeExpansion.cpp @@ -5322,7 +5322,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; diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.ui b/src/Mod/Part/Gui/DlgSettingsGeneral.ui index 06eb6e6cbf..fc574eaca2 100644 --- a/src/Mod/Part/Gui/DlgSettingsGeneral.ui +++ b/src/Mod/Part/Gui/DlgSettingsGeneral.ui @@ -199,7 +199,7 @@ false - + diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp index a52ec11896..c29c70b1b5 100644 --- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp @@ -85,7 +85,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(); @@ -105,7 +105,7 @@ void TaskSketchBasedParameters::startReferenceSelection(App::DocumentObject* pro } } -void TaskSketchBasedParameters::finishReferenceSelection(App::DocumentObject* profile, +void TaskSketchBasedParameters::finishReferenceSelection(App::DocumentObject*, App::DocumentObject* base) { if (!previouslyVisibleViewProvider) { 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