From 614a03181491692445210ee2ff479f155349ad07 Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Wed, 13 Mar 2019 17:20:05 +0100 Subject: [PATCH] GeometryExtensions: Add override when overriding virtual functions (EMCPP Item 12) --- src/Mod/Part/App/GeometryDefaultExtension.h | 12 ++++++------ src/Mod/Sketcher/App/ExternalGeometryExtension.h | 12 ++++++------ src/Mod/Sketcher/App/SketchGeometryExtension.h | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Mod/Part/App/GeometryDefaultExtension.h b/src/Mod/Part/App/GeometryDefaultExtension.h index 805867078b..48110fbba6 100644 --- a/src/Mod/Part/App/GeometryDefaultExtension.h +++ b/src/Mod/Part/App/GeometryDefaultExtension.h @@ -36,19 +36,19 @@ namespace Part { public: inline GeometryDefaultExtension(); GeometryDefaultExtension(const T& val, std::string name = std::string()); - virtual ~GeometryDefaultExtension() = default; + virtual ~GeometryDefaultExtension() override = default; inline void setValue(const T& val) {value = val;}; inline const T &getValue() const {return value;}; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + virtual unsigned int getMemSize(void) const override; + virtual void Save(Base::Writer &/*writer*/) const override; + virtual void Restore(Base::XMLReader &/*reader*/) override; - virtual std::unique_ptr copy(void) const; + virtual std::unique_ptr copy(void) const override; - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(void) override; private: GeometryDefaultExtension(const GeometryDefaultExtension&) = default; diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.h b/src/Mod/Sketcher/App/ExternalGeometryExtension.h index 4f3c1e6f68..3fd9f96cda 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h +++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h @@ -46,16 +46,16 @@ public: constexpr static std::array flag2str {{ "Defining", "Frozen", "Detached","Missing", "Sync" }}; ExternalGeometryExtension() = default; - virtual ~ExternalGeometryExtension() = default; + virtual ~ExternalGeometryExtension() override = default; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + virtual unsigned int getMemSize(void) const override; + virtual void Save(Base::Writer &/*writer*/) const override; + virtual void Restore(Base::XMLReader &/*reader*/) override; - virtual std::unique_ptr copy(void) const; + virtual std::unique_ptr copy(void) const override; - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(void) override; // START_CREDIT_BLOCK: Credit under LGPL for this block to Zheng, Lei (realthunder) bool testFlag(int flag) const { return Flags.test((size_t)(flag)); } diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.h b/src/Mod/Sketcher/App/SketchGeometryExtension.h index 4a1d5cda66..68470b9ec4 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtension.h +++ b/src/Mod/Sketcher/App/SketchGeometryExtension.h @@ -35,16 +35,16 @@ class SketcherExport SketchGeometryExtension : public Part::GeometryExtension public: SketchGeometryExtension(); SketchGeometryExtension(long cid); - virtual ~SketchGeometryExtension() = default; + virtual ~SketchGeometryExtension() override = default; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + virtual unsigned int getMemSize(void) const override; + virtual void Save(Base::Writer &/*writer*/) const override; + virtual void Restore(Base::XMLReader &/*reader*/) override; - virtual std::unique_ptr copy(void) const; + virtual std::unique_ptr copy(void) const override; - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(void) override; long getId() const {return Id;} void setId(long id) {Id = id;}