OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6491 Add override keyword in cafPdm* to silence clang warnings.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-09-14 11:27:25 +02:00
parent 15b456b21f
commit de7d425474
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h
View File

@ -62,9 +62,9 @@ public:
const PdmPointer<DataType>& v() const { return m_fieldValue; }
// Child objects
virtual void childObjects( std::vector<PdmObjectHandle*>* objects );
virtual void childObjects( std::vector<PdmObjectHandle*>* 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 );

8
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h
View File

@ -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;

14
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h
View File

@ -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<QString> 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<QString> 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, ... ) \