From 319bbe5cc4397cca050211642ce637ddbe217181 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 9 Aug 2019 19:16:25 +0200 Subject: [PATCH] Fix clang compiler warnings: + fix -Winconsistent-missing-override --- .../Sketcher/App/ExternalGeometryExtension.h | 2 +- src/Mod/Sketcher/App/PropertyConstraintList.h | 30 +++++++++---------- .../Sketcher/App/SketchGeometryExtension.h | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.h b/src/Mod/Sketcher/App/ExternalGeometryExtension.h index 3fd595f88e..e7ec183ed4 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h +++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h @@ -31,7 +31,7 @@ namespace Sketcher class SketcherExport ExternalGeometryExtension : public Part::GeometryExtension { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: // START_CREDIT_BLOCK: Credit under LGPL for this block to Zheng, Lei (realthunder) enum Flag { diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h index 40d83275a0..9b11f8d219 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.h +++ b/src/Mod/Sketcher/App/PropertyConstraintList.h @@ -45,7 +45,7 @@ class Constraint; class SketcherExport PropertyConstraintList : public App::PropertyLists { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: /** @@ -60,10 +60,10 @@ public: */ virtual ~PropertyConstraintList(); - virtual void setSize(int newSize); - virtual int getSize(void) const; + virtual void setSize(int newSize) override; + virtual int getSize(void) const override; - const char* getEditorName(void) const { + const char* getEditorName(void) const override { return "SketcherGui::PropertyConstraintListItem"; } @@ -109,16 +109,16 @@ public: return _lValueList; } - virtual PyObject *getPyObject(void); - virtual void setPyObject(PyObject *); + virtual PyObject *getPyObject(void) override; + virtual void setPyObject(PyObject *) override; - virtual void Save(Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + virtual void Save(Base::Writer &writer) const override; + virtual void Restore(Base::XMLReader &reader) override; - virtual Property *Copy(void) const; - virtual void Paste(const App::Property &from); + virtual Property *Copy(void) const override; + virtual void Paste(const App::Property &from) override; - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize(void) const override; void acceptGeometry(const std::vector &GeoList); void checkGeometry(const std::vector &GeoList); @@ -129,10 +129,10 @@ public: const Constraint *getConstraint(const App::ObjectIdentifier &path) const; - virtual void setPathValue(const App::ObjectIdentifier & path, const boost::any & value); - virtual const boost::any getPathValue(const App::ObjectIdentifier & path) const; - virtual App::ObjectIdentifier canonicalPath(const App::ObjectIdentifier & p) const; - virtual void getPaths(std::vector & paths) const; + virtual void setPathValue(const App::ObjectIdentifier & path, const boost::any & value) override; + virtual const boost::any getPathValue(const App::ObjectIdentifier & path) const override; + virtual App::ObjectIdentifier canonicalPath(const App::ObjectIdentifier & p) const override; + virtual void getPaths(std::vector & paths) const override; virtual bool getPyPathValue(const App::ObjectIdentifier &path, Py::Object &res) const override; diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.h b/src/Mod/Sketcher/App/SketchGeometryExtension.h index 68470b9ec4..747d1990c5 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtension.h +++ b/src/Mod/Sketcher/App/SketchGeometryExtension.h @@ -31,7 +31,7 @@ namespace Sketcher class SketcherExport SketchGeometryExtension : public Part::GeometryExtension { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: SketchGeometryExtension(); SketchGeometryExtension(long cid);