diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h
index 55d5905e52a4..a0cd5be3af86 100644
--- a/src/Mod/TechDraw/App/DrawPage.h
+++ b/src/Mod/TechDraw/App/DrawPage.h
@@ -37,7 +37,7 @@ namespace TechDraw
 
 class TechDrawExport DrawPage: public App::DocumentObject
 {
-    PROPERTY_HEADER(TechDraw::DrawPage);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawPage);
 
 public:
     DrawPage(void);
@@ -55,22 +55,22 @@ class TechDrawExport DrawPage: public App::DocumentObject
     /** @name methods override Feature */
     //@{
     /// recalculate the Feature
-    virtual App::DocumentObjectExecReturn *execute(void);
+    virtual App::DocumentObjectExecReturn *execute(void) override;
     //@}
     virtual void handleChangedPropertyType(
             Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
 
     int addView(App::DocumentObject *docObj);
     int removeView(App::DocumentObject* docObj);
-    short mustExecute() const;
+    short mustExecute() const override;
     boost::signals2::signal<void (const DrawPage*)> signalGuiPaint;
 
     /// returns the type name of the ViewProvider
-    virtual const char* getViewProviderName(void) const {
+    virtual const char* getViewProviderName(void) const override {
         return "TechDrawGui::ViewProviderPage";
     }
 
-    PyObject *getPyObject(void);
+    PyObject *getPyObject(void) override;
 
 //App::DocumentObjectExecReturn * recompute(void);
 
@@ -99,10 +99,10 @@ class TechDrawExport DrawPage: public App::DocumentObject
     int getNextBalloonIndex(void);
 
 protected:
-    void onBeforeChange(const App::Property* prop);
-    void onChanged(const App::Property* prop);
-    virtual void onDocumentRestored();
-    virtual void unsetupObject();
+    void onBeforeChange(const App::Property* prop) override;
+    void onChanged(const App::Property* prop) override;
+    virtual void onDocumentRestored() override;
+    virtual void unsetupObject() override;
 
 
 private:
diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h
index 5a4ff85fe537..a3f810691f8a 100644
--- a/src/Mod/TechDraw/App/DrawViewPart.h
+++ b/src/Mod/TechDraw/App/DrawViewPart.h
@@ -85,7 +85,7 @@ class DrawViewSection;
 
 class TechDrawExport DrawViewPart : public DrawView
 {
-    PROPERTY_HEADER(TechDraw::DrawViewPart);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewPart);
 
 public:
     DrawViewPart(void);
@@ -114,13 +114,13 @@ class TechDrawExport DrawViewPart : public DrawView
     TechDraw::PropertyCenterLineList  CenterLines;
     TechDraw::PropertyGeomFormatList  GeomFormats;
 
-    virtual short mustExecute() const;
+    virtual short mustExecute() const override;
     virtual void onDocumentRestored() override;
-    virtual App::DocumentObjectExecReturn *execute(void);
-    virtual const char* getViewProviderName(void) const {
+    virtual App::DocumentObjectExecReturn *execute(void) override;
+    virtual const char* getViewProviderName(void) const override {
         return "TechDrawGui::ViewProviderViewPart";
     }
-    virtual PyObject *getPyObject(void);
+    virtual PyObject *getPyObject(void) override;
 
     std::vector<TechDraw::DrawHatch*> getHatches(void) const;
     std::vector<TechDraw::DrawGeomHatch*> getGeomHatches(void) const;
@@ -142,7 +142,7 @@ class TechDrawExport DrawViewPart : public DrawView
     virtual Base::BoundBox3d getBoundingBox() const;
     double getBoxX(void) const;
     double getBoxY(void) const;
-    virtual QRectF getRect() const;
+    virtual QRectF getRect() const override;
     virtual std::vector<DrawViewSection*> getSectionRefs() const;                    //are there ViewSections based on this ViewPart?
     virtual std::vector<DrawViewDetail*> getDetailRefs() const;
     const Base::Vector3d& getUDir(void) const {return uDir;}                       //paperspace X
@@ -210,8 +210,8 @@ class TechDrawExport DrawViewPart : public DrawView
     TechDraw::GeometryObject *geometryObject;
     Base::BoundBox3d bbox;
 
-    void onChanged(const App::Property* prop);
-    virtual void unsetupObject();
+    void onChanged(const App::Property* prop) override;
+    virtual void unsetupObject() override;
 
     virtual TechDraw::GeometryObject*  buildGeometryObject(TopoDS_Shape shape, gp_Ax2 viewAxis);
     void extractFaces();
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h
index c66fa1e70151..78f65eef5206 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.h
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h
@@ -162,7 +162,6 @@ protected Q_SLOTS:
 
 private:
     Ui_TaskCL2Lines* ui;
-    TechDraw::DrawViewPart* m_partFeat;
     TechDrawGui::TaskCenterLine* m_tcl;
 };
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
index d37fe0419a6d..b1f8458323d7 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
@@ -43,7 +43,7 @@ class MDIViewPage;
 
 class TechDrawGuiExport ViewProviderDrawingView : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderDrawingView);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderDrawingView);
 
 public:
     /// constructor
@@ -53,20 +53,20 @@ class TechDrawGuiExport ViewProviderDrawingView : public Gui::ViewProviderDocume
 
     App::PropertyBool  KeepLabel;
 
-    virtual void attach(App::DocumentObject *);
-    virtual void setDisplayMode(const char* ModeName);
-    virtual bool useNewSelectionModel(void) const {return false;}
+    virtual void attach(App::DocumentObject *) override;
+    virtual void setDisplayMode(const char* ModeName) override;
+    virtual bool useNewSelectionModel(void) const override {return false;}
     /// returns a list of all possible modes
-    virtual std::vector<std::string> getDisplayModes(void) const;
+    virtual std::vector<std::string> getDisplayModes(void) const override;
     /// Hide the object in the view
-    virtual void hide(void);
+    virtual void hide(void) override;
     /// Show the object in the view
-    virtual void show(void);
-    virtual bool isShow(void) const;
+    virtual void show(void) override;
+    virtual bool isShow(void) const override;
 
-    virtual void onChanged(const App::Property *prop);
-    virtual void updateData(const App::Property*);
-    virtual void unsetEdit(int ModNum);
+    virtual void onChanged(const App::Property *prop) override;
+    virtual void updateData(const App::Property*) override;
+    virtual void unsetEdit(int ModNum) override;
 
     QGIView* getQView(void);
     MDIViewPage* getMDIViewPage() const;
@@ -74,8 +74,8 @@ class TechDrawGuiExport ViewProviderDrawingView : public Gui::ViewProviderDocume
 
     /** @name Restoring view provider from document load */
     //@{
-    virtual void startRestoring();
-    virtual void finishRestoring();
+    virtual void startRestoring() override;
+    virtual void finishRestoring() override;
     //@}
 
     virtual TechDraw::DrawView* getViewObject() const;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h
index b521e79e71b9..70f544317a73 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h
@@ -41,7 +41,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderGeomHatch : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderGeomHatch);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderGeomHatch);
 
 public:
     /// constructor
@@ -53,16 +53,16 @@ class TechDrawGuiExport ViewProviderGeomHatch : public Gui::ViewProviderDocument
     App::PropertyColor       ColorPattern;
 
 
-    virtual void attach(App::DocumentObject *);
-    virtual void updateData(const App::Property*);
-    virtual void onChanged(const App::Property *prop);
-    virtual bool setEdit(int ModNum);
-    virtual void unsetEdit(int ModNum);
-    virtual bool doubleClicked(void);
+    virtual void attach(App::DocumentObject *) override;
+    virtual void updateData(const App::Property*) override;
+    virtual void onChanged(const App::Property *prop) override;
+    virtual bool setEdit(int ModNum) override;
+    virtual void unsetEdit(int ModNum) override;
+    virtual bool doubleClicked(void) override;
 
-    virtual bool useNewSelectionModel(void) const {return false;}
-    virtual void setDisplayMode(const char* ModeName);
-    virtual std::vector<std::string> getDisplayModes(void) const;
+    virtual bool useNewSelectionModel(void) const override {return false;}
+    virtual void setDisplayMode(const char* ModeName) override;
+    virtual std::vector<std::string> getDisplayModes(void) const override;
     void updateGraphic(void);
     void getParameters(void);
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.h b/src/Mod/TechDraw/Gui/ViewProviderHatch.h
index 891f54cb238f..1f62a402db34 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderHatch.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.h
@@ -36,7 +36,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderHatch : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderHatch);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderHatch);
 
 public:
     /// constructor
@@ -47,13 +47,13 @@ class TechDrawGuiExport ViewProviderHatch : public Gui::ViewProviderDocumentObje
     App::PropertyColor       HatchColor;
     App::PropertyFloatConstraint HatchScale;
 
-    virtual void attach(App::DocumentObject *);
-    virtual void setDisplayMode(const char* ModeName);
-    virtual bool useNewSelectionModel(void) const {return false;}
+    virtual void attach(App::DocumentObject *) override;
+    virtual void setDisplayMode(const char* ModeName) override;
+    virtual bool useNewSelectionModel(void) const override {return false;}
     /// returns a list of all possible modes
-    virtual std::vector<std::string> getDisplayModes(void) const;
-    virtual void onChanged(const App::Property* prop);
-    virtual void updateData(const App::Property*);
+    virtual std::vector<std::string> getDisplayModes(void) const override;
+    virtual void onChanged(const App::Property* prop) override;
+    virtual void updateData(const App::Property*) override;
 
     TechDraw::DrawHatch* getViewObject() const;
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h
index c472a6e601b4..a84f58c4c626 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h
@@ -41,7 +41,7 @@ class QGVPage;
 
 class TechDrawGuiExport ViewProviderPage : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderPage);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderPage);
 
 public:
     /// constructor
@@ -51,28 +51,28 @@ class TechDrawGuiExport ViewProviderPage : public Gui::ViewProviderDocumentObjec
 
     App::PropertyBool  ShowFrames;
 
-    virtual void attach(App::DocumentObject *);
-    virtual void setDisplayMode(const char* ModeName);
-    virtual bool useNewSelectionModel(void) const {return false;}
+    virtual void attach(App::DocumentObject *) override;
+    virtual void setDisplayMode(const char* ModeName) override;
+    virtual bool useNewSelectionModel(void) const override {return false;}
     /// returns a list of all possible modes
-    virtual std::vector<std::string> getDisplayModes(void) const;
+    virtual std::vector<std::string> getDisplayModes(void) const override;
     /// Hides the view provider
-    virtual void hide(void);
+    virtual void hide(void) override;
     /// Shows the view provider
-    virtual void show(void);
-    virtual bool isShow(void) const;
+    virtual void show(void) override;
+    virtual bool isShow(void) const override;
 
     /// Claim all the views for the page
-    std::vector<App::DocumentObject*> claimChildren(void) const;
+    std::vector<App::DocumentObject*> claimChildren(void) const override;
 
     /// Is called by the tree if the user double click on the object
-    virtual bool doubleClicked(void);
-    void setupContextMenu(QMenu*, QObject*, const char*);
-    virtual bool onDelete(const std::vector<std::string> &);
-    virtual void onChanged(const App::Property *prop);
-    virtual void updateData(const App::Property* prop);
-    virtual void startRestoring();
-    virtual void finishRestoring();
+    virtual bool doubleClicked(void) override;
+    void setupContextMenu(QMenu*, QObject*, const char*) override;
+    virtual bool onDelete(const std::vector<std::string> &) override;
+    virtual void onChanged(const App::Property *prop) override;
+    virtual void updateData(const App::Property* prop) override;
+    virtual void startRestoring() override;
+    virtual void finishRestoring() override;
     bool isRestoring(void) {return !m_docReady;}
 
     TechDraw::DrawPage* getDrawPage() const;
@@ -80,7 +80,7 @@ class TechDrawGuiExport ViewProviderPage : public Gui::ViewProviderDocumentObjec
     typedef boost::signals2::scoped_connection Connection;
     Connection connectGuiRepaint;
 
-    void unsetEdit(int ModNum);
+    void unsetEdit(int ModNum) override;
     MDIViewPage* getMDIViewPage();
     bool showMDIViewPage();
     void removeMDIView(void);
@@ -94,7 +94,7 @@ class TechDrawGuiExport ViewProviderPage : public Gui::ViewProviderDocumentObjec
     void setGraphicsView(QGVPage* gv);
 
 protected:
-    bool setEdit(int ModNum);
+    bool setEdit(int ModNum) override;
 
 private:
     QPointer<MDIViewPage> m_mdiView;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.h b/src/Mod/TechDraw/Gui/ViewProviderTemplate.h
index 23b386a9e996..4ab4392c8c6d 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.h
@@ -36,7 +36,7 @@ class MDIViewPage;
 
 class TechDrawGuiExport ViewProviderTemplate : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderTemplate);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderTemplate);
 
 public:
     /// constructor
@@ -44,16 +44,16 @@ class TechDrawGuiExport ViewProviderTemplate : public Gui::ViewProviderDocumentO
     /// destructor
     virtual ~ViewProviderTemplate();
 
-    virtual void attach(App::DocumentObject *);
-    virtual void setDisplayMode(const char* ModeName);
-    virtual bool useNewSelectionModel(void) const {return false;}
+    virtual void attach(App::DocumentObject *) override;
+    virtual void setDisplayMode(const char* ModeName) override;
+    virtual bool useNewSelectionModel(void) const override {return false;}
     /// returns a list of all possible modes
-    virtual std::vector<std::string> getDisplayModes(void) const;
-    virtual void updateData(const App::Property*);
-    virtual void onChanged(const App::Property *prop);
-    virtual void hide(void);
-    virtual void show(void);
-    virtual bool isShow(void) const;
+    virtual std::vector<std::string> getDisplayModes(void) const override;
+    virtual void updateData(const App::Property*) override;
+    virtual void onChanged(const App::Property *prop) override;
+    virtual void hide(void) override;
+    virtual void show(void) override;
+    virtual bool isShow(void) const override;
     QGITemplate* getQTemplate(void);
     TechDraw::DrawTemplate* getTemplate() const;
     MDIViewPage* getMDIViewPage(void);