From 6ff3ee99512a17855e4c80bb92a8511a6be73dbb Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 4 Aug 2023 12:20:10 +0200 Subject: [PATCH] Sketch: modernize C++: use override --- src/Mod/Sketcher/Gui/Command.cpp | 55 +++++++++---------- src/Mod/Sketcher/Gui/DrawSketchHandler.h | 2 +- src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h | 4 +- .../Gui/DrawSketchHandlerArcOfEllipse.h | 2 +- .../Gui/DrawSketchHandlerArcOfHyperbola.h | 2 +- .../Gui/DrawSketchHandlerArcOfParabola.h | 2 +- .../Sketcher/Gui/DrawSketchHandlerBSpline.h | 2 +- .../DrawSketchHandlerBSplineByInterpolation.h | 2 +- .../Gui/DrawSketchHandlerCarbonCopy.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerCircle.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerEllipse.h | 2 +- .../Sketcher/Gui/DrawSketchHandlerExtend.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerExternal.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerFillet.h | 4 +- src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h | 2 +- .../Sketcher/Gui/DrawSketchHandlerLineSet.h | 2 +- src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h | 2 +- .../Sketcher/Gui/DrawSketchHandlerPolygon.h | 2 +- .../Sketcher/Gui/DrawSketchHandlerRectangle.h | 4 +- src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h | 2 +- .../Sketcher/Gui/DrawSketchHandlerSplitting.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerTrimming.h | 2 +- src/Mod/Sketcher/Gui/ViewProviderSketch.h | 2 +- .../Gui/Blending/ViewProviderBlendCurve.h | 4 +- 24 files changed, 59 insertions(+), 60 deletions(-) diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 7a8d1598b6..e9b0c89107 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -1187,23 +1187,24 @@ class CmdSketcherGrid: public Gui::Command { public: CmdSketcherGrid(); - virtual ~CmdSketcherGrid() + ~CmdSketcherGrid() override {} - virtual const char* className() const override + const char* className() const override { return "CmdSketcherGrid"; } - virtual void languageChange() override; + void languageChange() override; protected: - virtual void activated(int iMsg) override; - virtual bool isActive(void) override; - virtual Gui::Action* createAction(void) override; + void activated(int iMsg) override; + bool isActive() override; + Gui::Action* createAction() override; private: void updateIcon(bool value); void updateInactiveHandlerIcon(); +public: CmdSketcherGrid(const CmdSketcherGrid&) = delete; CmdSketcherGrid(CmdSketcherGrid&&) = delete; CmdSketcherGrid& operator=(const CmdSketcherGrid&) = delete; @@ -1435,19 +1436,23 @@ class CmdSketcherSnap: public Gui::Command, public ParameterGrp::ObserverType { public: CmdSketcherSnap(); - virtual ~CmdSketcherSnap(); - virtual const char* className() const override + ~CmdSketcherSnap() override; + CmdSketcherSnap(const CmdSketcherSnap&) = delete; + CmdSketcherSnap(CmdSketcherSnap&&) = delete; + CmdSketcherSnap& operator=(const CmdSketcherSnap&) = delete; + CmdSketcherSnap& operator=(CmdSketcherSnap&&) = delete; + const char* className() const override { return "CmdSketcherSnap"; } - virtual void languageChange() override; + void languageChange() override; void OnChange(Base::Subject& rCaller, const char* sReason) override; protected: - virtual void activated(int iMsg) override; - virtual bool isActive(void) override; - virtual Gui::Action* createAction(void) override; + void activated(int iMsg) override; + bool isActive() override; + Gui::Action* createAction() override; private: void updateIcon(bool value); @@ -1458,11 +1463,6 @@ private: "User parameter:BaseApp/Preferences/Mod/Sketcher/Snap"); } - CmdSketcherSnap(const CmdSketcherSnap&) = delete; - CmdSketcherSnap(CmdSketcherSnap&&) = delete; - CmdSketcherSnap& operator=(const CmdSketcherSnap&) = delete; - CmdSketcherSnap& operator=(CmdSketcherSnap&&) = delete; - bool snapEnabled = true; }; @@ -1696,18 +1696,22 @@ class CmdRenderingOrder: public Gui::Command, public ParameterGrp::ObserverType public: CmdRenderingOrder(); - virtual ~CmdRenderingOrder(); - virtual const char* className() const override + ~CmdRenderingOrder() override; + CmdRenderingOrder(const CmdRenderingOrder&) = delete; + CmdRenderingOrder(CmdRenderingOrder&&) = delete; + CmdRenderingOrder& operator=(const CmdRenderingOrder&) = delete; + CmdRenderingOrder& operator=(CmdRenderingOrder&&) = delete; + const char* className() const override { return "CmdRenderingOrder"; } - virtual void languageChange() override; + void languageChange() override; void OnChange(Base::Subject& rCaller, const char* sReason) override; protected: - virtual void activated(int iMsg) override; - virtual bool isActive(void) override; - virtual Gui::Action* createAction(void) override; + void activated(int iMsg) override; + bool isActive() override; + Gui::Action* createAction() override; private: void updateIcon(); @@ -1718,11 +1722,6 @@ private: "User parameter:BaseApp/Preferences/Mod/Sketcher/General"); } - CmdRenderingOrder(const CmdRenderingOrder&) = delete; - CmdRenderingOrder(CmdRenderingOrder&&) = delete; - CmdRenderingOrder& operator=(const CmdRenderingOrder&) = delete; - CmdRenderingOrder& operator=(CmdRenderingOrder&&) = delete; - ElementType TopElement = ElementType::Normal; }; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index 11269f6540..d5350ebcfb 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -56,7 +56,7 @@ class CurveConverter final: public ParameterGrp::ObserverType public: CurveConverter(); - ~CurveConverter(); + ~CurveConverter() override; std::vector toVector2D(const Part::Geometry* geometry); diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h index 6e4b7219d4..074d261718 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h @@ -47,7 +47,7 @@ public: , endAngle(0) , arcAngle(0) {} - virtual ~DrawSketchHandlerArc() + ~DrawSketchHandlerArc() override {} /// mode table enum SelectMode @@ -278,7 +278,7 @@ public: , arcPos1(Sketcher::PointPos::none) , arcPos2(Sketcher::PointPos::none) {} - virtual ~DrawSketchHandler3PointArc() + ~DrawSketchHandler3PointArc() override {} /// mode table enum SelectMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h index 01b504889b..25ada63cd8 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h @@ -46,7 +46,7 @@ public: , arcAngle_t(0) {} - virtual ~DrawSketchHandlerArcOfEllipse() = default; + ~DrawSketchHandlerArcOfEllipse() override = default; /// mode table enum SelectMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h index 9e8ae862f5..006635a091 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h @@ -45,7 +45,7 @@ public: , arcAngle_t(0) {} - virtual ~DrawSketchHandlerArcOfHyperbola() = default; + ~DrawSketchHandlerArcOfHyperbola() override = default; /// mode table enum SelectMode { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h index 1c89c7d9ad..bbfbb4b52b 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h @@ -44,7 +44,7 @@ public: , arcAngle_t(0) {} - virtual ~DrawSketchHandlerArcOfParabola() = default; + ~DrawSketchHandlerArcOfParabola() override = default; /// mode table enum SelectMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 33e55c3310..e4c8463e61 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -50,7 +50,7 @@ public: applyCursor(); } - virtual ~DrawSketchHandlerBSpline() = default; + ~DrawSketchHandlerBSpline() override = default; /// modes enum SELECT_MODE diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h index 6ab7860846..031bda63e1 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h @@ -50,7 +50,7 @@ public: applyCursor(); } - virtual ~DrawSketchHandlerBSplineByInterpolation() = default; + ~DrawSketchHandlerBSplineByInterpolation() override = default; /// modes enum SELECT_MODE diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h index 31117a585c..d2b7bb9dc8 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h @@ -43,7 +43,7 @@ public: , object(obj) {} - bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override { Q_UNUSED(sSubName); @@ -109,7 +109,7 @@ class DrawSketchHandlerCarbonCopy: public DrawSketchHandler { public: DrawSketchHandlerCarbonCopy() = default; - virtual ~DrawSketchHandlerCarbonCopy() + ~DrawSketchHandlerCarbonCopy() override { Gui::Selection().rmvSelectionGate(); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h index 27ee4603cd..6bc2116780 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h @@ -38,7 +38,7 @@ public: : Mode(STATUS_SEEK_First) , EditCurve(34) {} - virtual ~DrawSketchHandlerCircle() + ~DrawSketchHandlerCircle() override {} /// mode table enum SelectMode @@ -188,7 +188,7 @@ public: , radius(1) , N(32.0) {} - virtual ~DrawSketchHandler3PointCircle() + ~DrawSketchHandler3PointCircle() override {} /// mode table enum SelectMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h index ff5b445511..6bf67dae9d 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h @@ -97,7 +97,7 @@ public: , editCurve(33) , fixedAxisLength(0) {} - virtual ~DrawSketchHandlerEllipse() + ~DrawSketchHandlerEllipse() override {} /// Mode table, describes what step of the process we are in enum SelectMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h index de2e961fd5..288b77c7ca 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h @@ -44,7 +44,7 @@ public: , disabled(false) {} - bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override { if (pObj != this->object) return false; @@ -86,7 +86,7 @@ public: , Increment(0) {} - virtual ~DrawSketchHandlerExtend() + ~DrawSketchHandlerExtend() override { Gui::Selection().rmvSelectionGate(); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h index 11fa3f86a4..a7b4f812bc 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h @@ -43,7 +43,7 @@ public: , object(obj) {} - bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override { Sketcher::SketchObject* sketch = static_cast(object); @@ -102,7 +102,7 @@ class DrawSketchHandlerExternal: public DrawSketchHandler { public: DrawSketchHandlerExternal() = default; - virtual ~DrawSketchHandlerExternal() + ~DrawSketchHandlerExternal() override { Gui::Selection().rmvSelectionGate(); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h index ad0ebfeb2a..eaf62182d5 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h @@ -43,7 +43,7 @@ public: , object(obj) {} - bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override { if (pObj != this->object) return false; @@ -90,7 +90,7 @@ public: , Mode(STATUS_SEEK_First) , firstCurve(0) {} - virtual ~DrawSketchHandlerFillet() + ~DrawSketchHandlerFillet() override { Gui::Selection().rmvSelectionGate(); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h index 1e5a987c52..7965cd8210 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h @@ -39,7 +39,7 @@ public: : Mode(STATUS_SEEK_First) , EditCurve(2) {} - virtual ~DrawSketchHandlerLine() + ~DrawSketchHandlerLine() override {} /// mode table enum SelectMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h index b492d81fef..379f4f27d7 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h @@ -56,7 +56,7 @@ public: , firstsegment(true) {} - virtual ~DrawSketchHandlerLineSet() = default; + ~DrawSketchHandlerLineSet() override = default; /// mode table enum SELECT_MODE diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h index 80c1a51cb7..74b5025e94 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h @@ -39,7 +39,7 @@ public: DrawSketchHandlerPoint() : selectionDone(false) {} - virtual ~DrawSketchHandlerPoint() + ~DrawSketchHandlerPoint() override {} void mouseMove(Base::Vector2d onSketchPos) override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h index 435ba29404..276a4a4e3b 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h @@ -45,7 +45,7 @@ public: , Mode(STATUS_SEEK_First) , EditCurve(Corners + 1) {} - virtual ~DrawSketchHandlerRegularPolygon() + ~DrawSketchHandlerRegularPolygon() override {} /// mode table enum SelectMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index 819b17d48a..1d316d6229 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -47,7 +47,7 @@ public: , EditCurve(5) , constructionMethod(constrMethod) {} - virtual ~DrawSketchHandlerBox() + ~DrawSketchHandlerBox() override {} /// mode table @@ -377,7 +377,7 @@ public: , signY(1) , EditCurve(37) {} - virtual ~DrawSketchHandlerOblong() + ~DrawSketchHandlerOblong() override {} /// mode table enum BoxMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h index eddda9c7f0..21c20a4c61 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h @@ -45,7 +45,7 @@ public: , r(0) , EditCurve(35) {} - virtual ~DrawSketchHandlerSlot() + ~DrawSketchHandlerSlot() override {} /// mode table enum BoxMode diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h index 1d5d433499..e844b72907 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h @@ -44,7 +44,7 @@ public: , object(obj) {} - bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override { if (pObj != this->object) return false; @@ -81,7 +81,7 @@ class DrawSketchHandlerSplitting: public DrawSketchHandler { public: DrawSketchHandlerSplitting() = default; - virtual ~DrawSketchHandlerSplitting() + ~DrawSketchHandlerSplitting() override { Gui::Selection().rmvSelectionGate(); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h index 0db3e6148d..c23be79a44 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h @@ -43,7 +43,7 @@ public: , object(obj) {} - bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override { if (pObj != this->object) return false; diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h index 86aff41e2d..9bf7c3e068 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h @@ -163,7 +163,7 @@ private: { public: explicit ParameterObserver(ViewProviderSketch& client); - ~ParameterObserver(); + ~ParameterObserver() override; void initParameters(); diff --git a/src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h b/src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h index 09e4b70c89..88f8d6d155 100644 --- a/src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h +++ b/src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h @@ -30,10 +30,10 @@ namespace SurfaceGui class ViewProviderBlendCurve: public PartGui::ViewProviderSpline { - PROPERTY_HEADER(SurfaceGui::ViewProviderBlendCurve); + PROPERTY_HEADER_WITH_OVERRIDE(SurfaceGui::ViewProviderBlendCurve); public: - QIcon getIcon() const; + QIcon getIcon() const override; }; }//namespace SurfaceGui