clang: fix warnings [-Winconsistent-missing-override]

src/Gui/DocumentModel.cpp

@@ -48,7 +48,7 @@ namespace Gui {
     // Base class
     class DocumentModelIndex : public Base::BaseClass
     {
-        TYPESYSTEM_HEADER();
+        TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
     public:
         ~DocumentModelIndex() override
@@ -113,7 +113,7 @@ namespace Gui {
     // Root node
     class ApplicationIndex : public DocumentModelIndex
     {
-        TYPESYSTEM_HEADER();
+        TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
     public:
         ApplicationIndex(){}
@@ -128,7 +128,7 @@ namespace Gui {
     class DocumentIndex : public DocumentModelIndex
     {
         friend class ViewProviderIndex;
-        TYPESYSTEM_HEADER();
+        TYPESYSTEM_HEADER_WITH_OVERRIDE();
         static QIcon* documentIcon;
         typedef boost::unordered_set<ViewProviderIndex*> IndexSet;
         std::map<const ViewProviderDocumentObject*, IndexSet> vp_nodes;
@@ -157,7 +157,7 @@ namespace Gui {
     // Object nodes
     class ViewProviderIndex : public DocumentModelIndex
     {
-        TYPESYSTEM_HEADER();
+        TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
     public:
         const Gui::ViewProviderDocumentObject& v;

src/Gui/EditorView.h

@@ -50,7 +50,7 @@ class GuiExport EditorView : public MDIView, public WindowParameter
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum DisplayName {
@@ -121,7 +121,7 @@ class GuiExport PythonEditorView : public EditorView
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PythonEditorView(PythonEditor* editor, QWidget* parent);

src/Gui/Flag.h

@@ -112,7 +112,7 @@ private:
 
 class GuiExport GLFlagWindow : public Gui::GLGraphicsItem
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     GLFlagWindow(View3DInventorViewer*);

src/Gui/GLPainter.h

@@ -37,6 +37,7 @@
 #endif
 
 #include <Base/BaseClass.h>
+#include <FCGlobal.h>
 #include <QtOpenGL.h>
 #include <QPoint>
 
@@ -84,7 +85,7 @@ private:
 
 class GuiExport GLGraphicsItem : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     GLGraphicsItem()

src/Gui/MDIView.h

@@ -56,7 +56,7 @@ class GuiExport MDIView : public QMainWindow, public BaseView
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** View constructor

src/Gui/NavigationStyle.h

@@ -73,7 +73,7 @@ private:
  */
 class GuiExport NavigationStyle : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum ViewerMode {
@@ -278,7 +278,7 @@ private:
  * @author Werner Mayer
  */
 class GuiExport UserNavigationStyle : public NavigationStyle {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     UserNavigationStyle(){}
@@ -291,7 +291,7 @@ public:
 class GuiExport InventorNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     InventorNavigationStyle();
@@ -306,7 +306,7 @@ protected:
 class GuiExport CADNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     CADNavigationStyle();
@@ -323,7 +323,7 @@ private:
 class GuiExport RevitNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     RevitNavigationStyle();
@@ -340,7 +340,7 @@ private:
 class GuiExport BlenderNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     BlenderNavigationStyle();
@@ -357,7 +357,7 @@ private:
 class GuiExport MayaGestureNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     MayaGestureNavigationStyle();
@@ -381,7 +381,7 @@ protected:
 class GuiExport TouchpadNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TouchpadNavigationStyle();
@@ -395,7 +395,7 @@ protected:
 class GuiExport OpenCascadeNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     OpenCascadeNavigationStyle();
@@ -409,7 +409,7 @@ protected:
 class GuiExport OpenSCADNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     OpenSCADNavigationStyle();
@@ -423,7 +423,7 @@ protected:
 class GuiExport TinkerCADNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TinkerCADNavigationStyle();

src/Gui/PythonConsole.h

@@ -177,10 +177,10 @@ public:
     PythonConsoleHighlighter(QObject* parent);
     ~PythonConsoleHighlighter() override;
 
-    void highlightBlock (const QString & text);
+    void highlightBlock (const QString & text) override;
 
 protected:
-    void colorChanged(const QString& type, const QColor& col);
+    void colorChanged(const QString& type, const QColor& col) override;
 };
 
 } // namespace Gui

src/Gui/SelectionObject.h

@@ -26,6 +26,7 @@
 
 #include <Base/BaseClass.h>
 #include <Base/Vector3D.h>
+#include <FCGlobal.h>
 #include <string>
 
 namespace App {
@@ -41,7 +42,7 @@ class SelectionChanges;
  */
 class GuiExport SelectionObject : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** Constructs a SelectionObject object. */

src/Gui/SplitView3DInventor.h

@@ -41,7 +41,7 @@ class GuiExport AbstractSplitView : public MDIView, public ParameterGrp::Observe
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     AbstractSplitView(Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags=Qt::WindowFlags());
@@ -111,7 +111,7 @@ private:
  */
 class GuiExport SplitView3DInventor : public AbstractSplitView
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     SplitView3DInventor(int views, Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags=Qt::WindowFlags());

src/Gui/TransactionObject.h

@@ -30,7 +30,7 @@ namespace Gui
 {
 class TransactionViewProvider : public App::TransactionObject
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TransactionViewProvider();

src/Gui/View.h

@@ -25,6 +25,7 @@
 #define GUI_VIEW_H
 
 #include <Base/BaseClass.h>
+#include <FCGlobal.h>
 
 namespace App
 {
@@ -49,7 +50,7 @@ class ViewProvider;
  */
 class GuiExport BaseView : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** View constructor

src/Gui/View3DInventor.h

@@ -65,7 +65,7 @@ class GuiExport View3DInventor : public MDIView, public ParameterGrp::ObserverTy
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     View3DInventor(Gui::Document* pcDocument, QWidget* parent, const QtGLWidget* sharewidget = nullptr, Qt::WindowFlags wflags=Qt::WindowFlags());

src/Gui/ViewProvider.h

@@ -118,7 +118,7 @@ void GuiExport coinRemoveAllChildren(SoGroup *node);
   */
 class GuiExport ViewProvider : public App::TransactionalObject
 {
-    PROPERTY_HEADER(Gui::ViewProvider);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProvider);
 
 public:
     /// constructor.

src/Gui/ViewProviderAnnotation.h

@@ -42,7 +42,7 @@ namespace Gui
 
 class GuiExport ViewProviderAnnotation : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderAnnotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderAnnotation);
 
 public:
     /// Constructor
@@ -86,7 +86,7 @@ private:
  */
 class GuiExport ViewProviderAnnotationLabel : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderAnnotationLabel);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderAnnotationLabel);
 
 public:
     /// Constructor

src/Gui/ViewProviderExtension.h

@@ -51,7 +51,7 @@ class GuiExport ViewProviderExtension : public App::Extension
 
     //The cass does not have properties itself, but it is important to provide the property access
     //functions.
-    EXTENSION_PROPERTY_HEADER(Gui::ViewProviderExtension);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderExtension);
 
 public:
 

src/Gui/ViewProviderExtern.h

@@ -35,7 +35,7 @@ namespace Gui {
 
 class GuiExport ViewProviderExtern:public ViewProvider
 {
-    PROPERTY_HEADER(Gui::ViewProviderExtern);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderExtern);
 
 public:
     /// constructor.

src/Gui/ViewProviderFeature.h

@@ -34,7 +34,7 @@ class View3DInventorViewer;
 
 class GuiExport ViewProviderFeature:public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderFeature);
 
 public:
     /// constructor.

src/Gui/ViewProviderGeometryObject.h

@@ -45,7 +45,7 @@ class View3DInventorViewer;
  */
 class GuiExport ViewProviderGeometryObject : public ViewProviderDragger
 {
-    PROPERTY_HEADER(Gui::ViewProviderGeometryObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderGeometryObject);
 
 public:
     /// constructor.

src/Gui/ViewProviderInventorObject.h

@@ -32,7 +32,7 @@ namespace Gui
 
 class GuiExport ViewProviderInventorObject : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderInventorObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderInventorObject);
 
 public:
     /// constructor.

src/Gui/ViewProviderLine.h

@@ -31,7 +31,7 @@ namespace Gui
 {
 
 class GuiExport ViewProviderLine : public ViewProviderOriginFeature {
-    PROPERTY_HEADER(Gui::ViewProviderLine);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderLine);
 public:
     /// Constructor
     ViewProviderLine();

src/Gui/ViewProviderMaterialObject.h

@@ -32,7 +32,7 @@ namespace Gui {
 
 class GuiExport ViewProviderMaterialObject : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderMaterialObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderMaterialObject);
 
 public:
     /// constructor.

src/Gui/ViewProviderMeasureDistance.h

@@ -61,7 +61,7 @@ private:
 
 class GuiExport ViewProviderPointMarker : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderPointMarker);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPointMarker);
 
 public:
     ViewProviderPointMarker();
@@ -75,7 +75,7 @@ protected:
 
 class GuiExport ViewProviderMeasureDistance : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderMeasureDistance);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderMeasureDistance);
 
 public:
     /// Constructor

src/Gui/ViewProviderOrigin.h

@@ -35,7 +35,7 @@ class Document;
 
 class GuiExport ViewProviderOrigin : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderOrigin);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderOrigin);
 
 public:
     /// Size of the origin as set by the part.
@@ -51,7 +51,7 @@ public:
     std::vector<App::DocumentObject*> claimChildren() const override;
     std::vector<App::DocumentObject*> claimChildren3D() const override;
 
-    SoGroup* getChildRoot() const override {return pcGroupChildren;};
+    SoGroup* getChildRoot() const override {return pcGroupChildren;}
 
     void attach(App::DocumentObject* pcObject) override;
     std::vector<std::string> getDisplayModes() const override;

src/Gui/ViewProviderOriginFeature.h

@@ -35,7 +35,7 @@ namespace Gui
  * View provider associated with an App::OriginFeature.
  */
 class GuiExport ViewProviderOriginFeature: public ViewProviderGeometryObject {
-    PROPERTY_HEADER(Gui::ViewProviderOriginFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderOriginFeature);
 
 public:
     /// The display size of the feature

src/Gui/ViewProviderPlane.h

@@ -32,7 +32,7 @@ namespace Gui
 
 class GuiExport ViewProviderPlane : public ViewProviderOriginFeature
 {
-    PROPERTY_HEADER(Gui::ViewProviderPlane);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPlane);
 public:
     /// Constructor
     ViewProviderPlane();

src/Gui/ViewProviderTextDocument.h

@@ -32,7 +32,7 @@ class QPlainTextEdit;
 namespace Gui {
 
 class GuiExport ViewProviderTextDocument : public ViewProviderDocumentObject {
-    PROPERTY_HEADER(Gui::ViewProviderTextDocument);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderTextDocument);
 public:
     ViewProviderTextDocument();
     ~ViewProviderTextDocument() override {}

src/Gui/ViewProviderVRMLObject.h

@@ -34,7 +34,7 @@ namespace Gui
 class SoFCSelection;
 class GuiExport ViewProviderVRMLObject : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderVRMLObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderVRMLObject);
 
 public:
     /// constructor.

src/Gui/Workbench.h

@@ -51,7 +51,7 @@ class WorkbenchManager;
  */
 class GuiExport Workbench : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** Constructs a workbench object. */
@@ -146,7 +146,7 @@ private:
  */
 class GuiExport StdWorkbench : public Workbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     StdWorkbench();
@@ -176,7 +176,7 @@ protected:
  */
 class GuiExport BlankWorkbench : public Workbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     BlankWorkbench();
@@ -206,7 +206,7 @@ protected:
  */
 class GuiExport NoneWorkbench : public StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     NoneWorkbench();
@@ -228,7 +228,7 @@ protected:
 
 class GuiExport TestWorkbench : public StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TestWorkbench();
@@ -247,7 +247,7 @@ protected:
  */
 class GuiExport PythonBaseWorkbench : public Workbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PythonBaseWorkbench();
@@ -298,7 +298,7 @@ protected:
 
 class GuiExport PythonBlankWorkbench : public PythonBaseWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PythonBlankWorkbench();
@@ -312,7 +312,7 @@ public:
  */
 class GuiExport PythonWorkbench : public PythonBaseWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PythonWorkbench();

src/Mod/Fem/App/FemAnalysis.h

@@ -50,7 +50,7 @@ namespace Fem {
  *  Analysis.
  */
 class FemExport FemAnalysis : public App::DocumentObjectGroup {
-    PROPERTY_HEADER(Fem::FemAnalysis);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemAnalysis);
 
 public:
     /**
@@ -88,7 +88,7 @@ protected:
 
 class FemExport DocumentObject : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::DocumentObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::DocumentObject);
 };
 
 typedef App::FeaturePythonT<FemAnalysis> FemAnalysisPython;

src/Mod/Fem/App/FemConstraint.h

@@ -57,7 +57,7 @@ namespace Fem {
  *  scale&).
  */
 class FemExport Constraint : public App::DocumentObject {
-    PROPERTY_HEADER(Fem::Constraint);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::Constraint);
 
 public:
     Constraint();

src/Mod/Fem/App/FemConstraintBearing.h

@@ -36,7 +36,7 @@ namespace Fem
 
 class FemExport ConstraintBearing : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintBearing);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintBearing);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintContact.h

@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport ConstraintContact : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintContact);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintContact);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintDisplacement.h

@@ -34,7 +34,7 @@ namespace Fem
 
 class FemExport ConstraintDisplacement : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintDisplacement);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintDisplacement);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintFixed.h

@@ -35,7 +35,7 @@ namespace Fem
 
 class FemExport ConstraintFixed : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintFixed);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintFixed);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintFluidBoundary.h

@@ -37,7 +37,7 @@ namespace Fem
 
 class FemExport ConstraintFluidBoundary: public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintFluidBoundary);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintFluidBoundary);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintForce.h

@@ -36,7 +36,7 @@ namespace Fem
 
 class FemExport ConstraintForce : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintForce);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintForce);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintGear.h

@@ -36,7 +36,7 @@ namespace Fem
 
 class FemExport ConstraintGear : public Fem::ConstraintBearing
 {
-    PROPERTY_HEADER(Fem::ConstraintGear);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintGear);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintHeatflux.h

@@ -33,7 +33,7 @@ namespace Fem {
 
 class FemExport ConstraintHeatflux : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintHeatflux);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintHeatflux);
 
 public:
     ConstraintHeatflux();

src/Mod/Fem/App/FemConstraintInitialTemperature.h

@@ -34,7 +34,7 @@ namespace Fem
 
 class FemExport ConstraintInitialTemperature : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintInitialTemperature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintInitialTemperature);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintPlaneRotation.h

@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport ConstraintPlaneRotation : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintPlaneRotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintPlaneRotation);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintPressure.h

@@ -31,7 +31,7 @@ namespace Fem {
 
 class FemExport ConstraintPressure : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintPressure);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintPressure);
 
 public:
     ConstraintPressure();

src/Mod/Fem/App/FemConstraintPulley.h

@@ -35,7 +35,7 @@ namespace Fem
 
 class FemExport ConstraintPulley : public Fem::ConstraintGear
 {
-    PROPERTY_HEADER(Fem::ConstraintPulley);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintPulley);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintSpring.h

@@ -31,7 +31,7 @@ namespace Fem {
 
 class FemExport ConstraintSpring : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintSpring);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintSpring);
 
 public:
     ConstraintSpring();

src/Mod/Fem/App/FemConstraintTemperature.h

@@ -34,7 +34,7 @@ namespace Fem
 
 class FemExport ConstraintTemperature : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintTemperature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintTemperature);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemConstraintTransform.h

@@ -31,7 +31,7 @@ namespace Fem
 
 class FemExport ConstraintTransform : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintTransform);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintTransform);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemMesh.h

@@ -51,7 +51,7 @@ typedef std::shared_ptr<SMESH_Hypothesis> SMESH_HypothesisPtr;
  */
 class FemExport FemMesh : public Data::ComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     FemMesh();

src/Mod/Fem/App/FemMeshObject.h

@@ -35,7 +35,7 @@ namespace Fem
 
 class FemExport FemMeshObject : public App::GeoFeature
 {
-    PROPERTY_HEADER(Fem::FemMeshObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemMeshObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemMeshProperty.h

@@ -37,7 +37,7 @@ namespace Fem
  */
 class FemExport PropertyFemMesh : public App::PropertyComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyFemMesh();

src/Mod/Fem/App/FemMeshShapeNetgenObject.h

@@ -31,7 +31,7 @@ namespace Fem
 
 class FemExport FemMeshShapeNetgenObject : public FemMeshShapeObject
 {
-    PROPERTY_HEADER(Fem::FemMeshShapeNetgenObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemMeshShapeNetgenObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemMeshShapeObject.h

@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport FemMeshShapeObject : public FemMeshObject
 {
-    PROPERTY_HEADER(Fem::FemMeshShapeObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemMeshShapeObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemPostFilter.h

@@ -42,7 +42,7 @@ namespace Fem
 
 class FemExport FemPostFilter : public Fem::FemPostObject
 {
-    PROPERTY_HEADER(Fem::FemPostFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostFilter);
 
 public:
     /// Constructor
@@ -74,7 +74,7 @@ private:
 
 class FemExport FemPostClipFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostClipFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostClipFilter);
 
 public:
     FemPostClipFilter();
@@ -100,7 +100,7 @@ private:
 
 class FemExport FemPostDataAlongLineFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostDataAlongLineFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostDataAlongLineFilter);
 
 public:
     FemPostDataAlongLineFilter();
@@ -133,7 +133,7 @@ private:
 
 class FemExport FemPostDataAtPointFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostDataAtPointFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostDataAtPointFilter);
 
 public:
     FemPostDataAtPointFilter();
@@ -164,7 +164,7 @@ private:
 
 class FemExport FemPostScalarClipFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostScalarClipFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostScalarClipFilter);
 
 public:
     FemPostScalarClipFilter();
@@ -192,7 +192,7 @@ private:
 
 class FemExport FemPostWarpVectorFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostWarpVectorFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostWarpVectorFilter);
 
 public:
     FemPostWarpVectorFilter();
@@ -217,7 +217,7 @@ private:
 
 class FemExport FemPostCutFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostCutFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostCutFilter);
 
 public:
     FemPostCutFilter();

src/Mod/Fem/App/FemPostFunction.h

@@ -39,7 +39,7 @@ namespace Fem
 
 class FemExport FemPostFunction : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::FemPostFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostFunction);
 
 public:
     /// Constructor
@@ -65,7 +65,7 @@ protected:
 
 class FemExport FemPostFunctionProvider : public App::DocumentObject {
 
-    PROPERTY_HEADER(Fem::FemPostFunctionProvider);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostFunctionProvider);
 
 public:
     FemPostFunctionProvider();
@@ -86,7 +86,7 @@ protected:
 
 class FemExport FemPostPlaneFunction : public FemPostFunction
 {
-    PROPERTY_HEADER(Fem::FemPostPlaneFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostPlaneFunction);
 
 public:
 
@@ -112,7 +112,7 @@ protected:
 
 class FemExport FemPostSphereFunction : public FemPostFunction
 {
-    PROPERTY_HEADER(Fem::FemPostSphereFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostSphereFunction);
 
 public:
 

src/Mod/Fem/App/FemPostObject.h

@@ -35,7 +35,7 @@ namespace Fem
 //poly data is the only data we can visualize, hence every post processing object needs to expose it
 class FemExport FemPostObject : public App::GeoFeature
 {
-    PROPERTY_HEADER(Fem::FemPostObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemPostPipeline.h

@@ -36,7 +36,7 @@ namespace Fem
 
 class FemExport FemPostPipeline : public Fem::FemPostFilter
 {
-    PROPERTY_HEADER(Fem::FemPostPipeline);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostPipeline);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemResultObject.h

@@ -34,7 +34,7 @@ namespace Fem
 /// Father of all result data in a Fem Analysis
 class FemExport FemResultObject : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::FemResultObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemResultObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemSetElementsObject.h

@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport FemSetElementsObject : public FemSetObject
 {
-    PROPERTY_HEADER(Fem::FemSetElementsObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetElementsObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemSetFacesObject.h

@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport FemSetFacesObject : public FemSetObject
 {
-    PROPERTY_HEADER(Fem::FemSetFacesObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetFacesObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemSetGeometryObject.h

@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport FemSetGeometryObject : public FemSetObject
 {
-    PROPERTY_HEADER(Fem::FemSetGeometryObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetGeometryObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemSetNodesObject.h

@@ -33,7 +33,7 @@ namespace Fem
 
 class FemExport FemSetNodesObject : public FemSetObject
 {
-    PROPERTY_HEADER(Fem::FemSetNodesObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetNodesObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemSetObject.h

@@ -33,7 +33,7 @@ namespace Fem
 
 class FemExport FemSetObject : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::FemSetObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/FemSolverObject.h

@@ -33,7 +33,7 @@ namespace Fem
 /// Father of all result data in a Fem Analysis
 class FemExport FemSolverObject : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::FemSolverObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSolverObject);
 
 public:
     /// Constructor

src/Mod/Fem/App/PropertyPostDataObject.h

@@ -39,7 +39,7 @@ namespace Fem
  */
 class FemExport PropertyPostDataObject : public App::Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyPostDataObject();

src/Mod/Fem/Gui/TaskPostBoxes.h

@@ -81,7 +81,7 @@ private:
 
 class FemGuiExport ViewProviderPointMarker : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderPointMarker);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderPointMarker);
 
 public:
     ViewProviderPointMarker();
@@ -121,7 +121,7 @@ private:
 
 class FemGuiExport ViewProviderDataMarker : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderDataMarker);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderDataMarker);
 
 public:
     ViewProviderDataMarker();

src/Mod/Fem/Gui/ViewProviderAnalysis.h

@@ -49,7 +49,7 @@ private:
 class FemGuiExport ViewProviderFemAnalysis : public Gui::ViewProviderDocumentObjectGroup
 {
     Q_DECLARE_TR_FUNCTIONS(FemGui::ViewProviderFemAnalysis)
-    PROPERTY_HEADER(FemGui::ViewProviderAnalysis);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderAnalysis);
 
 public:
     /// constructor.

src/Mod/Fem/Gui/ViewProviderFemConstraint.h

@@ -44,7 +44,7 @@ class TaskFemConstraint;
 
 class FemGuiExport ViewProviderFemConstraint : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraint);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraint);
 
 public:
     /// Constructor

src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h

@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintBearing : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintBearing);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintBearing);
 
 public:
     /// Constructor

src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h

@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintContact : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintContact);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintContact);
 
 public:
     ViewProviderFemConstraintContact();

src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h

@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintDisplacement : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintDisplacement);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintDisplacement);
 
 public:
     ViewProviderFemConstraintDisplacement();

src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h

@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintFixed : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintFixed);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintFixed);
 
 public:
     /// Constructor

src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h

@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintFluidBoundary : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintFluidBoundary);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintFluidBoundary);
 
 public:
     /// Constructor

src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h

@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintForce : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintForce);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintForce);
 
 public:
     /// Constructor

src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h

@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintGear : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintGear);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintGear);
 
 public:
     /// Constructor

src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h

@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintHeatflux : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintHeatflux);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintHeatflux);
 
 public:
     ViewProviderFemConstraintHeatflux();

src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h

@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintInitialTemperature : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintInitialTemperature);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintInitialTemperature);
 
 public:
     ViewProviderFemConstraintInitialTemperature();

src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h

@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintOnBoundary : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintOnBoundary);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintOnBoundary);
 
 public:
     ViewProviderFemConstraintOnBoundary();

src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h

@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintPlaneRotation : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPlaneRotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintPlaneRotation);
 
 public:
     ViewProviderFemConstraintPlaneRotation();

src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h

@@ -30,7 +30,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintPressure : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPressure);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintPressure);
 
 public:
     ViewProviderFemConstraintPressure();

src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h

@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintPulley : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPulley);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintPulley);
 
 public:
     /// Constructor

src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h

@@ -30,7 +30,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintSpring : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintSpring);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintSpring);
 
 public:
     ViewProviderFemConstraintSpring();

src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h

@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintTemperature : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintTemperature);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintTemperature);
 
 public:
     ViewProviderFemConstraintTemperature();

src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h

@@ -33,7 +33,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintTransform : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintTransform);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintTransform);
 
 public:
     ViewProviderFemConstraintTransform();

src/Mod/Fem/Gui/ViewProviderFemMesh.h

@@ -58,7 +58,7 @@ public:
 
 class FemGuiExport ViewProviderFemMesh : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemMesh);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemMesh);
 
 public:
     /// constructor.

src/Mod/Fem/Gui/ViewProviderFemMeshShape.h

@@ -31,7 +31,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemMeshShape : public ViewProviderFemMesh
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemMeshShape);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemMeshShape);
 
 public:
     /// constructor.

src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h

@@ -30,7 +30,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemMeshShapeNetgen : public ViewProviderFemMeshShape
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemMeshShapeNetgen);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemMeshShapeNetgen);
 
 public:
     /// constructor.

src/Mod/Fem/Gui/ViewProviderFemPostFilter.h

@@ -31,7 +31,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemPostClip : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostClip);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostClip);
 
 public:
     /// constructor.
@@ -44,7 +44,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostDataAlongLine : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostDataAlongLine);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostDataAlongLine);
 
 public:
     /// constructor.
@@ -57,7 +57,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostDataAtPoint: public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostDataAtPoint);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostDataAtPoint);
 
 public:
     /// constructor.
@@ -71,7 +71,7 @@ protected:
 };
 class FemGuiExport ViewProviderFemPostScalarClip : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostScalarClip);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostScalarClip);
 
 public:
     /// constructor.
@@ -84,7 +84,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostWarpVector : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostWarpVector);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostWarpVector);
 
 public:
     /// constructor.
@@ -97,7 +97,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostCut : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostCut);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostCut);
 
 public:
     /// constructor.

src/Mod/Fem/Gui/ViewProviderFemPostFunction.h

@@ -74,7 +74,7 @@ private:
 
 class FemGuiExport ViewProviderFemPostFunctionProvider : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostFunction);
 
 public:
     ViewProviderFemPostFunctionProvider();
@@ -100,7 +100,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostFunction : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostFunction);
 
 public:
     /// constructor.
@@ -173,7 +173,7 @@ private:
 
 class FemGuiExport ViewProviderFemPostPlaneFunction : public ViewProviderFemPostFunction {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostPlaneFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostPlaneFunction);
 
 public:
     ViewProviderFemPostPlaneFunction();
@@ -216,7 +216,7 @@ private:
 
 class FemGuiExport ViewProviderFemPostSphereFunction : public ViewProviderFemPostFunction {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostSphereFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostSphereFunction);
 
 public:
     ViewProviderFemPostSphereFunction();

src/Mod/Fem/Gui/ViewProviderFemPostObject.h

@@ -66,7 +66,7 @@ class TaskDlgPost;
 class FemGuiExport ViewProviderFemPostObject : public Gui::ViewProviderDocumentObject,
                                                public Base::Observer<int>
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostObject);
 
 public:
     /// constructor.

src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h

@@ -33,7 +33,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemPostPipeline : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostPipeline);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostPipeline);
 
 public:
     /// constructor.

src/Mod/Fem/Gui/ViewProviderResult.h

@@ -33,7 +33,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderResult : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderResult);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderResult);
 
 public:
     /// constructor

src/Mod/Fem/Gui/ViewProviderSetElements.h

@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetElements : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(RobotGui::ViewProviderSetElements);
+    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetElements);
 
 public:
     bool doubleClicked() override;

src/Mod/Fem/Gui/ViewProviderSetFaces.h

@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetFaces : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(RobotGui::ViewProviderSetFaces);
+    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetFaces);
 
 public:
     bool doubleClicked() override;

src/Mod/Fem/Gui/ViewProviderSetGeometry.h

@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetGeometry : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(RobotGui::ViewProviderSetGeometry);
+    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetGeometry);
 
 public:
     bool doubleClicked() override;

src/Mod/Fem/Gui/ViewProviderSetNodes.h

@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetNodes : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderSetNodes);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderSetNodes);
 
 public:
     bool doubleClicked() override;

src/Mod/Fem/Gui/ViewProviderSolver.h

@@ -43,7 +43,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderSolver : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderSolver);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderSolver);
 
 public:
     /// constructor

src/Mod/Fem/Gui/Workbench.h

@@ -34,7 +34,7 @@ namespace FemGui {
  */
 class FemGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();

src/Mod/Image/App/ImagePlane.h

@@ -33,7 +33,7 @@ namespace Image
 
 class ImageExport ImagePlane : public App::GeoFeature
 {
-    PROPERTY_HEADER(Image::ImagePlane);
+    PROPERTY_HEADER_WITH_OVERRIDE(Image::ImagePlane);
 
 public:
     /// Constructor

src/Mod/Image/Gui/ViewProviderImagePlane.h

@@ -37,7 +37,7 @@ namespace ImageGui
 
 class ImageGuiExport ViewProviderImagePlane : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(RobotGui::ViewProviderImagePlane);
+    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderImagePlane);
 
 public:
     /// constructor.

src/Mod/Image/Gui/Workbench.h

@@ -33,7 +33,7 @@ namespace ImageGui {
  */
 class ImageGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();

src/Mod/Import/Gui/Workbench.h

@@ -33,7 +33,7 @@ namespace ImportGui {
  */
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();

src/Mod/Inspection/App/InspectionFeature.h

@@ -160,7 +160,7 @@ private:
 
 class InspectionExport PropertyDistanceList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -215,7 +215,7 @@ private:
  */
 class InspectionExport Feature : public App::DocumentObject
 {
-    PROPERTY_HEADER(Inspection::Feature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Inspection::Feature);
 
 public:
     /// Constructor
@@ -245,7 +245,7 @@ public:
 
 class InspectionExport Group : public App::DocumentObjectGroup
 {
-    PROPERTY_HEADER(Inspection::Group);
+    PROPERTY_HEADER_WITH_OVERRIDE(Inspection::Group);
 
 public:
     /// Constructor