Clean up clang inconsistent override warnings.

src/App/Extension.h

@@ -43,6 +43,16 @@ public: \
   static void *create(void);\
 private: \
   static Base::Type classTypeId
+
+/// Like EXTENSION_TYPESYSTEM_HEADER, with getExtensionTypeId declared override
+#define EXTENSION_TYPESYSTEM_HEADER_WITH_OVERRIDE() \
+public: \
+  static Base::Type getExtensionClassTypeId(void); \
+  virtual Base::Type getExtensionTypeId(void) const override; \
+  static void init(void);\
+  static void *create(void);\
+private: \
+  static Base::Type classTypeId
 
 /// define to implement a subclass of Base::BaseClass
 #define EXTENSION_TYPESYSTEM_SOURCE_P(_class_) \
@@ -84,6 +94,15 @@ protected: \
 private: \
   static App::PropertyData propertyData
 
+/// Like EXTENSION_PROPERTY_HEADER, but with override declarations.
+#define EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(_class_) \
+  EXTENSION_TYPESYSTEM_HEADER_WITH_OVERRIDE(); \
+protected: \
+  static const App::PropertyData * extensionGetPropertyDataPtr(void); \
+  virtual const App::PropertyData &extensionGetPropertyData(void) const override; \
+private: \
+  static App::PropertyData propertyData
+
 #define EXTENSION_PROPERTY_SOURCE(_class_, _parentclass_) \
 EXTENSION_TYPESYSTEM_SOURCE_P(_class_);\
 const App::PropertyData * _class_::extensionGetPropertyDataPtr(void){return &propertyData;} \

src/App/ExtensionContainer.h

@@ -114,7 +114,7 @@ namespace App {
 class AppExport ExtensionContainer : public App::PropertyContainer
 {
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -177,10 +177,10 @@ class AppExport ExtensionContainer : public App::PropertyContainer
     virtual const char* getPropertyDocumentation(const char *name) const override;
     //@}
 
-    virtual void onChanged(const Property*);
+    virtual void onChanged(const Property*) 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;
 
     //those methods save/restore the dynamic extenions without handling properties, which is something
     //done by the default Save/Restore methods.

src/App/OriginGroupExtension.h

@@ -34,7 +34,7 @@ class Origin;
  */
 class AppExport OriginGroupExtension : public App::GeoFeatureGroupExtension
 {
-    EXTENSION_PROPERTY_HEADER(App::OriginGroupExtension);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(App::OriginGroupExtension);
 
 public:
     OriginGroupExtension ();
@@ -66,7 +66,7 @@ class AppExport OriginGroupExtension : public App::GeoFeatureGroupExtension
     //changes all links of obj to a origin to point to this groupes origin
     void relinkToOrigin(App::DocumentObject* obj);
 
-    virtual void addObject(DocumentObject* obj);
+    virtual void addObject(DocumentObject* obj) override;
 
 protected:
     /// Checks integrity of the Origin

src/App/PropertyContainer.h

@@ -230,6 +230,14 @@ protected: \
 private: \
   static App::PropertyData propertyData 
 
+/// Like PROPERTY_HEADER, but with overridden methods declared as such
+#define PROPERTY_HEADER_WITH_OVERRIDE(_class_) \
+  TYPESYSTEM_HEADER_WITH_OVERRIDE(); \
+protected: \
+  static const App::PropertyData * getPropertyDataPtr(void); \
+  virtual const App::PropertyData &getPropertyData(void) const override; \
+private: \
+  static App::PropertyData propertyData 
 /// 
 #define PROPERTY_SOURCE(_class_, _parentclass_) \
 TYPESYSTEM_SOURCE_P(_class_);\

src/Base/BaseClass.h

@@ -41,6 +41,15 @@ private: \
   static Base::Type classTypeId
 
 
+/// Like TYPESYSTEM_HEADER, but declare getTypeId as 'override'
+#define TYPESYSTEM_HEADER_WITH_OVERRIDE() \
+public: \
+  static Base::Type getClassTypeId(void); \
+  virtual Base::Type getTypeId(void) const override; \
+  static void init(void);\
+  static void *create(void);\
+private: \
+  static Base::Type classTypeId
 
 
 /// define to implement a  subclass of Base::BaseClass

src/Gui/ViewProviderGeoFeatureGroupExtension.h

@@ -34,7 +34,7 @@ namespace Gui
 
 class GuiExport ViewProviderGeoFeatureGroupExtension : public ViewProviderGroupExtension
 {
-    EXTENSION_PROPERTY_HEADER(Gui::ViewProviderGeoFeatureGroupExtension);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderGeoFeatureGroupExtension);
 
 public:
     /// Constructor
@@ -58,8 +58,8 @@ class GuiExport ViewProviderGeoFeatureGroupExtension : public ViewProviderGroupE
 
     virtual void extensionUpdateData(const App::Property*) override;
 
-    virtual void extensionDropObject(App::DocumentObject*);
-    virtual void extensionDragObject(App::DocumentObject*);
+    virtual void extensionDropObject(App::DocumentObject*) override;
+    virtual void extensionDragObject(App::DocumentObject*) override;
 
 protected:
     SoGroup *pcGroupChildren;

src/Gui/ViewProviderGroupExtension.h

@@ -32,7 +32,7 @@ namespace Gui
 
 class GuiExport ViewProviderGroupExtension : public ViewProviderExtension
 {
-    EXTENSION_PROPERTY_HEADER(Gui::ViewProviderGroupExtension);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderGroupExtension);
 
 public:
     /// Constructor

src/Gui/ViewProviderOriginGroupExtension.h

@@ -33,7 +33,7 @@ namespace Gui
 
 class GuiExport ViewProviderOriginGroupExtension : public ViewProviderGeoFeatureGroupExtension
 {
-    EXTENSION_PROPERTY_HEADER(Gui::ViewProviderOriginGroupExtension);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderOriginGroupExtension);
 
 public:
     /// Constructor
@@ -47,7 +47,7 @@ class GuiExport ViewProviderOriginGroupExtension : public ViewProviderGeoFeature
     virtual void extensionUpdateData(const App::Property* prop) override;
 
     virtual void extensionDragObject(App::DocumentObject*) override;
-    virtual void extensionDropObject(App::DocumentObject*);
+    virtual void extensionDropObject(App::DocumentObject*) override;
 
     void updateOriginSize();
 

src/Mod/Part/App/FaceMaker.h

@@ -132,7 +132,7 @@ class PartExport FaceMakerPublic : public FaceMaker
  */
 class PartExport FaceMakerSimple : public FaceMakerPublic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     virtual std::string getUserFriendlyName() const override;
     virtual std::string getBriefExplanation() const override;

src/Mod/Part/App/FaceMakerBullseye.h

@@ -44,7 +44,7 @@ namespace Part
  */
 class PartExport FaceMakerBullseye: public FaceMakerPublic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     FaceMakerBullseye()
         :planeSupplied(false){}

src/Mod/Part/App/FaceMakerCheese.h

@@ -41,7 +41,7 @@ namespace Part
  */
 class PartExport FaceMakerCheese: public FaceMakerPublic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     virtual std::string getUserFriendlyName() const override;
     virtual std::string getBriefExplanation() const override;

src/Mod/Part/App/FeatureExtrusion.h

@@ -35,7 +35,7 @@ namespace Part
 
 class PartExport Extrusion : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Extrusion);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Extrusion);
 
 public:
     Extrusion();
@@ -73,10 +73,10 @@ class PartExport Extrusion : public Part::Feature
     /** @name methods override feature */
     //@{
     /// recalculate the feature
-    App::DocumentObjectExecReturn *execute(void);
-    short mustExecute() const;
+    App::DocumentObjectExecReturn *execute(void) override;
+    short mustExecute() const override;
     /// returns the type name of the view provider
-    const char* getViewProviderName(void) const {
+    const char* getViewProviderName(void) const override {
         return "PartGui::ViewProviderExtrusion";
     }
     //@}
@@ -135,7 +135,7 @@ class PartExport Extrusion : public Part::Feature
  */
 class FaceMakerExtrusion: public FaceMakerCheese
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     virtual std::string getUserFriendlyName() const override;
     virtual std::string getBriefExplanation() const override;

src/Mod/Part/App/FeatureFace.h

@@ -31,7 +31,7 @@ namespace Part
 
 class PartExport Face : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Face);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Face);
 
 public:
     Face();
@@ -42,10 +42,10 @@ class PartExport Face : public Part::Feature
     /** @name methods override feature */
     //@{
     /// recalculate the feature
-    App::DocumentObjectExecReturn *execute(void);
-    short mustExecute() const;
+    App::DocumentObjectExecReturn *execute(void) override;
+    short mustExecute() const override;
     /// returns the type name of the ViewProvider
-    const char* getViewProviderName(void) const {
+    const char* getViewProviderName(void) const override {
         return "PartGui::ViewProviderFace";
     }
     void setupObject() override;

src/Mod/Part/App/FeatureOffset.h

@@ -32,7 +32,7 @@ namespace Part
 
 class PartExport Offset : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Offset);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Offset);
 
 public:
     Offset();
@@ -63,7 +63,7 @@ class PartExport Offset : public Part::Feature
 
 class PartExport Offset2D : public Offset
 {
-    PROPERTY_HEADER(Part::Offset2D);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Offset2D);
 public:
     Offset2D();
     ~Offset2D();

src/Mod/Part/App/FeatureRevolution.h

@@ -33,7 +33,7 @@ namespace Part
 
 class PartExport Revolution : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Revolution);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Revolution);
 
 public:
     Revolution();
@@ -50,13 +50,13 @@ class PartExport Revolution : public Part::Feature
     /** @name methods override feature */
     //@{
     /// recalculate the feature
-    App::DocumentObjectExecReturn *execute(void);
-    short mustExecute() const;
+    App::DocumentObjectExecReturn *execute(void) override;
+    short mustExecute() const override;
 
     void onChanged(const App::Property* prop) override;
 
     /// returns the type name of the view provider
-    const char* getViewProviderName(void) const {
+    const char* getViewProviderName(void) const override{
         return "PartGui::ViewProviderRevolution";
     }
     //@}
@@ -82,7 +82,7 @@ class PartExport Revolution : public Part::Feature
     static App::PropertyFloatConstraint::Constraints angleRangeU;
 
 protected:
-    virtual void setupObject();
+    virtual void setupObject() override;
 };
 
 } //namespace Part

src/Mod/Part/Gui/TaskAttacher.h

@@ -87,7 +87,7 @@ private Q_SLOTS:
     void visibilityAutomation(bool opening_not_closing);
 
 protected:
-    void changeEvent(QEvent *e);
+    void changeEvent(QEvent *e) override;
 private:
     void objectDeleted(const Gui::ViewProviderDocumentObject&);
     void onSelectionChanged(const Gui::SelectionChanges& msg) override;

src/Mod/PartDesign/App/Body.h

@@ -40,7 +40,7 @@ class Feature;
 
 class PartDesignExport Body : public Part::BodyBase
 {
-    PROPERTY_HEADER(PartDesign::Body);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Body);
 
 public:
 
@@ -52,11 +52,11 @@ class PartDesignExport Body : public Part::BodyBase
     /** @name methods override feature */
     //@{
     /// recalculate the feature
-    App::DocumentObjectExecReturn *execute(void);
-    short mustExecute() const;
+    App::DocumentObjectExecReturn *execute(void) override;
+    short mustExecute() const override;
 
     /// returns the type name of the view provider
-    const char* getViewProviderName(void) const {
+    const char* getViewProviderName(void) const override {
         return "PartDesignGui::ViewProviderBody";
     }
     //@}
@@ -107,22 +107,22 @@ class PartDesignExport Body : public Part::BodyBase
       * all features derived from PartDesign::Feature and Part::Datum and sketches
       */
     static bool isAllowed(const App::DocumentObject* f);
-    virtual bool allowObject(DocumentObject* f) {return isAllowed(f);};
+    virtual bool allowObject(DocumentObject* f) override {return isAllowed(f);};
 
     /**
      * Return the body which this feature belongs too, or NULL
      * The only difference to BodyBase::findBodyOf() is that this one casts value to Body*
      */
     static Body *findBodyOf(const App::DocumentObject* feature);
 
-    PyObject *getPyObject(void);
+    PyObject *getPyObject(void) override;
 
 
 protected:
-    virtual void onSettingDocument();
+    virtual void onSettingDocument() override;
 
     /// Adjusts the first solid's feature's base on on BaseFeature getting setted
-    virtual void onChanged (const App::Property* prop);
+    virtual void onChanged (const App::Property* prop) override;
 
     /**
       * Return the solid feature before the given feature, or before the Tip feature
@@ -137,9 +137,9 @@ class PartDesignExport Body : public Part::BodyBase
     App::DocumentObject *getNextSolidFeature(App::DocumentObject* start = NULL);
 
     /// Creates the corresponding Origin object
-    virtual void setupObject ();
+    virtual void setupObject () override;
     /// Removes all planes and axis if they are still linked to the document
-    virtual void unsetupObject ();
+    virtual void unsetupObject () override;
 
 private:
     boost::signals::scoped_connection connection;