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

#3944 clang-tidy : Apply clang-tidy on caf

Browse Source
This commit is contained in:
Magne Sjaastad
2019-01-10 22:13:19 +01:00
parent cee966a6d1
commit 65ee55c96d
28 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmDataValueField.h
View File

@@ -66,7 +66,7 @@ public:
PdmDataValueField() {}
PdmDataValueField(const PdmDataValueField& other) { m_fieldValue = other.m_fieldValue; }
explicit PdmDataValueField(const DataType& fieldValue) { m_fieldValue = fieldValue; }
virtual ~PdmDataValueField() {}
~PdmDataValueField() override {}
// Assignment
@@ -81,9 +81,9 @@ public:
// Implementation of PdmValueField interface
virtual QVariant toQVariant() const { CAF_ASSERT(isInitializedByInitFieldMacro()); return PdmValueFieldSpecialization<DataType>::convert(m_fieldValue); }
virtual void setFromQVariant(const QVariant& variant) { CAF_ASSERT(isInitializedByInitFieldMacro()); PdmValueFieldSpecialization<DataType>::setFromVariant(variant, m_fieldValue); }
virtual bool isReadOnly() const { return false; }
QVariant toQVariant() const override { CAF_ASSERT(isInitializedByInitFieldMacro()); return PdmValueFieldSpecialization<DataType>::convert(m_fieldValue); }
void setFromQVariant(const QVariant& variant) override { CAF_ASSERT(isInitializedByInitFieldMacro()); PdmValueFieldSpecialization<DataType>::setFromVariant(variant, m_fieldValue); }
bool isReadOnly() const override { return false; }
// Access operators

8
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmProxyValueField.h
View File

@@ -23,7 +23,7 @@ class PdmProxyValueField : public PdmValueField
public:
typedef DataType FieldDataType;
PdmProxyValueField() { m_valueSetter = NULL; m_valueGetter = NULL; }
virtual ~PdmProxyValueField() { if (m_valueSetter) delete m_valueSetter; if (m_valueGetter) delete m_valueGetter; }
~PdmProxyValueField() override { if (m_valueSetter) delete m_valueSetter; if (m_valueGetter) delete m_valueGetter; }
// Assignment
@@ -36,9 +36,9 @@ public:
// Implementation of PdmValueField interface
virtual QVariant toQVariant() const { DataType val = value(); return PdmValueFieldSpecialization<DataType>::convert(val); }
virtual void setFromQVariant(const QVariant& variant) { DataType val; PdmValueFieldSpecialization<DataType>::setFromVariant(variant, val); setValue(val); }
virtual bool isReadOnly() const { if (!m_valueSetter) { return true; } else { return false; } }
QVariant toQVariant() const override { DataType val = value(); return PdmValueFieldSpecialization<DataType>::convert(val); }
void setFromQVariant(const QVariant& variant) override { DataType val; PdmValueFieldSpecialization<DataType>::setFromVariant(variant, val); setValue(val); }
bool isReadOnly() const override { if (!m_valueSetter) { return true; } else { return false; } }
// Access operators

10
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.h
View File

@@ -39,7 +39,7 @@ public:
PdmPtrField() : m_isResolved(false) { }
explicit PdmPtrField(const DataTypePtr& fieldValue);
virtual ~PdmPtrField();
~PdmPtrField() override;
// Assignment
@@ -52,9 +52,9 @@ public:
void setValue(const DataTypePtr& fieldValue);
// QVariant access
virtual QVariant toQVariant() const override;
virtual void setFromQVariant(const QVariant& variant) override;
virtual bool isReadOnly() const override { return false; }
QVariant toQVariant() const override;
void setFromQVariant(const QVariant& variant) override;
bool isReadOnly() const override { return false; }
// Access operators
@@ -66,7 +66,7 @@ public:
// Ptr referenced objects
virtual void ptrReferencedObjects(std::vector<PdmObjectHandle*>* objectsToFill);
void ptrReferencedObjects(std::vector<PdmObjectHandle*>* objectsToFill) override;
private: