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

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

src/Mod/Inspection/Gui/ViewProviderInspection.h

@@ -49,7 +49,7 @@ class ViewProviderInspection : public Gui::ViewProviderDocumentObject,
                                public Base::Observer<int>{
     typedef ViewProviderDocumentObject inherited;
 
-    PROPERTY_HEADER(InspectionGui::ViewProviderInspection);
+    PROPERTY_HEADER_WITH_OVERRIDE(InspectionGui::ViewProviderInspection);
 
 public:
     ViewProviderInspection();
@@ -100,7 +100,7 @@ private:
 
 class ViewProviderInspectionGroup : public Gui::ViewProviderDocumentObjectGroup
 {
-    PROPERTY_HEADER(InspectionGui::ViewProviderInspectionGroup);
+    PROPERTY_HEADER_WITH_OVERRIDE(InspectionGui::ViewProviderInspectionGroup);
 
 public:
     /// constructor

src/Mod/Inspection/Gui/Workbench.h

@@ -30,7 +30,7 @@ namespace InspectionGui {
 
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();

src/Mod/Measure/App/Measurement.h

@@ -47,7 +47,7 @@ namespace Measure
     };
 
 class MeasureExport Measurement : public Base::BaseClass {
-      TYPESYSTEM_HEADER();
+      TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
 
     App::PropertyLinkSubList References3D;

src/Mod/Mesh/App/Core/Visitor.h

@@ -82,7 +82,7 @@ public:
     MeshSearchNeighbourFacetsVisitor (const MeshKernel &rclMesh, float fRadius, FacetIndex ulStartFacetIdx);
     ~MeshSearchNeighbourFacetsVisitor () override {}
     /** Checks the facet if it lies inside the search radius. */
-    inline bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel);
+    inline bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel) override;
     /** Resets the VISIT flag of already visited facets. */
     inline std::vector<FacetIndex> GetAndReset ();
 
@@ -127,7 +127,7 @@ public:
     ~MeshTopFacetVisitor () override {}
     /** Collects the facet indices. */
     virtual bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom,
-                        FacetIndex ulFInd, unsigned long)
+                        FacetIndex ulFInd, unsigned long) override
     {
         (void)rclFacet;
         (void)rclFrom;
@@ -154,9 +154,9 @@ public:
                       std::vector<FacetIndex> &indices);
     ~MeshPlaneVisitor () override;
     bool AllowVisit (const MeshFacet& face, const MeshFacet&, 
-                     FacetIndex, unsigned long, unsigned short neighbourIndex);
+                     FacetIndex, unsigned long, unsigned short neighbourIndex) override;
     bool Visit (const MeshFacet & face, const MeshFacet &,
-                FacetIndex ulFInd, unsigned long);
+                FacetIndex ulFInd, unsigned long) override;
 
 protected:
     const MeshKernel& mesh;

src/Mod/Mesh/App/FeatureMeshCurvature.h

@@ -40,7 +40,7 @@ namespace Mesh
  */
 class MeshExport Curvature : public App::DocumentObject
 {
-    PROPERTY_HEADER(Mesh::Curvature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Curvature);
 
 public:
     Curvature();

src/Mod/Mesh/App/FeatureMeshDefects.h

@@ -37,7 +37,7 @@ namespace Mesh
  */
 class MeshExport FixDefects : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::FixDefects);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDefects);
 
 public:
   /// Constructor
@@ -67,7 +67,7 @@ public:
  */
 class MeshExport HarmonizeNormals : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::HarmonizeNormals);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::HarmonizeNormals);
 
 public:
   /// Constructor
@@ -87,7 +87,7 @@ public:
  */
 class MeshExport FlipNormals : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FlipNormals);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FlipNormals);
 
 public:
   /// Constructor
@@ -107,7 +107,7 @@ public:
  */
 class MeshExport FixNonManifolds : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixNonManifolds);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixNonManifolds);
 
 public:
   /// Constructor
@@ -127,7 +127,7 @@ public:
  */
 class MeshExport FixDuplicatedFaces : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixDuplicatedFaces);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDuplicatedFaces);
 
 public:
   /// Constructor
@@ -147,7 +147,7 @@ public:
  */
 class MeshExport FixDuplicatedPoints : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixDuplicatedPoints);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDuplicatedPoints);
 
 public:
   /// Constructor
@@ -167,7 +167,7 @@ public:
  */
 class MeshExport FixDegenerations : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixDegenerations);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDegenerations);
 
 public:
   /// Constructor
@@ -187,7 +187,7 @@ public:
  */
 class MeshExport FixDeformations : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixDeformations);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDeformations);
 
 public:
   /// Constructor
@@ -211,7 +211,7 @@ public:
  */
 class MeshExport FixIndices : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixIndices);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixIndices);
 
 public:
   /// Constructor
@@ -231,7 +231,7 @@ public:
  */
 class MeshExport FillHoles : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FillHoles);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FillHoles);
 
 public:
   /// Constructor
@@ -253,7 +253,7 @@ public:
  */
 class MeshExport RemoveComponents : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::RemoveComponents);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::RemoveComponents);
 
 public:
   /// Constructor

src/Mod/Mesh/App/FeatureMeshExport.h

@@ -40,7 +40,7 @@ namespace Mesh
  */
 class MeshExport Export : public App::DocumentObject
 {
-    PROPERTY_HEADER(Mesh::Export);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Export);
 
 public:
     Export();

src/Mod/Mesh/App/FeatureMeshImport.h

@@ -39,7 +39,7 @@ namespace Mesh
  */
 class Import : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Import);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Import);
 
 public:
   Import();

src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h

@@ -42,7 +42,7 @@ namespace Mesh
  */
 class SegmentByMesh : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::SegmentByMesh);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::SegmentByMesh);
 
 public:
   SegmentByMesh();

src/Mod/Mesh/App/FeatureMeshSetOperations.h

@@ -42,7 +42,7 @@ namespace Mesh
  */
 class SetOperations : public Mesh::Feature
 {
-    PROPERTY_HEADER(Mesh::SetOperations);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::SetOperations);
 
 public:
     SetOperations();

src/Mod/Mesh/App/FeatureMeshSolid.h

@@ -37,7 +37,7 @@ namespace Mesh
  */
 class Sphere : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Sphere);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Sphere);
 
 public:
   Sphere();
@@ -58,7 +58,7 @@ public:
 
 class Ellipsoid : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Ellipsoid);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Ellipsoid);
 
 public:
   Ellipsoid();
@@ -80,7 +80,7 @@ public:
 
 class Cylinder : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Cylinder);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Cylinder);
 
 public:
   Cylinder();
@@ -104,7 +104,7 @@ public:
 
 class Cone : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Cone);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Cone);
 
 public:
   Cone();
@@ -129,7 +129,7 @@ public:
 
 class Torus : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Torus);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Torus);
 
 public:
   Torus();
@@ -151,7 +151,7 @@ public:
 
 class Cube : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Cube);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Cube);
 
 public:
   Cube();

src/Mod/Mesh/App/FeatureMeshTransform.h

@@ -40,7 +40,7 @@ namespace Mesh
  */
 class Transform : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Transform);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Transform);
 
 public:
   Transform();

src/Mod/Mesh/App/FeatureMeshTransformDemolding.h

@@ -39,7 +39,7 @@ namespace Mesh
  */
 class TransformDemolding : public Transform
 {
-    PROPERTY_HEADER(Mesh::TransformDemolding);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::TransformDemolding);
 
 public:
     TransformDemolding();

src/Mod/Mesh/App/Mesh.h

@@ -63,7 +63,7 @@ namespace Mesh
 class MeshObject;
 class MeshExport MeshSegment : public Data::Segment
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     std::string getName() const override {
@@ -82,7 +82,7 @@ public:
  */
 class MeshExport MeshObject : public Data::ComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum GeometryType {PLANE, CYLINDER, SPHERE};

src/Mod/Mesh/App/MeshFeature.h

@@ -53,7 +53,7 @@ class MeshFeaturePy;
  */
 class MeshExport Feature : public App::GeoFeature
 {
-    PROPERTY_HEADER(Mesh::Feature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Feature);
 
 public:
     /// Constructor

src/Mod/Mesh/App/MeshProperties.h

@@ -52,7 +52,7 @@ class MeshPy;
  */
 class MeshExport PropertyNormalList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyNormalList();
@@ -110,7 +110,7 @@ struct MeshExport CurvatureInfo
  */
 class MeshExport PropertyCurvatureList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum { 
@@ -169,7 +169,7 @@ private:
  */
 class MeshExport PropertyMeshKernel : public App::PropertyComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyMeshKernel();

src/Mod/Mesh/Gui/MeshEditor.h

@@ -48,7 +48,7 @@ class SoFCMeshPickNode;
  */
 class MeshGuiExport ViewProviderFace : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderFace);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderFace);
 
 public:
     ViewProviderFace();

src/Mod/Mesh/Gui/ViewProvider.h

@@ -90,7 +90,7 @@ public:
  */
 class MeshGuiExport ViewProviderExport : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderExport);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderExport);
 
 public:
     ViewProviderExport();
@@ -109,7 +109,7 @@ public:
  */
 class MeshGuiExport ViewProviderMesh : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMesh);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMesh);
 
 public:
     ViewProviderMesh();
@@ -252,7 +252,7 @@ private:
  */
 class MeshGuiExport ViewProviderIndexedFaceSet : public ViewProviderMesh
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderIndexedFaceSet);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderIndexedFaceSet);
 
 public:
     ViewProviderIndexedFaceSet();
@@ -279,7 +279,7 @@ private:
  */
 class MeshGuiExport ViewProviderMeshObject : public ViewProviderMesh
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshObject);
 
 public:
     ViewProviderMeshObject();

src/Mod/Mesh/Gui/ViewProviderCurvature.h

@@ -60,7 +60,7 @@ class MeshGuiExport ViewProviderMeshCurvature : public Gui::ViewProviderDocument
                                                 public Base::Observer<int> {
     typedef Gui::ViewProviderDocumentObject inherited;
 
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshCurvature);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshCurvature);
 
 public:
     ViewProviderMeshCurvature();

src/Mod/Mesh/Gui/ViewProviderDefects.h

@@ -38,7 +38,7 @@ namespace MeshGui {
  */
 class MeshGuiExport ViewProviderMeshDefects : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshDefects);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshDefects);
 
 public:
     ViewProviderMeshDefects();
@@ -65,7 +65,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshOrientation : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshOrientation);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshOrientation);
 
 public:
     ViewProviderMeshOrientation();
@@ -83,7 +83,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshNonManifolds : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshNonManifolds);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshNonManifolds);
 
 public:
     ViewProviderMeshNonManifolds();
@@ -101,7 +101,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshNonManifoldPoints : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshNonManifoldPoints);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshNonManifoldPoints);
 
 public:
     ViewProviderMeshNonManifoldPoints();
@@ -119,7 +119,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshDuplicatedFaces : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshDuplicatedFaces);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshDuplicatedFaces);
 
 public:
     ViewProviderMeshDuplicatedFaces();
@@ -137,7 +137,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshDegenerations : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshDegenerations);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshDegenerations);
 
 public:
     ViewProviderMeshDegenerations();
@@ -152,7 +152,7 @@ protected:
 
 class MeshGuiExport ViewProviderMeshDuplicatedPoints : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshDuplicatedPoints);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshDuplicatedPoints);
 
 public:
     ViewProviderMeshDuplicatedPoints();
@@ -167,7 +167,7 @@ protected:
 
 class MeshGuiExport ViewProviderMeshIndices : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshIndices);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshIndices);
 
 public:
     ViewProviderMeshIndices();
@@ -185,7 +185,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshSelfIntersections : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshSelfIntersections);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshSelfIntersections);
 
 public:
     ViewProviderMeshSelfIntersections();
@@ -200,7 +200,7 @@ protected:
 
 class MeshGuiExport ViewProviderMeshFolds : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshFolds);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshFolds);
 
 public:
     ViewProviderMeshFolds();

src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h

@@ -48,7 +48,7 @@ class SoFCIndexedFaceSet;
  */
 class MeshGuiExport ViewProviderMeshFaceSet : public ViewProviderMesh
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshFaceSet);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshFaceSet);
 
 public:
     ViewProviderMeshFaceSet();

src/Mod/Mesh/Gui/ViewProviderTransform.h

@@ -47,7 +47,7 @@ namespace MeshGui {
  */
 class ViewProviderMeshTransform : public ViewProviderMesh
 {
-  PROPERTY_HEADER(MeshGui::ViewProviderMeshTransform);
+  PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshTransform);
 
 public:
   ViewProviderMeshTransform();

src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h

@@ -52,7 +52,7 @@ namespace MeshGui {
  */
 class ViewProviderMeshTransformDemolding : public ViewProviderMesh
 {
-  PROPERTY_HEADER(MeshGui::ViewProviderMeshTransformDemolding);
+  PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshTransformDemolding);
 
 public:
   ViewProviderMeshTransformDemolding();

src/Mod/Mesh/Gui/Workbench.h

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

src/Mod/MeshPart/Gui/CurveOnMesh.h

@@ -45,7 +45,7 @@ namespace MeshPartGui
 
 class ViewProviderCurveOnMesh : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(MeshPartGui::ViewProviderCurveOnMesh);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshPartGui::ViewProviderCurveOnMesh);
 
 public:
     ViewProviderCurveOnMesh();

src/Mod/MeshPart/Gui/Workbench.h

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

src/Mod/Part/App/AttachExtension.h

@@ -59,7 +59,7 @@ public:
  */
 class PartExport AttachExtension : public App::DocumentObjectExtension
 {
-    EXTENSION_PROPERTY_HEADER(Part::AttachableObject);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Part::AttachableObject);
 public:
     AttachExtension();
     ~AttachExtension() override;

src/Mod/Part/App/Attacher.h

@@ -212,7 +212,7 @@ struct SuggestResult{
  */
 class PartExport AttachEngine : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public: //methods
     AttachEngine();
     virtual void setUp(const App::PropertyLinkSubList &references,
@@ -417,7 +417,7 @@ protected:
 
 class PartExport AttachEngine3D : public AttachEngine
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     AttachEngine3D();
     AttachEngine3D* copy() const override;
@@ -429,7 +429,7 @@ private:
 //attacher specialized for datum planes
 class PartExport AttachEnginePlane : public AttachEngine
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     AttachEnginePlane();
     AttachEnginePlane* copy() const override;
@@ -439,7 +439,7 @@ public:
 //attacher specialized for datum lines
 class PartExport AttachEngineLine : public AttachEngine
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     AttachEngineLine();
     AttachEngineLine* copy() const override;
@@ -449,7 +449,7 @@ public:
 //attacher specialized for datum points
 class PartExport AttachEnginePoint : public AttachEngine
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     AttachEnginePoint();
     AttachEnginePoint* copy() const override;