From c05091885ee59cbc3e335ae8dede7291b2c08090 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 3 Aug 2023 23:13:02 +0200 Subject: [PATCH] App: modernize C++: use override --- src/App/ComplexGeoData.h | 2 +- src/App/ExpressionVisitors.h | 8 +- src/App/ExtensionContainer.h | 4 +- src/App/ExtensionPython.h | 6 +- src/App/FeatureCustom.h | 27 ++-- src/App/FeaturePython.h | 2 +- src/App/FeaturePythonPyImp.h | 6 +- src/App/GroupExtension.h | 2 +- src/App/PropertyUnits.h | 274 +++++++++++++++-------------------- 9 files changed, 149 insertions(+), 182 deletions(-) diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h index 9af995a3e5..42a1a539a5 100644 --- a/src/App/ComplexGeoData.h +++ b/src/App/ComplexGeoData.h @@ -85,7 +85,7 @@ public: /// Constructor ComplexGeoData(); /// Destructor - virtual ~ComplexGeoData() = default; + ~ComplexGeoData() override = default; /** @name Sub-element management */ //@{ diff --git a/src/App/ExpressionVisitors.h b/src/App/ExpressionVisitors.h index 93527ac6f1..2dc3c46b2b 100644 --- a/src/App/ExpressionVisitors.h +++ b/src/App/ExpressionVisitors.h @@ -44,7 +44,7 @@ public: { } - void visit(Expression &node) { + void visit(Expression &node) override { this->renameObjectIdentifier(node,paths,owner); } @@ -61,7 +61,7 @@ public: { } - void visit(Expression &node) { + void visit(Expression &node) override { this->updateElementReference(node,feature,reverse); } @@ -96,7 +96,7 @@ public: : ExpressionModifier

(prop),address(address),rowCount(rowCount),colCount(colCount) {} - void visit(Expression &node) { + void visit(Expression &node) override { this->moveCells(node,address,rowCount,colCount); } @@ -112,7 +112,7 @@ public: : ExpressionModifier

(prop),rowOffset(rowOffset),colOffset(colOffset) {} - void visit(Expression &node) { + void visit(Expression &node) override { this->offsetCells(node,rowOffset,colOffset); } diff --git a/src/App/ExtensionContainer.h b/src/App/ExtensionContainer.h index d3661c1dcf..68517fda3d 100644 --- a/src/App/ExtensionContainer.h +++ b/src/App/ExtensionContainer.h @@ -190,7 +190,7 @@ public: * * If no extension handles the request, then the containers handleChangedPropertyName() is called. */ - virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; /** Extends the rules for handling property type changed, so that extensions are given an opportunity to handle it. * If an extension handles a change, neither the rest of the extensions, nor the container itself get to handle it. * @@ -198,7 +198,7 @@ public: * * If no extension handles the request, then the containers handleChangedPropertyType() is called. */ - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, Property * prop) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, Property * prop) override; private: //stored extensions diff --git a/src/App/ExtensionPython.h b/src/App/ExtensionPython.h index 854c09fb51..c49635afbc 100644 --- a/src/App/ExtensionPython.h +++ b/src/App/ExtensionPython.h @@ -35,9 +35,9 @@ namespace App { * class to behave as a Python extension -- simply by subclassing. */ template -class ExtensionPythonT : public ExtensionT +class ExtensionPythonT : public ExtensionT //NOLINT { - EXTENSION_PROPERTY_HEADER(App::ExtensionPythonT); + EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(App::ExtensionPythonT); public: using Inherited = ExtensionT; @@ -46,7 +46,7 @@ public: ExtensionT::m_isPythonExtension = true; ExtensionT::initExtensionType(ExtensionPythonT::getExtensionClassTypeId()); } - virtual ~ExtensionPythonT() = default; + ~ExtensionPythonT() override = default; ExtensionPythonT(const ExtensionPythonT&) = delete; ExtensionPythonT(ExtensionPythonT&&) = delete; diff --git a/src/App/FeatureCustom.h b/src/App/FeatureCustom.h index 6fbce3f8ff..3b1873d3fe 100644 --- a/src/App/FeatureCustom.h +++ b/src/App/FeatureCustom.h @@ -25,10 +25,12 @@ #ifndef APP_FEATURECUSTOM_H #define APP_FEATURECUSTOM_H +#include namespace App { +class DocumentObjectExecReturn; class Property; /** @@ -40,50 +42,51 @@ class Property; * @author Werner Mayer */ template -class FeatureCustomT : public FeatureT +class FeatureCustomT : public FeatureT //NOLINT { - PROPERTY_HEADER(App::FeatureCustomT); + PROPERTY_HEADER_WITH_OVERRIDE(App::FeatureCustomT); public: FeatureCustomT() = default; - virtual ~FeatureCustomT() = default; + ~FeatureCustomT() override = default; /** @name methods override DocumentObject */ //@{ - short mustExecute() const { + short mustExecute() const override { return FeatureT::mustExecute(); } /// recalculate the Feature - virtual DocumentObjectExecReturn *execute() { + DocumentObjectExecReturn *execute() override { return FeatureT::execute(); } /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return FeatureT::getViewProviderName(); } - PyObject *getPyObject() { + PyObject *getPyObject() override { return FeatureT::getPyObject(); } - void setPyObject(PyObject *obj) { + void setPyObject(PyObject *obj) override { FeatureT::setPyObject(obj); } protected: - virtual void onBeforeChange(const Property* prop) { + void onBeforeChange(const Property* prop) override { FeatureT::onBeforeChange(prop); } - virtual void onChanged(const Property* prop) { + void onChanged(const Property* prop) override { FeatureT::onChanged(prop); } - virtual void onDocumentRestored() { + void onDocumentRestored() override { FeatureT::onDocumentRestored(); } - virtual void onSettingDocument() { + void onSettingDocument() override { FeatureT::onSettingDocument(); } +public: FeatureCustomT(const FeatureCustomT&) = delete; FeatureCustomT(FeatureCustomT&&) = delete; FeatureCustomT& operator= (const FeatureCustomT&) = delete; diff --git a/src/App/FeaturePython.h b/src/App/FeaturePython.h index cb3dbf152c..eb9c22f0c6 100644 --- a/src/App/FeaturePython.h +++ b/src/App/FeaturePython.h @@ -175,7 +175,7 @@ public: // cannot move this to the initializer list to avoid warning imp = new FeaturePythonImp(this); } - virtual ~FeaturePythonT() { + ~FeaturePythonT() override { delete imp; } diff --git a/src/App/FeaturePythonPyImp.h b/src/App/FeaturePythonPyImp.h index 4e2bd58a15..dcc4d94ab7 100644 --- a/src/App/FeaturePythonPyImp.h +++ b/src/App/FeaturePythonPyImp.h @@ -89,14 +89,14 @@ public: public: explicit FeaturePythonPyT(Base::BaseClass *pcObject, PyTypeObject *T = &Type); - virtual ~FeaturePythonPyT(); + ~FeaturePythonPyT() override; /** @name callbacks and implementers for the python object methods */ //@{ static int __setattro(PyObject *PyObj, PyObject *attro, PyObject *value); //@} - PyObject *_getattr(const char *attr); // __getattr__ function - int _setattr(const char *attr, PyObject *value); // __setattr__ function + PyObject *_getattr(const char *attr) override; + int _setattr(const char *attr, PyObject *value) override; protected: PyObject * dict_methods; diff --git a/src/App/GroupExtension.h b/src/App/GroupExtension.h index 65d4a583a6..9635ef536d 100644 --- a/src/App/GroupExtension.h +++ b/src/App/GroupExtension.h @@ -143,7 +143,7 @@ class GroupExtensionPythonT : public ExtensionT { public: GroupExtensionPythonT() = default; - virtual ~GroupExtensionPythonT() = default; + ~GroupExtensionPythonT() override = default; //override the documentobjectextension functions to make them available in python bool allowObject(DocumentObject* obj) override { diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h index b715d3e1af..74ccf9690f 100644 --- a/src/App/PropertyUnits.h +++ b/src/App/PropertyUnits.h @@ -141,12 +141,11 @@ public: */ class AppExport PropertyAmountOfSubstance: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyAmountOfSubstance(void); - virtual ~PropertyAmountOfSubstance() - {} + PropertyAmountOfSubstance(); + ~PropertyAmountOfSubstance() override = default; }; /** Angle property @@ -182,12 +181,11 @@ public: */ class AppExport PropertyCompressiveStrength: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyCompressiveStrength(void); - virtual ~PropertyCompressiveStrength() - {} + PropertyCompressiveStrength(); + ~PropertyCompressiveStrength() override = default; }; /** CurrentDensity property @@ -210,12 +208,11 @@ public: */ class AppExport PropertyDensity: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyDensity(void); - virtual ~PropertyDensity() - {} + PropertyDensity(); + ~PropertyDensity() override = default; }; /** DissipationRate property @@ -224,12 +221,11 @@ public: */ class AppExport PropertyDissipationRate: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyDissipationRate(void); - virtual ~PropertyDissipationRate() - {} + PropertyDissipationRate(); + ~PropertyDissipationRate() override = default; }; /** Distance property @@ -251,12 +247,11 @@ public: */ class AppExport PropertyDynamicViscosity: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyDynamicViscosity(void); - virtual ~PropertyDynamicViscosity() - {} + PropertyDynamicViscosity(); + ~PropertyDynamicViscosity() override = default; }; /** ElectricalCapacitance property @@ -265,12 +260,11 @@ public: */ class AppExport PropertyElectricalCapacitance: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyElectricalCapacitance(void); - virtual ~PropertyElectricalCapacitance() - {} + PropertyElectricalCapacitance(); + ~PropertyElectricalCapacitance() override = default; }; /** ElectricalConductance property @@ -279,12 +273,11 @@ public: */ class AppExport PropertyElectricalConductance: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyElectricalConductance(void); - virtual ~PropertyElectricalConductance() - {} + PropertyElectricalConductance(); + ~PropertyElectricalConductance() override = default; }; /** ElectricalConductivity property @@ -293,12 +286,11 @@ public: */ class AppExport PropertyElectricalConductivity: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyElectricalConductivity(void); - virtual ~PropertyElectricalConductivity() - {} + PropertyElectricalConductivity(); + ~PropertyElectricalConductivity() override = default; }; /** ElectricalInductance property @@ -307,12 +299,11 @@ public: */ class AppExport PropertyElectricalInductance: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyElectricalInductance(void); - virtual ~PropertyElectricalInductance() - {} + PropertyElectricalInductance(); + ~PropertyElectricalInductance() override = default; }; /** ElectricalResistance property @@ -322,12 +313,11 @@ public: class AppExport PropertyElectricalResistance: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyElectricalResistance(void); - virtual ~PropertyElectricalResistance() - {} + PropertyElectricalResistance(); + ~PropertyElectricalResistance() override = default; }; /** ElectricCharge property @@ -336,12 +326,11 @@ public: */ class AppExport PropertyElectricCharge: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyElectricCharge(void); - virtual ~PropertyElectricCharge() - {} + PropertyElectricCharge(); + ~PropertyElectricCharge() override = default; }; /** ElectricCurrent property @@ -350,12 +339,11 @@ public: */ class AppExport PropertyElectricCurrent: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyElectricCurrent(void); - virtual ~PropertyElectricCurrent() - {} + PropertyElectricCurrent(); + ~PropertyElectricCurrent() override = default; }; /** ElectricPotential property @@ -403,12 +391,11 @@ public: */ class AppExport PropertyHeatFlux: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyHeatFlux(void); - virtual ~PropertyHeatFlux() - {} + PropertyHeatFlux(); + ~PropertyHeatFlux() override = default; }; /** InverseArea property @@ -417,12 +404,11 @@ public: */ class AppExport PropertyInverseArea: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyInverseArea(void); - virtual ~PropertyInverseArea() - {} + PropertyInverseArea(); + ~PropertyInverseArea() override = default; }; /** InverseLength property @@ -431,12 +417,11 @@ public: */ class AppExport PropertyInverseLength: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyInverseLength(void); - virtual ~PropertyInverseLength() - {} + PropertyInverseLength(); + ~PropertyInverseLength() override = default; }; /** InverseVolume property @@ -445,12 +430,11 @@ public: */ class AppExport PropertyInverseVolume: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyInverseVolume(void); - virtual ~PropertyInverseVolume() - {} + PropertyInverseVolume(); + ~PropertyInverseVolume() override = default; }; /** KinematicViscosity property @@ -459,12 +443,11 @@ public: */ class AppExport PropertyKinematicViscosity: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyKinematicViscosity(void); - virtual ~PropertyKinematicViscosity() - {} + PropertyKinematicViscosity(); + ~PropertyKinematicViscosity() override = default; }; /** Length property @@ -486,12 +469,11 @@ public: */ class AppExport PropertyLuminousIntensity: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyLuminousIntensity(void); - virtual ~PropertyLuminousIntensity() - {} + PropertyLuminousIntensity(); + ~PropertyLuminousIntensity() override = default; }; /** MagneticFieldStrength property @@ -500,12 +482,11 @@ public: */ class AppExport PropertyMagneticFieldStrength: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyMagneticFieldStrength(void); - virtual ~PropertyMagneticFieldStrength() - {} + PropertyMagneticFieldStrength(); + ~PropertyMagneticFieldStrength() override = default; }; /** MagneticFlux property @@ -514,12 +495,11 @@ public: */ class AppExport PropertyMagneticFlux: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyMagneticFlux(void); - virtual ~PropertyMagneticFlux() - {} + PropertyMagneticFlux(); + ~PropertyMagneticFlux() override = default; }; /** MagneticFluxDensity property @@ -528,12 +508,11 @@ public: */ class AppExport PropertyMagneticFluxDensity: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyMagneticFluxDensity(void); - virtual ~PropertyMagneticFluxDensity() - {} + PropertyMagneticFluxDensity(); + ~PropertyMagneticFluxDensity() override = default; }; /** Magnetization property @@ -554,14 +533,13 @@ public: * property. On the Gui it has a quantity like kg. */ class AppExport PropertyMass: public PropertyQuantity - { - TYPESYSTEM_HEADER(); +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyMass(void); - virtual ~PropertyMass() - {} - }; + PropertyMass(); + ~PropertyMass() override = default; +}; /** Pressure property * This is a property for representing pressure. It basically a float @@ -582,12 +560,11 @@ public: */ class AppExport PropertyPower: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyPower(void); - virtual ~PropertyPower() - {} + PropertyPower(); + ~PropertyPower() override = default; }; /** ShearModulus property @@ -596,12 +573,11 @@ public: */ class AppExport PropertyShearModulus: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyShearModulus(void); - virtual ~PropertyShearModulus() - {} + PropertyShearModulus(); + ~PropertyShearModulus() override = default; }; /** SpecificEnergy property @@ -610,12 +586,11 @@ public: */ class AppExport PropertySpecificEnergy: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertySpecificEnergy(void); - virtual ~PropertySpecificEnergy() - {} + PropertySpecificEnergy(); + ~PropertySpecificEnergy() override = default; }; /** SpecificHeat property @@ -624,12 +599,11 @@ public: */ class AppExport PropertySpecificHeat: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertySpecificHeat(void); - virtual ~PropertySpecificHeat() - {} + PropertySpecificHeat(); + ~PropertySpecificHeat() override = default; }; /** Speed property @@ -664,12 +638,11 @@ public: */ class AppExport PropertyStress: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyStress(void); - virtual ~PropertyStress() - {} + PropertyStress(); + ~PropertyStress() override = default; }; /** Temperature property @@ -678,12 +651,11 @@ public: */ class AppExport PropertyTemperature: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyTemperature(void); - virtual ~PropertyTemperature() - {} + PropertyTemperature(); + ~PropertyTemperature() override = default; }; /** ThermalConductivity property @@ -692,12 +664,11 @@ public: */ class AppExport PropertyThermalConductivity: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyThermalConductivity(void); - virtual ~PropertyThermalConductivity() - {} + PropertyThermalConductivity(); + ~PropertyThermalConductivity() override = default; }; /** ThermalExpansionCoefficient property @@ -706,12 +677,11 @@ public: */ class AppExport PropertyThermalExpansionCoefficient: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyThermalExpansionCoefficient(void); - virtual ~PropertyThermalExpansionCoefficient() - {} + PropertyThermalExpansionCoefficient(); + ~PropertyThermalExpansionCoefficient() override = default; }; /** ThermalTransferCoefficient property @@ -720,12 +690,11 @@ public: */ class AppExport PropertyThermalTransferCoefficient: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyThermalTransferCoefficient(void); - virtual ~PropertyThermalTransferCoefficient() - {} + PropertyThermalTransferCoefficient(); + ~PropertyThermalTransferCoefficient() override = default; }; /** TimeSpan property @@ -734,11 +703,11 @@ public: */ class AppExport PropertyTime: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyTime(void); - virtual ~PropertyTime(){} + PropertyTime(); + ~PropertyTime() override = default; }; /** UltimateTensileStrength property @@ -747,11 +716,11 @@ public: */ class AppExport PropertyUltimateTensileStrength: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyUltimateTensileStrength(void); - virtual ~PropertyUltimateTensileStrength(){} + PropertyUltimateTensileStrength(); + ~PropertyUltimateTensileStrength() override = default; }; /** VacuumPermittivity property @@ -773,12 +742,11 @@ public: */ class AppExport PropertyVelocity: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyVelocity(void); - virtual ~PropertyVelocity() - {} + PropertyVelocity(); + ~PropertyVelocity() override = default; }; /** Volume property @@ -800,12 +768,11 @@ public: */ class AppExport PropertyVolumeFlowRate: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyVolumeFlowRate(void); - virtual ~PropertyVolumeFlowRate() - {} + PropertyVolumeFlowRate(); + ~PropertyVolumeFlowRate() override = default; }; /** VolumetricThermalExpansionCoefficient property @@ -814,12 +781,11 @@ public: */ class AppExport PropertyVolumetricThermalExpansionCoefficient: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyVolumetricThermalExpansionCoefficient(void); - virtual ~PropertyVolumetricThermalExpansionCoefficient() - {} + PropertyVolumetricThermalExpansionCoefficient(); + ~PropertyVolumetricThermalExpansionCoefficient() override = default; }; /** Work property @@ -828,11 +794,11 @@ public: */ class AppExport PropertyWork: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyWork(void); - virtual ~PropertyWork(){} + PropertyWork(); + ~PropertyWork() override = default; }; /** YieldStrength property @@ -841,12 +807,11 @@ public: */ class AppExport PropertyYieldStrength: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyYieldStrength(void); - virtual ~PropertyYieldStrength() - {} + PropertyYieldStrength(); + ~PropertyYieldStrength() override = default; }; /** YoungsModulus property @@ -855,12 +820,11 @@ public: */ class AppExport PropertyYoungsModulus: public PropertyQuantity { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - PropertyYoungsModulus(void); - virtual ~PropertyYoungsModulus() - {} + PropertyYoungsModulus(); + ~PropertyYoungsModulus() override = default; }; }// namespace App