diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h index 15611421d3..c903aa0c7a 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h @@ -62,9 +62,9 @@ public: const PdmPointer& v() const { return m_fieldValue; } // Child objects - virtual void childObjects( std::vector* objects ); + virtual void childObjects( std::vector* objects ) override; void setChildObject( PdmObjectHandle* object ) override; - virtual void removeChildObject( PdmObjectHandle* object ); + virtual void removeChildObject( PdmObjectHandle* object ) override; private: PDM_DISABLE_COPY_AND_ASSIGN( PdmChildField ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h index 2cfc2b6c38..7c49c7d315 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h @@ -34,7 +34,7 @@ public: void writeFieldData( QXmlStreamWriter& xmlStream ) const override; bool resolveReferences() override; - bool isVectorField() const; + bool isVectorField() const override; private: FieldType* m_field; @@ -96,7 +96,7 @@ public: void readFieldData( QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory ) override; void writeFieldData( QXmlStreamWriter& xmlStream ) const override; bool resolveReferences() override; - bool isVectorField() const; + bool isVectorField() const override; private: FieldType* m_field; @@ -153,7 +153,7 @@ public: void readFieldData( QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory ) override; void writeFieldData( QXmlStreamWriter& xmlStream ) const override; bool resolveReferences() override; - bool isVectorField() const; + bool isVectorField() const override; private: FieldType* m_field; @@ -181,7 +181,7 @@ public: void readFieldData( QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory ) override; void writeFieldData( QXmlStreamWriter& xmlStream ) const override; bool resolveReferences() override; - bool isVectorField() const; + bool isVectorField() const override; private: FieldType* m_field; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h index b6d38df8a3..15c1c95527 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h @@ -25,13 +25,13 @@ /// Place this in the header file inside the class definition of your PdmObject // To be renamed CAF_PDM_XML_HEADER_INIT -#define CAF_PDM_XML_HEADER_INIT \ -public: \ - virtual QString classKeyword() const; \ - static QString classKeywordStatic(); \ - static std::vector classKeywordAliases(); \ - virtual bool matchesClassKeyword( const QString& keyword ) const; \ - \ +#define CAF_PDM_XML_HEADER_INIT \ +public: \ + virtual QString classKeyword() const override; \ + static QString classKeywordStatic(); \ + static std::vector classKeywordAliases(); \ + virtual bool matchesClassKeyword( const QString& keyword ) const override; \ + \ static bool Error_You_forgot_to_add_the_macro_CAF_PDM_XML_HEADER_INIT_and_or_CAF_PDM_XML_SOURCE_INIT_to_your_cpp_file_for_this_class() #define CAF_PDM_XML_ABSTRACT_SOURCE_INIT( ClassName, keyword, ... ) \