From 2ec45406e7683fc6e78fab55b4f20bc0058d7672 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Sat, 11 Jan 2020 13:15:46 -0500 Subject: [PATCH] [TD]fix inconsistent override warnings. --- src/Mod/TechDraw/App/DrawGeomHatch.h | 14 +++++++------- src/Mod/TechDraw/App/DrawHatch.h | 12 ++++++------ src/Mod/TechDraw/App/DrawViewSection.h | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.h b/src/Mod/TechDraw/App/DrawGeomHatch.h index 8956cb2081..d20c487eb3 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatch.h +++ b/src/Mod/TechDraw/App/DrawGeomHatch.h @@ -58,13 +58,13 @@ public: App::PropertyString NamePattern; App::PropertyFloatConstraint ScalePattern; - virtual short mustExecute() const; - virtual App::DocumentObjectExecReturn *execute(void); - virtual void onChanged(const App::Property* prop); - virtual const char* getViewProviderName(void) const { + virtual short mustExecute() const override; + virtual App::DocumentObjectExecReturn *execute(void) override; + virtual void onChanged(const App::Property* prop) override; + virtual const char* getViewProviderName(void) const override { return "TechDrawGui::ViewProviderGeomHatch"; } - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(void) override; DrawViewPart* getSourceView(void) const; @@ -78,8 +78,8 @@ public: static TopoDS_Face extractFace(DrawViewPart* source, int iface ); protected: - virtual void onDocumentRestored(); - virtual void setupObject(); + virtual void onDocumentRestored() override; + virtual void setupObject() override; void setupPatIncluded(void); void replacePatIncluded(std::string newPatFile); void copyFile(std::string inSpec, std::string outSpec); diff --git a/src/Mod/TechDraw/App/DrawHatch.h b/src/Mod/TechDraw/App/DrawHatch.h index a936ec574d..7ed4d8b647 100644 --- a/src/Mod/TechDraw/App/DrawHatch.h +++ b/src/Mod/TechDraw/App/DrawHatch.h @@ -45,13 +45,13 @@ public: App::PropertyFile HatchPattern; App::PropertyFileIncluded SvgIncluded; - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(void) override; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName(void) const override { return "TechDrawGui::ViewProviderHatch"; } //return PyObject as DrawHatchPy - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(void) override; DrawViewPart* getSourceView(void) const; bool affectsFace(int i); @@ -62,9 +62,9 @@ public: protected: - void onChanged(const App::Property* prop); - virtual void onDocumentRestored(); - virtual void setupObject(); + void onChanged(const App::Property* prop) override; + virtual void onDocumentRestored() override; + virtual void setupObject() override; void setupSvgIncluded(void); void replaceSvgIncluded(std::string newSvgFile); void copyFile(std::string inSpec, std::string outSpec); diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h index 181723dc6a..fdc9c2ebfb 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.h +++ b/src/Mod/TechDraw/App/DrawViewSection.h @@ -134,8 +134,8 @@ protected: void copyFile(std::string inSpec, std::string outSpec); - virtual void onDocumentRestored(); - virtual void setupObject(); + virtual void onDocumentRestored() override; + virtual void setupObject() override; void setupSvgIncluded(void); void setupPatIncluded(void); void replaceSvgIncluded(std::string newSvgFile);