From 7f77b1e6c9b7e1a78c99c9d00e484bd64cb3eda1 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 29 Dec 2019 00:02:15 +0100 Subject: [PATCH] TechDraw: [skip ci] fix -Winconsistent-missing-override --- src/Mod/TechDraw/App/DrawViewBalloon.h | 14 +++++++------- src/Mod/TechDraw/App/DrawViewDimension.h | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.h b/src/Mod/TechDraw/App/DrawViewBalloon.h index 24595a61fe..b9c89d5898 100644 --- a/src/Mod/TechDraw/App/DrawViewBalloon.h +++ b/src/Mod/TechDraw/App/DrawViewBalloon.h @@ -42,7 +42,7 @@ class DrawViewPart; class TechDrawExport DrawViewBalloon : public TechDraw::DrawView { - PROPERTY_HEADER(TechDraw::DrawViewBalloon); + PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewBalloon); public: /// Constructor @@ -60,18 +60,18 @@ public: App::PropertyBool OriginIsSet; App::PropertyFloat TextWrapLen; - short mustExecute() const; + short mustExecute() const override; DrawViewPart* getViewPart() const; QPointF origin; //virtual PyObject *getPyObject(void); - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(void) override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName(void) const override { return "TechDrawGui::ViewProviderBalloon"; } @@ -81,10 +81,10 @@ public: void handleXYLock(void) override; protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; /* virtual void onDocumentRestored();*/ - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); - virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName); + virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; + virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; private: }; diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index 335e80477c..2b5473fe6d 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -105,7 +105,7 @@ public: App::PropertyFloat OverTolerance; App::PropertyFloat UnderTolerance; - short mustExecute() const; + short mustExecute() const override; bool has2DReferences(void) const; bool has3DReferences(void) const; bool hasTolerance(void) const; @@ -113,20 +113,20 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(void) override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName(void) const override { return "TechDrawGui::ViewProviderDimension"; } //return PyObject as DrawViewDimensionPy - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(void) override; virtual std::string getFormatedValue(int partial = 0); virtual double getDimValue(); DrawViewPart* getViewPart() const; - virtual QRectF getRect() const { return QRectF(0,0,1,1);} //pretend dimensions always fit! + virtual QRectF getRect() const override { return QRectF(0,0,1,1);} //pretend dimensions always fit! static int getRefType1(const std::string s); static int getRefType2(const std::string s1, const std::string s2); static int getRefType3(const std::string g1, @@ -145,8 +145,8 @@ public: bool isMultiValueSchema(void) const; protected: - virtual void onChanged(const App::Property* prop); - virtual void onDocumentRestored(); + virtual void onChanged(const App::Property* prop) override; + virtual void onDocumentRestored() override; bool showUnits() const; bool useDecimals() const; std::string getPrefix() const;