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

#3222 AppFwk : Improve robustness/maintainability (3)

Browse Source
This commit is contained in:
Magne Sjaastad
2018-08-20 08:56:35 +02:00
parent 26f6eb1dd4
commit 56bf2ede7d
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h
View File

@@ -15,14 +15,14 @@ public:
// Gui generalized interface // Gui generalized interface
public: public:
virtual QVariant uiValue() const; QVariant uiValue() const override;
virtual void setValueFromUiEditor(const QVariant& uiValue); void setValueFromUiEditor(const QVariant& uiValue) override;
virtual QList<PdmOptionItemInfo> valueOptions(bool* useOptionsOnly); QList<PdmOptionItemInfo> valueOptions(bool* useOptionsOnly) const override;
virtual QVariant toUiBasedQVariant() const; QVariant toUiBasedQVariant() const override;
private: private:
QList<PdmOptionItemInfo> m_optionEntryCache; mutable QList<PdmOptionItemInfo> m_optionEntryCache;
private: private:
FieldType* m_field; FieldType* m_field;
@@ -42,11 +42,11 @@ public:
// Gui generalized interface // Gui generalized interface
public: public:
virtual QVariant uiValue() const { return QVariant();} QVariant uiValue() const override { return QVariant();}
virtual void setValueFromUiEditor(const QVariant& uiValue) { } void setValueFromUiEditor(const QVariant& uiValue) override { }
virtual QList<PdmOptionItemInfo> valueOptions(bool* useOptionsOnly) { return QList<PdmOptionItemInfo>(); } QList<PdmOptionItemInfo> valueOptions(bool* useOptionsOnly) const override { return QList<PdmOptionItemInfo>(); }
virtual QVariant toUiBasedQVariant() const { return QVariant(); } QVariant toUiBasedQVariant() const override { return QVariant(); }
}; };
// //
@@ -61,11 +61,11 @@ public:
// Gui generalized interface // Gui generalized interface
public: public:
virtual QVariant uiValue() const { return QVariant(); } QVariant uiValue() const override { return QVariant(); }
virtual void setValueFromUiEditor(const QVariant& uiValue) { } void setValueFromUiEditor(const QVariant& uiValue) override { }
virtual QList<PdmOptionItemInfo> valueOptions(bool* useOptionsOnly) { return QList<PdmOptionItemInfo>(); } QList<PdmOptionItemInfo> valueOptions(bool* useOptionsOnly) const override { return QList<PdmOptionItemInfo>(); }
virtual QVariant toUiBasedQVariant() const { return QVariant(); } QVariant toUiBasedQVariant() const override { return QVariant(); }
}; };
template<typename FieldType> template<typename FieldType>

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.inl
View File

@@ -169,7 +169,7 @@ QVariant caf::PdmFieldUiCap<FieldType>::uiValue() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
template<typename FieldType > template<typename FieldType >
QList<PdmOptionItemInfo> caf::PdmFieldUiCap<FieldType>::valueOptions(bool* useOptionsOnly) QList<PdmOptionItemInfo> caf::PdmFieldUiCap<FieldType>::valueOptions(bool* useOptionsOnly) const
{ {
m_optionEntryCache.clear(); m_optionEntryCache.clear();

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.cpp
View File

@@ -41,7 +41,7 @@ QVariant PdmUiFieldHandle::uiValue() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> PdmUiFieldHandle::valueOptions(bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> PdmUiFieldHandle::valueOptions(bool* useOptionsOnly) const
{ {
return QList<PdmOptionItemInfo>(); return QList<PdmOptionItemInfo>();
} }

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.h
View File

@@ -20,7 +20,7 @@ public:
// The QVariant encapsulates the real value, or an index into the valueOptions // The QVariant encapsulates the real value, or an index into the valueOptions
virtual QVariant uiValue() const; virtual QVariant uiValue() const;
virtual QList<PdmOptionItemInfo> valueOptions(bool* useOptionsOnly); virtual QList<PdmOptionItemInfo> valueOptions(bool* useOptionsOnly) const;
void notifyFieldChanged(const QVariant& oldUiBasedQVariant, const QVariant& newUiBasedQVariant) override; void notifyFieldChanged(const QVariant& oldUiBasedQVariant, const QVariant& newUiBasedQVariant) override;