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

clang-tidy : Remove redundant 'virtual' and add 'override'

Browse Source 
clang-tidy : Remove redundant 'virtual' and add 'override'
This commit is contained in:
Magne Sjaastad
2018-10-18 16:35:51 +02:00
parent 3569b3f375
commit 764fb65e8e
69 changed files with 325 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-tidy
View File

@@ -1,5 +1,5 @@
--- ---
Checks: '-*,modernize-use-nullptr' Checks: '-*,modernize-use-nullptr,modernize-use-override'
HeaderFilterRegex: '' HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false AnalyzeTemporaryDtors: false
... ...

6
Fwk/AppFwk/cafCommand/cafCmdExecCommandManager.cpp
View File

@@ -57,7 +57,7 @@ public:
setText(m_executeCommand->name()); setText(m_executeCommand->name());
} }
~UndoRedoWrapper() ~UndoRedoWrapper() override
{ {
delete m_executeCommand; delete m_executeCommand;
} }
@@ -65,7 +65,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void undo() void undo() override
{ {
m_executeCommand->undo(); m_executeCommand->undo();
} }
@@ -73,7 +73,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void redo() void redo() override
{ {
m_executeCommand->redo(); m_executeCommand->redo();
} }

2
Fwk/AppFwk/cafCommand/cafCmdFeature.h
View File

@@ -74,7 +74,7 @@ class CmdFeature : public QObject
Q_OBJECT Q_OBJECT
public: public:
CmdFeature(); CmdFeature();
virtual ~CmdFeature(); ~CmdFeature() override;
QAction* action(); QAction* action();
QAction* actionWithCustomText(const QString& customText); QAction* actionWithCustomText(const QString& customText);

2
Fwk/AppFwk/cafCommand/cafCmdFeatureManager.h
View File

@@ -60,7 +60,7 @@ class CmdFeatureManager : public QObject
public: public:
static CmdFeatureManager* instance(); static CmdFeatureManager* instance();
virtual ~CmdFeatureManager(); ~CmdFeatureManager() override;
QAction* action(const QString& commandId); QAction* action(const QString& commandId);
QAction* action(const QString& commandId, const QString& customActionText); QAction* action(const QString& commandId, const QString& customActionText);

8
Fwk/AppFwk/cafCommand/cafCmdFieldChangeExec.h
View File

@@ -77,14 +77,14 @@ class CmdFieldChangeExec : public CmdExecuteCommand
{ {
public: public:
explicit CmdFieldChangeExec(NotificationCenter* notificationCenter); explicit CmdFieldChangeExec(NotificationCenter* notificationCenter);
virtual ~CmdFieldChangeExec(); ~CmdFieldChangeExec() override;
CmdFieldChangeExecData* commandData(); CmdFieldChangeExecData* commandData();
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
void readFieldValueFromValidXmlDocument(QXmlStreamReader& xmlStream, PdmXmlFieldHandle* xmlFieldHandle); void readFieldValueFromValidXmlDocument(QXmlStreamReader& xmlStream, PdmXmlFieldHandle* xmlFieldHandle);

8
Fwk/AppFwk/cafCommand/cafCmdSelectionChangeExec.h
View File

@@ -78,13 +78,13 @@ class CmdSelectionChangeExec : public CmdExecuteCommand
{ {
public: public:
explicit CmdSelectionChangeExec(NotificationCenter* notificationCenter); explicit CmdSelectionChangeExec(NotificationCenter* notificationCenter);
virtual ~CmdSelectionChangeExec();; ~CmdSelectionChangeExec() override;;
CmdSelectionChangeExecData* commandData(); CmdSelectionChangeExecData* commandData();
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
CmdSelectionChangeExecData* m_commandData; CmdSelectionChangeExecData* m_commandData;

4
Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.h
View File

@@ -50,8 +50,8 @@ class CmdUiCommandSystemImpl : public PdmUiCommandSystemInterface
public: public:
CmdUiCommandSystemImpl(); CmdUiCommandSystemImpl();
virtual void fieldChangedCommand(const std::vector<PdmFieldHandle*>& fieldsToUpdate, const QVariant& newUiValue); void fieldChangedCommand(const std::vector<PdmFieldHandle*>& fieldsToUpdate, const QVariant& newUiValue) override;
virtual void populateMenuWithDefaultCommands(const QString& uiConfigName, QMenu* menu); void populateMenuWithDefaultCommands(const QString& uiConfigName, QMenu* menu) override;
bool isUndoEnabled(); bool isUndoEnabled();
void enableUndoFeature(bool enable); void enableUndoFeature(bool enable);

8
Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdAddItemExec.h
View File

@@ -52,13 +52,13 @@ class CmdAddItemExec : public CmdExecuteCommand
{ {
public: public:
explicit CmdAddItemExec(NotificationCenter* notificationCenter); explicit CmdAddItemExec(NotificationCenter* notificationCenter);
virtual ~CmdAddItemExec();; ~CmdAddItemExec() override;;
CmdAddItemExecData* commandData(); CmdAddItemExecData* commandData();
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
CmdAddItemExecData* m_commandData; CmdAddItemExecData* m_commandData;

6
Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdAddItemFeature.h
View File

@@ -53,9 +53,9 @@ class CmdAddItemFeature : public CmdFeature
protected: protected:
CmdExecuteCommand* createExecuteCommand(); CmdExecuteCommand* createExecuteCommand();
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
}; };

8
Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdDeleteItemExec.h
View File

@@ -52,14 +52,14 @@ class CmdDeleteItemExec : public CmdExecuteCommand
{ {
public: public:
explicit CmdDeleteItemExec(NotificationCenter* notificationCenter); explicit CmdDeleteItemExec(NotificationCenter* notificationCenter);
virtual ~CmdDeleteItemExec() {}; ~CmdDeleteItemExec() override {};
CmdDeleteItemExecData* commandData(); CmdDeleteItemExecData* commandData();
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
CmdDeleteItemExecData* m_commandData; CmdDeleteItemExecData* m_commandData;

6
Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdDeleteItemFeature.h
View File

@@ -52,9 +52,9 @@ protected:
CmdExecuteCommand* createExecuteCommand(); CmdExecuteCommand* createExecuteCommand();
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
}; };

23
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h
View File

@@ -21,7 +21,7 @@ class PdmChildArrayFieldHandle : public PdmPtrArrayFieldHandle
{ {
public: public:
PdmChildArrayFieldHandle() {} PdmChildArrayFieldHandle() {}
virtual ~PdmChildArrayFieldHandle() {} ~PdmChildArrayFieldHandle() override {}
virtual void deleteAllChildObjects() = 0; virtual void deleteAllChildObjects() = 0;
@@ -51,20 +51,21 @@ class PdmChildArrayField<DataType*> : public PdmChildArrayFieldHandle
typedef DataType* DataTypePtr; typedef DataType* DataTypePtr;
public: public:
PdmChildArrayField() { } PdmChildArrayField() { }
virtual ~PdmChildArrayField(); ~PdmChildArrayField() override;
PdmChildArrayField& operator() () { return *this; } PdmChildArrayField& operator() () { return *this; }
const PdmChildArrayField& operator() () const { return *this; } const PdmChildArrayField& operator() () const { return *this; }
// Reimplementation of PdmPointersFieldHandle methods // Reimplementation of PdmPointersFieldHandle methods
virtual size_t size() const { return m_pointers.size(); } size_t size() const override { return m_pointers.size(); }
virtual bool empty() const { return m_pointers.empty(); } bool empty() const override { return m_pointers.empty(); }
virtual void clear(); void clear() override;
virtual void deleteAllChildObjects(); void deleteAllChildObjects() override;
void insertAt(int indexAfter, PdmObjectHandle* obj) override;
PdmObjectHandle* at(size_t index) override;
virtual void deleteAllChildObjectsAsync(); virtual void deleteAllChildObjectsAsync();
virtual void insertAt(int indexAfter, PdmObjectHandle* obj);
virtual PdmObjectHandle* at(size_t index);
// std::vector-like access // std::vector-like access
@@ -76,7 +77,7 @@ public:
void insert(size_t indexAfter, const std::vector<PdmPointer<DataType> >& objects); void insert(size_t indexAfter, const std::vector<PdmPointer<DataType> >& objects);
size_t count(const DataType* pointer) const; size_t count(const DataType* pointer) const;
void erase(size_t index); void erase(size_t index) override;
size_t index(const DataType* pointer) const; size_t index(const DataType* pointer) const;
typename std::vector< PdmPointer<DataType> >::iterator begin() { return m_pointers.begin(); }; typename std::vector< PdmPointer<DataType> >::iterator begin() { return m_pointers.begin(); };
@@ -89,8 +90,8 @@ public:
// Child objects // Child objects
std::vector<DataType*> childObjects() const; std::vector<DataType*> childObjects() const;
virtual void childObjects(std::vector<PdmObjectHandle*>* objects); void childObjects(std::vector<PdmObjectHandle*>* objects) override;
virtual void removeChildObject(PdmObjectHandle* object); void removeChildObject(PdmObjectHandle* object) override;
private: //To be disabled private: //To be disabled
PDM_DISABLE_COPY_AND_ASSIGN(PdmChildArrayField); PDM_DISABLE_COPY_AND_ASSIGN(PdmChildArrayField);

2
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayFieldHandle.h
View File

@@ -14,7 +14,7 @@ class PdmPtrArrayFieldHandle : public PdmFieldHandle
{ {
public: public:
PdmPtrArrayFieldHandle() {} PdmPtrArrayFieldHandle() {}
virtual ~PdmPtrArrayFieldHandle() {} ~PdmPtrArrayFieldHandle() override {}
virtual size_t size() const = 0; virtual size_t size() const = 0;
virtual bool empty() const = 0; virtual bool empty() const = 0;

2
Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h
View File

@@ -140,7 +140,7 @@ class PdmObject : public PdmObjectHandle, public PdmXmlObjectHandle, public PdmU
{ {
public: public:
PdmObject() : PdmObjectHandle(), PdmXmlObjectHandle(this, false), PdmUiObjectHandle(this, false) {} PdmObject() : PdmObjectHandle(), PdmXmlObjectHandle(this, false), PdmUiObjectHandle(this, false) {}
virtual ~PdmObject() {} ~PdmObject() override {}
/// Adds field to the internal data structure and sets the file keyword and Ui information /// Adds field to the internal data structure and sets the file keyword and Ui information
/// Consider this method private. Please use the CAF_PDM_InitField() macro instead /// Consider this method private. Please use the CAF_PDM_InitField() macro instead

4
Fwk/AppFwk/cafProjectDataModel/cafPdmObjectGroup.h
View File

@@ -18,7 +18,7 @@ class PdmObjectGroup : public PdmObject
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
PdmObjectGroup(); PdmObjectGroup();
~PdmObjectGroup(); ~PdmObjectGroup() override;
std::vector<PdmObjectHandle*> objects; std::vector<PdmObjectHandle*> objects;
@@ -73,7 +73,7 @@ class PdmObjectCollection : public PdmObject
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
PdmObjectCollection(); PdmObjectCollection();
~PdmObjectCollection(); ~PdmObjectCollection() override;
caf::PdmChildArrayField<PdmObjectHandle*> objects; caf::PdmChildArrayField<PdmObjectHandle*> objects;
}; };

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiEditorHandle.h
View File

@@ -54,7 +54,7 @@ class PdmUiEditorHandle : public QObject
{ {
public: public:
PdmUiEditorHandle(); PdmUiEditorHandle();
virtual ~PdmUiEditorHandle(); ~PdmUiEditorHandle() override;
public: public:
void updateUi(const QString& uiConfigName);; void updateUi(const QString& uiConfigName);;
@@ -92,7 +92,7 @@ class PdmUiProxyEditorHandle: public PdmUiEditorHandle
{ {
public: public:
explicit PdmUiProxyEditorHandle(PdmUiEditorHandle* mainEditorHandle) : PdmUiEditorHandle() { m_mainEditorHandle = mainEditorHandle; } explicit PdmUiProxyEditorHandle(PdmUiEditorHandle* mainEditorHandle) : PdmUiEditorHandle() { m_mainEditorHandle = mainEditorHandle; }
virtual ~PdmUiProxyEditorHandle() {}; ~PdmUiProxyEditorHandle() override {};
protected: // Interface to override: protected: // Interface to override:

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

@@ -88,7 +88,7 @@ class PdmUiFieldEditorHandle : public PdmUiEditorHandle
public: public:
PdmUiFieldEditorHandle(); PdmUiFieldEditorHandle();
~PdmUiFieldEditorHandle(); ~PdmUiFieldEditorHandle() override;
PdmUiFieldHandle* uiField(); PdmUiFieldHandle* uiField();
void setUiField(PdmUiFieldHandle* uiFieldHandle); void setUiField(PdmUiFieldHandle* uiFieldHandle);

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

@@ -12,7 +12,7 @@ class PdmUiFieldHandle : public PdmUiItem, public PdmFieldCapability, public Pdm
{ {
public: public:
PdmUiFieldHandle(PdmFieldHandle* owner, bool giveOwnership); PdmUiFieldHandle(PdmFieldHandle* owner, bool giveOwnership);
virtual ~PdmUiFieldHandle(); ~PdmUiFieldHandle() override;
PdmFieldHandle* fieldHandle(); PdmFieldHandle* fieldHandle();

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

@@ -59,7 +59,7 @@ class PdmUiObjectEditorHandle : public PdmUiEditorHandle
{ {
public: public:
PdmUiObjectEditorHandle(); PdmUiObjectEditorHandle();
virtual ~PdmUiObjectEditorHandle(); ~PdmUiObjectEditorHandle() override;
QWidget* getOrCreateWidget(QWidget* parent); QWidget* getOrCreateWidget(QWidget* parent);
QWidget* widget() const; QWidget* widget() const;

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

@@ -20,7 +20,7 @@ class PdmUiObjectHandle : public PdmUiItem, public PdmObjectCapability
{ {
public: public:
PdmUiObjectHandle(PdmObjectHandle* owner, bool giveOwnership); PdmUiObjectHandle(PdmObjectHandle* owner, bool giveOwnership);
virtual ~PdmUiObjectHandle() { } ~PdmUiObjectHandle() override { }
PdmObjectHandle* objectHandle() { return m_owner; } PdmObjectHandle* objectHandle() { return m_owner; }
const PdmObjectHandle* objectHandle() const { return m_owner; } const PdmObjectHandle* objectHandle() const { return m_owner; }

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

@@ -14,8 +14,8 @@ public:
// Xml Serializing // Xml Serializing
public: public:
virtual void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory); void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory) override;
virtual void writeFieldData(QXmlStreamWriter& xmlStream) const; void writeFieldData(QXmlStreamWriter& xmlStream) const override;
private: private:
FieldType* m_field; FieldType* m_field;
}; };
@@ -38,9 +38,9 @@ public:
// Xml Serializing // Xml Serializing
public: public:
virtual void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory); void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory) override;
virtual void writeFieldData(QXmlStreamWriter& xmlStream) const; void writeFieldData(QXmlStreamWriter& xmlStream) const override;
virtual void resolveReferences(); void resolveReferences() override;
private: private:
FieldType* m_field; FieldType* m_field;
@@ -67,9 +67,9 @@ public:
// Xml Serializing // Xml Serializing
public: public:
virtual void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory); void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory) override;
virtual void writeFieldData(QXmlStreamWriter& xmlStream) const; void writeFieldData(QXmlStreamWriter& xmlStream) const override;
virtual void resolveReferences(); void resolveReferences() override;
private: private:
FieldType* m_field; FieldType* m_field;
@@ -91,8 +91,8 @@ public:
// Xml Serializing // Xml Serializing
public: public:
virtual void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory); void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory) override;
virtual void writeFieldData(QXmlStreamWriter& xmlStream) const; void writeFieldData(QXmlStreamWriter& xmlStream) const override;
private: private:
FieldType* m_field; FieldType* m_field;
}; };
@@ -109,8 +109,8 @@ public:
// Xml Serializing // Xml Serializing
public: public:
virtual void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory); void readFieldData(QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory) override;
virtual void writeFieldData(QXmlStreamWriter& xmlStream) const; void writeFieldData(QXmlStreamWriter& xmlStream) const override;
private: private:
FieldType* m_field; FieldType* m_field;
}; };

6
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmDefaultObjectFactory.h
View File

@@ -62,7 +62,7 @@ class PdmDefaultObjectFactory : public PdmObjectFactory
public: public:
static PdmDefaultObjectFactory * instance(); static PdmDefaultObjectFactory * instance();
virtual PdmObjectHandle* create(const QString& classNameKeyword); PdmObjectHandle* create(const QString& classNameKeyword) override;
template< typename PdmObjectBaseDerivative > template< typename PdmObjectBaseDerivative >
bool registerCreator() bool registerCreator()
@@ -89,7 +89,7 @@ public:
private: private:
PdmDefaultObjectFactory() {} PdmDefaultObjectFactory() {}
~PdmDefaultObjectFactory() { /* Could clean up, but ... */ } ~PdmDefaultObjectFactory() override { /* Could clean up, but ... */ }
// Internal helper classes // Internal helper classes
@@ -105,7 +105,7 @@ private:
class PdmObjectCreator : public PdmObjectCreatorBase class PdmObjectCreator : public PdmObjectCreatorBase
{ {
public: public:
virtual PdmObjectHandle * create() { return new PdmObjectBaseDerivative(); } PdmObjectHandle * create() override { return new PdmObjectBaseDerivative(); }
}; };
// Map to store factory // Map to store factory

2
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlFieldHandle.h
View File

@@ -23,7 +23,7 @@ class PdmXmlFieldHandle : public PdmFieldCapability
{ {
public: public:
PdmXmlFieldHandle(PdmFieldHandle* owner , bool giveOwnership); PdmXmlFieldHandle(PdmFieldHandle* owner , bool giveOwnership);
virtual ~PdmXmlFieldHandle() { } ~PdmXmlFieldHandle() override { }
PdmFieldHandle* fieldHandle() { return m_owner; } PdmFieldHandle* fieldHandle() { return m_owner; }
const PdmFieldHandle* fieldHandle() const { return m_owner; } const PdmFieldHandle* fieldHandle() const { return m_owner; }

2
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.h
View File

@@ -27,7 +27,7 @@ class PdmXmlObjectHandle : public PdmObjectCapability
public: public:
PdmXmlObjectHandle(PdmObjectHandle* owner, bool giveOwnership); PdmXmlObjectHandle(PdmObjectHandle* owner, bool giveOwnership);
virtual ~PdmXmlObjectHandle() { } ~PdmXmlObjectHandle() override { }
/// The classKeyword method is overridden in subclasses by the CAF_PDM_XML_HEADER_INIT macro /// The classKeyword method is overridden in subclasses by the CAF_PDM_XML_HEADER_INIT macro
virtual QString classKeyword() const = 0; virtual QString classKeyword() const = 0;

6
Fwk/AppFwk/cafTests/cafTestApplication/CustomObjectEditor.h
View File

@@ -66,7 +66,7 @@ class CustomObjectEditor : public PdmUiFormLayoutObjectEditor
Q_OBJECT Q_OBJECT
public: public:
CustomObjectEditor(); CustomObjectEditor();
~CustomObjectEditor(); ~CustomObjectEditor() override;
void defineGridLayout(int rowCount, int columnCount); void defineGridLayout(int rowCount, int columnCount);
@@ -77,8 +77,8 @@ public:
void addBlankCell(int row, int column); void addBlankCell(int row, int column);
private: private:
virtual QWidget* createWidget(QWidget* parent) override; QWidget* createWidget(QWidget* parent) override;
virtual void recursivelyConfigureAndUpdateTopLevelUiOrdering(const PdmUiOrdering& topLevelUiOrdering, void recursivelyConfigureAndUpdateTopLevelUiOrdering(const PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName) override; const QString& uiConfigName) override;
bool isAreaAvailable(int row, int column, int rowSpan, int columnSpan) const; bool isAreaAvailable(int row, int column, int rowSpan, int columnSpan) const;

38
Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
View File

@@ -116,12 +116,12 @@ public:
caf::PdmField<bool> m_toggleField; caf::PdmField<bool> m_toggleField;
virtual caf::PdmFieldHandle* objectToggleField() caf::PdmFieldHandle* objectToggleField() override
{ {
return &m_toggleField; return &m_toggleField;
} }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override
{ {
if (changedField == &m_toggleField) if (changedField == &m_toggleField)
{ {
@@ -136,7 +136,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
@@ -201,7 +201,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineCustomContextMenu(const caf::PdmFieldHandle* fieldNeedingMenu, void defineCustomContextMenu(const caf::PdmFieldHandle* fieldNeedingMenu,
QMenu* menu, QMenu* menu,
QWidget* fieldEditorWidget) override QWidget* fieldEditorWidget) override
{ {
@@ -216,7 +216,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override
{ {
uiOrdering.add(&m_doubleField); uiOrdering.add(&m_doubleField);
uiOrdering.add(&m_intField); uiOrdering.add(&m_intField);
@@ -323,7 +323,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override
{ {
uiOrdering.add(&m_intFieldStandard); uiOrdering.add(&m_intFieldStandard);
uiOrdering.add(&m_intFieldUseFullSpace, caf::PdmUiOrdering::LayoutOptions(true, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN)); uiOrdering.add(&m_intFieldUseFullSpace, caf::PdmUiOrdering::LayoutOptions(true, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN));
@@ -431,12 +431,12 @@ public:
caf::PdmField<bool> m_toggleField; caf::PdmField<bool> m_toggleField;
caf::PdmField<bool> m_pushButtonField; caf::PdmField<bool> m_pushButtonField;
virtual caf::PdmFieldHandle* objectToggleField() caf::PdmFieldHandle* objectToggleField() override
{ {
return &m_toggleField; return &m_toggleField;
} }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override
{ {
if (changedField == &m_toggleField) if (changedField == &m_toggleField)
{ {
@@ -452,7 +452,7 @@ public:
} }
} }
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
@@ -500,7 +500,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual caf::PdmFieldHandle* userDescriptionField() caf::PdmFieldHandle* userDescriptionField() override
{ {
return &m_textField; return &m_textField;
} }
@@ -509,7 +509,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override
{ {
if (field == &m_multipleAppEnum) if (field == &m_multipleAppEnum)
{ {
@@ -533,7 +533,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override
{ {
caf::PdmUiTableViewPushButtonEditorAttribute* attr = dynamic_cast<caf::PdmUiTableViewPushButtonEditorAttribute*>(attribute); caf::PdmUiTableViewPushButtonEditorAttribute* attr = dynamic_cast<caf::PdmUiTableViewPushButtonEditorAttribute*>(attribute);
if (attr) if (attr)
@@ -598,7 +598,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override
{ {
uiOrdering.add(&m_objectListOfSameType); uiOrdering.add(&m_objectListOfSameType);
uiOrdering.add(&m_ptrField); uiOrdering.add(&m_ptrField);
@@ -616,7 +616,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
if (&m_multiSelectList == fieldNeedingOptions) if (&m_multiSelectList == fieldNeedingOptions)
@@ -651,7 +651,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual caf::PdmFieldHandle* userDescriptionField() caf::PdmFieldHandle* userDescriptionField() override
{ {
return &m_textField; return &m_textField;
} }
@@ -679,12 +679,12 @@ public:
MenuItemProducer* m_menuItemProducer; MenuItemProducer* m_menuItemProducer;
virtual caf::PdmFieldHandle* objectToggleField() caf::PdmFieldHandle* objectToggleField() override
{ {
return &m_toggleField; return &m_toggleField;
} }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override
{ {
if (changedField == &m_toggleField) if (changedField == &m_toggleField)
{ {
@@ -696,7 +696,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void onEditorWidgetsCreated() override void onEditorWidgetsCreated() override
{ {
for (auto e : m_longText.uiCapability()->connectedEditors()) for (auto e : m_longText.uiCapability()->connectedEditors())
{ {
@@ -720,7 +720,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineCustomContextMenu(const caf::PdmFieldHandle* fieldNeedingMenu, QMenu* menu, QWidget* fieldEditorWidget) override void defineCustomContextMenu(const caf::PdmFieldHandle* fieldNeedingMenu, QMenu* menu, QWidget* fieldEditorWidget) override
{ {
if (fieldNeedingMenu == &m_objectListOfSameType) if (fieldNeedingMenu == &m_objectListOfSameType)
{ {

2
Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.h
View File

@@ -27,7 +27,7 @@ class MainWindow : public QMainWindow
public: public:
MainWindow(); MainWindow();
~MainWindow(); ~MainWindow() override;
static MainWindow* instance(); static MainWindow* instance();
void setPdmRoot(caf::PdmObjectHandle* pdmRoot); void setPdmRoot(caf::PdmObjectHandle* pdmRoot);

10
Fwk/AppFwk/cafTests/cafTestApplication/ManyGroups.h
View File

@@ -19,9 +19,9 @@ public:
caf::PdmField<std::vector<QString> > m_multiSelectList; caf::PdmField<std::vector<QString> > m_multiSelectList;
caf::PdmField<bool> m_toggleField; caf::PdmField<bool> m_toggleField;
virtual caf::PdmFieldHandle* objectToggleField(); caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void setDoubleMember(const double& d) { m_doubleMember = d; std::cout << "setDoubleMember" << std::endl; } void setDoubleMember(const double& d) { m_doubleMember = d; std::cout << "setDoubleMember" << std::endl; }
double doubleMember() const { std::cout << "doubleMember" << std::endl; return m_doubleMember; } double doubleMember() const { std::cout << "doubleMember" << std::endl; return m_doubleMember; }
@@ -30,7 +30,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override; QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
private: private:
double m_doubleMember; double m_doubleMember;
@@ -39,9 +39,9 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override; void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
}; };

2
Fwk/AppFwk/cafTests/cafTestApplication/WidgetLayoutTest.h
View File

@@ -14,7 +14,7 @@ class WidgetLayoutTest : public QWidget
public: public:
WidgetLayoutTest(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr); WidgetLayoutTest(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr);
~WidgetLayoutTest(); ~WidgetLayoutTest() override;
private: private:
QGridLayout* m_mainLayout; QGridLayout* m_mainLayout;

28
Fwk/AppFwk/cafUserInterface/QMinimizePanel.h
View File

@@ -54,22 +54,22 @@ class QMinimizePanel : public QWidget
public: public:
explicit QMinimizePanel(QWidget* parent=nullptr); explicit QMinimizePanel(QWidget* parent=nullptr);
explicit QMinimizePanel(const QString &title, QWidget* parent=nullptr); explicit QMinimizePanel(const QString &title, QWidget* parent=nullptr);
~QMinimizePanel(); ~QMinimizePanel() override;
QFrame* contentFrame(); QFrame* contentFrame();
void setTitle (const QString& title); void setTitle (const QString& title);
QString title() const; QString title() const;
void enableFrame(bool showFrame); void enableFrame(bool showFrame);
virtual QSize minimumSizeHint() const override; QSize minimumSizeHint() const override;
virtual QSize sizeHint() const override; QSize sizeHint() const override;
public slots: public slots:
void setExpanded(bool isExpanded); void setExpanded(bool isExpanded);
void toggleExpanded(); void toggleExpanded();
signals: signals:
void expandedChanged(bool isExpanded); void expandedChanged(bool isExpanded);
public: public:
@@ -81,10 +81,10 @@ protected:
QFrame* m_contentFrame; QFrame* m_contentFrame;
QPalette m_contentPalette; QPalette m_contentPalette;
virtual void resizeEvent(QResizeEvent *) override; void resizeEvent(QResizeEvent *) override;
virtual bool event(QEvent* event) override; // To catch QEvent::LayoutRequest bool event(QEvent* event) override; // To catch QEvent::LayoutRequest
private: private:
void initialize(const QString &title); void initialize(const QString &title);
QSize calculateSizeHint(bool minimumSizeHint) const; QSize calculateSizeHint(bool minimumSizeHint) const;
}; };

8
Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxDelegate.h
View File

@@ -53,12 +53,12 @@ class PdmUiCheckBoxDelegate : public QStyledItemDelegate
public: public:
explicit PdmUiCheckBoxDelegate( QObject* pParent = nullptr ); explicit PdmUiCheckBoxDelegate( QObject* pParent = nullptr );
virtual ~PdmUiCheckBoxDelegate(); ~PdmUiCheckBoxDelegate() override;
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index); bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override;
virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
}; };

8
Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.h
View File

@@ -70,12 +70,12 @@ class PdmUiCheckBoxEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiCheckBoxEditor() {} PdmUiCheckBoxEditor() {}
virtual ~PdmUiCheckBoxEditor() {} ~PdmUiCheckBoxEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
protected slots: protected slots:
void slotClicked(bool checked); void slotClicked(bool checked);

8
Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxTristateEditor.h
View File

@@ -19,12 +19,12 @@ class PdmUiCheckBoxTristateEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiCheckBoxTristateEditor() {} PdmUiCheckBoxTristateEditor() {}
virtual ~PdmUiCheckBoxTristateEditor() {} ~PdmUiCheckBoxTristateEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget* parent); QWidget* createEditorWidget(QWidget* parent) override;
virtual QWidget* createLabelWidget(QWidget* parent); QWidget* createLabelWidget(QWidget* parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
protected slots: protected slots:
void slotClicked(bool); void slotClicked(bool);

12
Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h
View File

@@ -75,18 +75,18 @@ class PdmUiColorEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiColorEditor(); PdmUiColorEditor();
virtual ~PdmUiColorEditor() {} ~PdmUiColorEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
protected slots: protected slots:
void colorSelectionClicked(); void colorSelectionClicked();
private: private:
void setColorOnWidget(const QColor& c); void setColorOnWidget(const QColor& c);
private: private:
QPointer<QLabel> m_label; QPointer<QLabel> m_label;

6
Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
View File

@@ -210,7 +210,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void wheelEvent(QWheelEvent *e) void wheelEvent(QWheelEvent *e) override
{ {
if (hasFocus()) if (hasFocus())
{ {
@@ -227,7 +227,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void focusInEvent(QFocusEvent* e) override void focusInEvent(QFocusEvent* e) override
{ {
setFocusPolicy(Qt::WheelFocus); setFocusPolicy(Qt::WheelFocus);
QComboBox::focusInEvent(e); QComboBox::focusInEvent(e);
@@ -236,7 +236,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void focusOutEvent(QFocusEvent* e) override void focusOutEvent(QFocusEvent* e) override
{ {
setFocusPolicy(Qt::StrongFocus); setFocusPolicy(Qt::StrongFocus);
QComboBox::focusOutEvent(e); QComboBox::focusOutEvent(e);

16
Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h
View File

@@ -81,19 +81,19 @@ class PdmUiComboBoxEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiComboBoxEditor() {} PdmUiComboBoxEditor() {}
virtual ~PdmUiComboBoxEditor() {} ~PdmUiComboBoxEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
QMargins calculateLabelContentMargins() const override; QMargins calculateLabelContentMargins() const override;
protected slots: protected slots:
void slotIndexActivated(int index); void slotIndexActivated(int index);
void slotNextButtonPressed(); void slotNextButtonPressed();
void slotPreviousButtonPressed(); void slotPreviousButtonPressed();
private: private:
QPointer<QComboBox> m_comboBox; QPointer<QComboBox> m_comboBox;

8
Fwk/AppFwk/cafUserInterface/cafPdmUiDateEditor.h
View File

@@ -72,12 +72,12 @@ class PdmUiDateEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiDateEditor() {} PdmUiDateEditor() {}
virtual ~PdmUiDateEditor() {} ~PdmUiDateEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
protected slots: protected slots:
void slotEditingFinished(); void slotEditingFinished();

6
Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.h
View File

@@ -60,11 +60,11 @@ class PdmUiDefaultObjectEditor : public PdmUiFormLayoutObjectEditor
Q_OBJECT Q_OBJECT
public: public:
PdmUiDefaultObjectEditor(); PdmUiDefaultObjectEditor();
~PdmUiDefaultObjectEditor(); ~PdmUiDefaultObjectEditor() override;
private: private:
virtual QWidget* createWidget(QWidget* parent) override; QWidget* createWidget(QWidget* parent) override;
virtual void recursivelyConfigureAndUpdateTopLevelUiOrdering(const PdmUiOrdering& topLevelUiItems, void recursivelyConfigureAndUpdateTopLevelUiOrdering(const PdmUiOrdering& topLevelUiItems,
const QString& uiConfigName) override; const QString& uiConfigName) override;
}; };

4
Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp
View File

@@ -60,14 +60,14 @@ public:
{ {
} }
~PdmDoubleValidator() ~PdmDoubleValidator() override
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void fixup(QString& stringValue) const override void fixup(QString& stringValue) const override
{ {
double doubleValue = stringValue.toDouble(); double doubleValue = stringValue.toDouble();
doubleValue = qBound(bottom(), doubleValue, top()); doubleValue = qBound(bottom(), doubleValue, top());

20
Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.h
View File

@@ -81,23 +81,23 @@ class PdmUiDoubleSliderEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiDoubleSliderEditor() {} PdmUiDoubleSliderEditor() {}
virtual ~PdmUiDoubleSliderEditor() {} ~PdmUiDoubleSliderEditor() override {}
protected: protected:
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
protected slots: protected slots:
void slotEditingFinished(); void slotEditingFinished();
void slotSliderValueChanged(int value); void slotSliderValueChanged(int value);
private: private:
void updateSliderPosition(double value); void updateSliderPosition(double value);
void writeValueToField(double value); void writeValueToField(double value);
int convertToSliderValue(double value); int convertToSliderValue(double value);
double convertFromSliderValue(int sliderValue); double convertFromSliderValue(int sliderValue);
private: private:
QPointer<QLineEdit> m_lineEdit; QPointer<QLineEdit> m_lineEdit;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.h
View File

@@ -72,7 +72,7 @@ class PdmUiDoubleValueEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiDoubleValueEditor(); PdmUiDoubleValueEditor();
virtual ~PdmUiDoubleValueEditor(); ~PdmUiDoubleValueEditor() override;
protected: protected:
void configureAndUpdateUi(const QString& uiConfigName) override; void configureAndUpdateUi(const QString& uiConfigName) override;

12
Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h
View File

@@ -88,16 +88,16 @@ class PdmUiFilePathEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiFilePathEditor() {} PdmUiFilePathEditor() {}
virtual ~PdmUiFilePathEditor() {} ~PdmUiFilePathEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
protected slots: protected slots:
void slotEditingFinished(); void slotEditingFinished();
void fileSelectionClicked(); void fileSelectionClicked();
private: private:
QPointer<QLineEdit> m_lineEdit; QPointer<QLineEdit> m_lineEdit;

24
Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.h
View File

@@ -63,15 +63,15 @@ class PdmUiFormLayoutObjectEditor : public PdmUiObjectEditorHandle
Q_OBJECT Q_OBJECT
public: public:
PdmUiFormLayoutObjectEditor(); PdmUiFormLayoutObjectEditor();
~PdmUiFormLayoutObjectEditor(); ~PdmUiFormLayoutObjectEditor() override;
protected: protected:
/// When overriding this function, use findOrCreateGroupBox() or findOrCreateFieldEditor() for detailed control /// When overriding this function, use findOrCreateGroupBox() or findOrCreateFieldEditor() for detailed control
/// Use recursivelyConfigureAndUpdateUiItemsInGridLayoutColumn() for automatic layout of group and field widgets /// Use recursivelyConfigureAndUpdateUiItemsInGridLayoutColumn() for automatic layout of group and field widgets
virtual void recursivelyConfigureAndUpdateTopLevelUiOrdering(const PdmUiOrdering& topLevelUiOrdering, virtual void recursivelyConfigureAndUpdateTopLevelUiOrdering(const PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName) = 0; const QString& uiConfigName) = 0;
void recursivelyConfigureAndUpdateUiOrderingInGridLayoutColumn(const PdmUiOrdering& uiOrdering, void recursivelyConfigureAndUpdateUiOrderingInGridLayoutColumn(const PdmUiOrdering& uiOrdering,
QWidget* containerWidgetWithGridLayout, QWidget* containerWidgetWithGridLayout,
const QString& uiConfigName); const QString& uiConfigName);
@@ -79,17 +79,17 @@ protected:
PdmUiFieldEditorHandle* findOrCreateFieldEditor(QWidget* parent, PdmUiFieldHandle* field, const QString& uiConfigName); PdmUiFieldEditorHandle* findOrCreateFieldEditor(QWidget* parent, PdmUiFieldHandle* field, const QString& uiConfigName);
private slots: private slots:
void groupBoxExpandedStateToggled(bool isExpanded); void groupBoxExpandedStateToggled(bool isExpanded);
private: private:
bool isUiGroupExpanded(const PdmUiGroup* uiGroup) const; bool isUiGroupExpanded(const PdmUiGroup* uiGroup) const;
virtual void cleanupBeforeSettingPdmObject() override; void cleanupBeforeSettingPdmObject() override;
virtual void configureAndUpdateUi(const QString& uiConfigName) override; void configureAndUpdateUi(const QString& uiConfigName) override;
static void recursiveVerifyUniqueNames(const std::vector<PdmUiItem*>& uiItems, static void recursiveVerifyUniqueNames(const std::vector<PdmUiItem*>& uiItems,
const QString& uiConfigName, const QString& uiConfigName,
std::set<QString>* fieldKeywordNames, std::set<QString>* fieldKeywordNames,
std::set<QString>* groupNames); std::set<QString>* groupNames);
private: private:
std::map<PdmFieldHandle*, PdmUiFieldEditorHandle*> m_fieldViews; std::map<PdmFieldHandle*, PdmUiFieldEditorHandle*> m_fieldViews;

4
Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp
View File

@@ -71,7 +71,7 @@ public:
computeNextValidId(); computeNextValidId();
} }
virtual State validate(QString& currentString, int &) const State validate(QString& currentString, int &) const override
{ {
if (m_multipleSelectionOfSameFieldsSelected) if (m_multipleSelectionOfSameFieldsSelected)
{ {
@@ -116,7 +116,7 @@ public:
return QValidator::Acceptable; return QValidator::Acceptable;
} }
virtual void fixup(QString& editorText) const void fixup(QString& editorText) const override
{ {
editorText = QString::number(m_nextValidValue); editorText = QString::number(m_nextValidValue);
} }

16
Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h
View File

@@ -106,7 +106,7 @@ public:
PdmUiLineEdit(QWidget* parent); PdmUiLineEdit(QWidget* parent);
void setAvoidSendingEnterEventToParentWidget(bool avoidSendingEnter); void setAvoidSendingEnterEventToParentWidget(bool avoidSendingEnter);
protected: protected:
void keyPressEvent(QKeyEvent* event); void keyPressEvent(QKeyEvent* event) override;
private: private:
bool m_avoidSendingEnterEvent; bool m_avoidSendingEnterEvent;
}; };
@@ -121,19 +121,19 @@ class PdmUiLineEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiLineEditor() {} PdmUiLineEditor() {}
virtual ~PdmUiLineEditor() {} ~PdmUiLineEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
QMargins calculateLabelContentMargins() const override; QMargins calculateLabelContentMargins() const override;
protected slots: protected slots:
void slotEditingFinished(); void slotEditingFinished();
private: private:
bool isMultipleFieldsWithSameKeywordSelected(PdmFieldHandle* editorField) const; bool isMultipleFieldsWithSameKeywordSelected(PdmFieldHandle* editorField) const;
private: private:
QPointer<PdmUiLineEdit> m_lineEdit; QPointer<PdmUiLineEdit> m_lineEdit;

4
Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp
View File

@@ -66,7 +66,7 @@ class MyStringListModel : public QStringListModel
public: public:
explicit MyStringListModel(QObject *parent = nullptr) : QStringListModel(parent), m_isItemsEditable(false) { } explicit MyStringListModel(QObject *parent = nullptr) : QStringListModel(parent), m_isItemsEditable(false) { }
virtual Qt::ItemFlags flags (const QModelIndex& index) const Qt::ItemFlags flags (const QModelIndex& index) const override
{ {
if (m_isItemsEditable) if (m_isItemsEditable)
return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable; return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
@@ -98,7 +98,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual QSize sizeHint() const override QSize sizeHint() const override
{ {
QSize mySize = QListView::sizeHint(); QSize mySize = QListView::sizeHint();

24
Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h
View File

@@ -79,28 +79,28 @@ class PdmUiListEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiListEditor(); PdmUiListEditor();
virtual ~PdmUiListEditor(); ~PdmUiListEditor() override;
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
virtual bool eventFilter ( QObject * listView, QEvent * event ); // To catch delete key press in list view. bool eventFilter ( QObject * listView, QEvent * event ) override; // To catch delete key press in list view.
protected slots: protected slots:
void slotSelectionChanged( const QItemSelection & selected, const QItemSelection & deselected ); void slotSelectionChanged( const QItemSelection & selected, const QItemSelection & deselected );
void slotListItemEdited(const QModelIndex&, const QModelIndex&); void slotListItemEdited(const QModelIndex&, const QModelIndex&);
private: private:
QString contentAsString() const; QString contentAsString() const;
void pasteFromString(const QString& content); void pasteFromString(const QString& content);
void trimAndSetValuesToField(const QStringList& stringList); void trimAndSetValuesToField(const QStringList& stringList);
private: private:
QPointer<QListViewHeightHint> m_listView; QPointer<QListViewHeightHint> m_listView;
QPointer<QLabel> m_label; QPointer<QLabel> m_label;
QPointer<QStringListModel> m_model; QPointer<QStringListModel> m_model;
bool m_isEditOperationsAvailable; bool m_isEditOperationsAvailable;
int m_optionItemCount; int m_optionItemCount;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiListView.h
View File

@@ -55,7 +55,7 @@ class PdmUiListView : public QWidget
Q_OBJECT Q_OBJECT
public: public:
PdmUiListView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr); PdmUiListView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr);
~PdmUiListView(); ~PdmUiListView() override;
void setPdmObject(caf::PdmObjectCollection* object); void setPdmObject(caf::PdmObjectCollection* object);

18
Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h
View File

@@ -80,16 +80,16 @@ class UiListViewModelPdm : public QAbstractTableModel
public: public:
explicit UiListViewModelPdm(QObject* parent); explicit UiListViewModelPdm(QObject* parent);
void setPdmData(PdmObjectCollection* objectGroup, const QString& configName); void setPdmData(PdmObjectCollection* objectGroup, const QString& configName);
// Qt overrides // Qt overrides
virtual int rowCount( const QModelIndex &parent = QModelIndex( ) ) const; int rowCount( const QModelIndex &parent = QModelIndex( ) ) const override;
virtual int columnCount( const QModelIndex &parent = QModelIndex( ) ) const; int columnCount( const QModelIndex &parent = QModelIndex( ) ) const override;
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const; QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
virtual QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
private: private:
void computeColumnCount(); void computeColumnCount();
private: private:
PdmObjectCollection* m_pdmObjectGroup; PdmObjectCollection* m_pdmObjectGroup;
@@ -107,11 +107,11 @@ class PdmUiListViewEditor : public PdmUiObjectEditorHandle
{ {
public: public:
PdmUiListViewEditor(); PdmUiListViewEditor();
~PdmUiListViewEditor(); ~PdmUiListViewEditor() override;
protected: protected:
virtual QWidget* createWidget(QWidget* parent); QWidget* createWidget(QWidget* parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
private: private:
QPointer<QTableView> m_tableView; QPointer<QTableView> m_tableView;

12
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
View File

@@ -54,7 +54,7 @@ class QVerticalScrollArea : public QScrollArea
Q_OBJECT Q_OBJECT
public: public:
explicit QVerticalScrollArea(QWidget* parent = nullptr); explicit QVerticalScrollArea(QWidget* parent = nullptr);
virtual bool eventFilter(QObject* object, QEvent* event) override; bool eventFilter(QObject* object, QEvent* event) override;
}; };
@@ -73,15 +73,15 @@ class PdmUiPropertyView : public QWidget
Q_OBJECT Q_OBJECT
public: public:
PdmUiPropertyView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr); PdmUiPropertyView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr);
~PdmUiPropertyView(); ~PdmUiPropertyView() override;
void setUiConfigurationName(QString uiConfigName); void setUiConfigurationName(QString uiConfigName);
PdmObjectHandle* currentObject(); PdmObjectHandle* currentObject();
virtual QSize sizeHint() const override; QSize sizeHint() const override;
public slots: public slots:
void showProperties(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases void showProperties(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases
private: private:
PdmUiObjectEditorHandle* m_currentObjectView; PdmUiObjectEditorHandle* m_currentObjectView;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyViewDialog.h
View File

@@ -52,7 +52,7 @@ class PdmUiPropertyViewDialog : public QDialog
public: public:
PdmUiPropertyViewDialog(QWidget* parent, PdmObject* object, const QString& windowTitle, const QString& uiConfigName); PdmUiPropertyViewDialog(QWidget* parent, PdmObject* object, const QString& windowTitle, const QString& uiConfigName);
PdmUiPropertyViewDialog(QWidget* parent, PdmObject* object, const QString& windowTitle, const QString& uiConfigName, const QDialogButtonBox::StandardButtons& standardButtons); PdmUiPropertyViewDialog(QWidget* parent, PdmObject* object, const QString& windowTitle, const QString& uiConfigName, const QDialogButtonBox::StandardButtons& standardButtons);
~PdmUiPropertyViewDialog(); ~PdmUiPropertyViewDialog() override;
QDialogButtonBox* dialogButtonBox(); QDialogButtonBox* dialogButtonBox();

10
Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.h
View File

@@ -67,17 +67,17 @@ class PdmUiPushButtonEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiPushButtonEditor() {} PdmUiPushButtonEditor() {}
virtual ~PdmUiPushButtonEditor() {} ~PdmUiPushButtonEditor() override {}
static void configureEditorForField(PdmFieldHandle* fieldHandle); static void configureEditorForField(PdmFieldHandle* fieldHandle);
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
protected slots: protected slots:
void slotClicked(bool checked); void slotClicked(bool checked);
private: private:
QPointer<QPushButton> m_pushButton; QPointer<QPushButton> m_pushButton;

16
Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h
View File

@@ -75,20 +75,20 @@ class PdmUiSliderEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiSliderEditor() {} PdmUiSliderEditor() {}
virtual ~PdmUiSliderEditor() {} ~PdmUiSliderEditor() override {}
protected: protected:
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
protected slots: protected slots:
void slotSliderValueChanged(int position); void slotSliderValueChanged(int position);
void slotSpinBoxValueChanged(int position); void slotSpinBoxValueChanged(int position);
private: private:
void updateSliderPosition(); void updateSliderPosition();
void writeValueToField(); void writeValueToField();
private: private:
QPointer<QSpinBox> m_spinBox; QPointer<QSpinBox> m_spinBox;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTableRowEditor.h
View File

@@ -52,7 +52,7 @@ class PdmUiTableRowEditor : public PdmUiEditorHandle
{ {
public: public:
PdmUiTableRowEditor(PdmUiTableViewQModel* model, caf::PdmObjectHandle* pdmObject, int row); PdmUiTableRowEditor(PdmUiTableViewQModel* model, caf::PdmObjectHandle* pdmObject, int row);
virtual ~PdmUiTableRowEditor(); ~PdmUiTableRowEditor() override;
protected: protected:
void configureAndUpdateUi(const QString& uiConfigName) override; void configureAndUpdateUi(const QString& uiConfigName) override;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h
View File

@@ -63,7 +63,7 @@ class PdmUiTableView : public QWidget
Q_OBJECT Q_OBJECT
public: public:
PdmUiTableView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr); PdmUiTableView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr);
~PdmUiTableView(); ~PdmUiTableView() override;
void setChildArrayField(PdmChildArrayFieldHandle* childArrayField); void setChildArrayField(PdmChildArrayFieldHandle* childArrayField);
void setUiConfigurationName(QString uiConfigName); void setUiConfigurationName(QString uiConfigName);

10
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewDelegate.h
View File

@@ -55,11 +55,11 @@ class PdmUiTableViewDelegate : public QStyledItemDelegate
public: public:
PdmUiTableViewDelegate(QObject* parent, PdmUiTableViewQModel* model); PdmUiTableViewDelegate(QObject* parent, PdmUiTableViewQModel* model);
~PdmUiTableViewDelegate(); ~PdmUiTableViewDelegate() override;
QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const; QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
void setEditorData(QWidget* editor, const QModelIndex& index) const; void setEditorData(QWidget* editor, const QModelIndex& index) const override;
void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const; void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
bool isEditorOpen() const; bool isEditorOpen() const;
@@ -67,7 +67,7 @@ public:
void slotEditorDestroyed(QObject* obj); void slotEditorDestroyed(QObject* obj);
protected: protected:
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private: private:
PdmUiTableViewQModel* m_model; PdmUiTableViewQModel* m_model;

8
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h
View File

@@ -116,7 +116,7 @@ class PdmUiTableViewEditor : public PdmUiFieldEditorHandle, public SelectionChan
public: public:
PdmUiTableViewEditor(); PdmUiTableViewEditor();
~PdmUiTableViewEditor(); ~PdmUiTableViewEditor() override;
void enableHeaderText(bool enable); void enableHeaderText(bool enable);
void setTableSelectionLevel(int selectionLevel); void setTableSelectionLevel(int selectionLevel);
@@ -128,16 +128,16 @@ public:
protected: protected:
QWidget* createEditorWidget(QWidget * parent) override; QWidget* createEditorWidget(QWidget * parent) override;
QWidget* createLabelWidget(QWidget * parent) override; QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName) override; void configureAndUpdateUi(const QString& uiConfigName) override;
virtual void onSelectionManagerSelectionChanged( const std::set<int>& changedSelectionLevels ) override; void onSelectionManagerSelectionChanged( const std::set<int>& changedSelectionLevels ) override;
private: private:
void selectedUiItems(const QModelIndexList& modelIndexList, std::vector<PdmUiItem*>& objects); void selectedUiItems(const QModelIndexList& modelIndexList, std::vector<PdmUiItem*>& objects);
bool isSelectionRoleDefined() const; bool isSelectionRoleDefined() const;
void updateSelectionManagerFromTableSelection(); void updateSelectionManagerFromTableSelection();
bool eventFilter(QObject* obj, QEvent* event); bool eventFilter(QObject* obj, QEvent* event) override;
PdmChildArrayFieldHandle* childArrayFieldHandle(); PdmChildArrayFieldHandle* childArrayFieldHandle();
private slots: private slots:

14
Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h
View File

@@ -94,11 +94,11 @@ class TextEdit : public QTextEdit
public: public:
explicit TextEdit(QWidget *parent = nullptr); explicit TextEdit(QWidget *parent = nullptr);
virtual QSize sizeHint() const override; QSize sizeHint() const override;
void setHeightHint(int heightHint); void setHeightHint(int heightHint);
protected: protected:
virtual void focusOutEvent(QFocusEvent *e); void focusOutEvent(QFocusEvent *e) override;
signals: signals:
void editingFinished(); void editingFinished();
@@ -118,15 +118,15 @@ class PdmUiTextEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiTextEditor() { m_textMode = PdmUiTextEditorAttribute::PLAIN; } PdmUiTextEditor() { m_textMode = PdmUiTextEditorAttribute::PLAIN; }
virtual ~PdmUiTextEditor() {} ~PdmUiTextEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
protected slots: protected slots:
void slotSetValueToField(); void slotSetValueToField();
private: private:
QTextOption::WrapMode toQTextOptionWrapMode(PdmUiTextEditorAttribute::WrapMode wrapMode); QTextOption::WrapMode toQTextOptionWrapMode(PdmUiTextEditorAttribute::WrapMode wrapMode);

4
Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.h
View File

@@ -59,7 +59,7 @@ class PdmUiToolBarEditor : public PdmUiEditorHandle
{ {
public: public:
PdmUiToolBarEditor(const QString& title, QMainWindow* mainWindow); PdmUiToolBarEditor(const QString& title, QMainWindow* mainWindow);
~PdmUiToolBarEditor(); ~PdmUiToolBarEditor() override;
bool isEditorDataValid(const std::vector<caf::PdmFieldHandle*>& fields) const; bool isEditorDataValid(const std::vector<caf::PdmFieldHandle*>& fields) const;
void setFields(std::vector<caf::PdmFieldHandle*>& fields); void setFields(std::vector<caf::PdmFieldHandle*>& fields);
@@ -69,7 +69,7 @@ public:
void hide(); void hide();
private: private:
virtual void configureAndUpdateUi(const QString& uiConfigName) override; void configureAndUpdateUi(const QString& uiConfigName) override;
private: private:
QPointer<QToolBar> m_toolbar; QPointer<QToolBar> m_toolbar;

10
Fwk/AppFwk/cafUserInterface/cafPdmUiToolButtonEditor.h
View File

@@ -67,15 +67,15 @@ class PdmUiToolButtonEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiToolButtonEditor() {} PdmUiToolButtonEditor() {}
virtual ~PdmUiToolButtonEditor() {} ~PdmUiToolButtonEditor() override {}
protected: protected:
virtual QWidget* createEditorWidget(QWidget * parent); QWidget* createEditorWidget(QWidget * parent) override;
virtual QWidget* createLabelWidget(QWidget * parent); QWidget* createLabelWidget(QWidget * parent) override;
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
protected slots: protected slots:
void slotClicked(bool checked); void slotClicked(bool checked);
private: private:
QPointer<QToolButton> m_toolButton; QPointer<QToolButton> m_toolButton;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeEditorHandle.h
View File

@@ -56,7 +56,7 @@ class PdmUiTreeEditorHandle: public PdmUiEditorHandle
{ {
public: public:
PdmUiTreeEditorHandle() {} PdmUiTreeEditorHandle() {}
~PdmUiTreeEditorHandle() {} ~PdmUiTreeEditorHandle() override {}
QWidget* getOrCreateWidget(QWidget* parent); QWidget* getOrCreateWidget(QWidget* parent);
QWidget* widget() { return m_widget; } QWidget* widget() { return m_widget; }

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeItemEditor.h
View File

@@ -51,13 +51,13 @@ class PdmUiTreeItemEditor: public PdmUiEditorHandle
{ {
public: public:
explicit PdmUiTreeItemEditor(PdmUiItem* uiItem); explicit PdmUiTreeItemEditor(PdmUiItem* uiItem);
virtual ~PdmUiTreeItemEditor() {}; ~PdmUiTreeItemEditor() override {};
void setTreeViewEditor(PdmUiTreeEditorHandle* treeViewEditor) { m_treeViewEditor = treeViewEditor; } void setTreeViewEditor(PdmUiTreeEditorHandle* treeViewEditor) { m_treeViewEditor = treeViewEditor; }
protected: // Interface to override: protected: // Interface to override:
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
private: private:
PdmUiTreeEditorHandle* m_treeViewEditor; PdmUiTreeEditorHandle* m_treeViewEditor;

6
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
View File

@@ -69,7 +69,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual QSize sizeHint() const override QSize sizeHint() const override
{ {
QSize mySize = QTreeView::sizeHint(); QSize mySize = QTreeView::sizeHint();
@@ -109,7 +109,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override
{ {
QModelIndex index = sourceModel()->index(source_row, 0, source_parent); QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
@@ -141,7 +141,7 @@ private:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void paintEvent(QPaintEvent* paintEvent) override void paintEvent(QPaintEvent* paintEvent) override
{ {
QPainter p(this); QPainter p(this);

8
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.h
View File

@@ -92,12 +92,12 @@ class PdmUiTreeSelectionEditor : public PdmUiFieldEditorHandle
public: public:
PdmUiTreeSelectionEditor(); PdmUiTreeSelectionEditor();
virtual ~PdmUiTreeSelectionEditor(); ~PdmUiTreeSelectionEditor() override;
protected: protected:
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
virtual QWidget* createEditorWidget(QWidget* parent); QWidget* createEditorWidget(QWidget* parent) override;
virtual QWidget* createLabelWidget(QWidget* parent); QWidget* createLabelWidget(QWidget* parent) override;
QMargins calculateLabelContentMargins() const override; QMargins calculateLabelContentMargins() const override;
private slots: private slots:

38
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.h
View File

@@ -59,30 +59,30 @@ class PdmUiTreeSelectionQModel : public QAbstractItemModel
Q_OBJECT Q_OBJECT
public: public:
explicit PdmUiTreeSelectionQModel(QObject *parent = nullptr); explicit PdmUiTreeSelectionQModel(QObject *parent = nullptr);
~PdmUiTreeSelectionQModel(); ~PdmUiTreeSelectionQModel() override;
static int headingRole(); static int headingRole();
static int optionItemValueRole(); static int optionItemValueRole();
void setCheckedStateForItems(const QModelIndexList& indices, bool checked); void setCheckedStateForItems(const QModelIndexList& indices, bool checked);
void enableSingleSelectionMode(bool enable); void enableSingleSelectionMode(bool enable);
int optionItemCount() const; int optionItemCount() const;
void setOptions(caf::PdmUiFieldEditorHandle* field, const QList<caf::PdmOptionItemInfo>& options); void setOptions(caf::PdmUiFieldEditorHandle* field, const QList<caf::PdmOptionItemInfo>& options);
void setUiValueCache(const QVariant* uiValuesCache ); void setUiValueCache(const QVariant* uiValuesCache );
void resetUiValueCache(); void resetUiValueCache();
bool isReadOnly(const QModelIndex& index) const; bool isReadOnly(const QModelIndex& index) const;
bool isChecked(const QModelIndex& index) const; bool isChecked(const QModelIndex& index) const;
bool hasGrandChildren() const; bool hasGrandChildren() const;
virtual Qt::ItemFlags flags(const QModelIndex &index) const override; Qt::ItemFlags flags(const QModelIndex &index) const override;
virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
virtual QModelIndex parent(const QModelIndex &child) const override; QModelIndex parent(const QModelIndex &child) const override;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
// Consider moving these functions to PdmUiFieldHandle // Consider moving these functions to PdmUiFieldHandle
static bool isSingleValueField(const QVariant& fieldValue); static bool isSingleValueField(const QVariant& fieldValue);

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.h
View File

@@ -62,7 +62,7 @@ class PdmUiTreeView : public QWidget
Q_OBJECT Q_OBJECT
public: public:
PdmUiTreeView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr); PdmUiTreeView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr);
~PdmUiTreeView(); ~PdmUiTreeView() override;
void enableDefaultContextMenu(bool enable); void enableDefaultContextMenu(bool enable);
void enableSelectionManagerUpdating(bool enable); // TODO: rename void enableSelectionManagerUpdating(bool enable); // TODO: rename

6
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
View File

@@ -65,7 +65,7 @@ class PdmUiTreeViewWidget : public QTreeView
{ {
public: public:
explicit PdmUiTreeViewWidget(QWidget* parent = nullptr) : QTreeView(parent) {}; explicit PdmUiTreeViewWidget(QWidget* parent = nullptr) : QTreeView(parent) {};
virtual ~PdmUiTreeViewWidget() {}; ~PdmUiTreeViewWidget() override {};
bool isTreeItemEditWidgetActive() const bool isTreeItemEditWidgetActive() const
{ {
@@ -73,7 +73,7 @@ public:
} }
protected: protected:
virtual void dragMoveEvent(QDragMoveEvent* event) void dragMoveEvent(QDragMoveEvent* event) override
{ {
caf::PdmUiTreeViewQModel* treeViewModel = dynamic_cast<caf::PdmUiTreeViewQModel*>(model()); caf::PdmUiTreeViewQModel* treeViewModel = dynamic_cast<caf::PdmUiTreeViewQModel*>(model());
if (treeViewModel && treeViewModel->dragDropInterface()) if (treeViewModel && treeViewModel->dragDropInterface())
@@ -84,7 +84,7 @@ protected:
QTreeView::dragMoveEvent(event); QTreeView::dragMoveEvent(event);
} }
virtual void dragLeaveEvent(QDragLeaveEvent* event) void dragLeaveEvent(QDragLeaveEvent* event) override
{ {
caf::PdmUiTreeViewQModel* treeViewModel = dynamic_cast<caf::PdmUiTreeViewQModel*>(model()); caf::PdmUiTreeViewQModel* treeViewModel = dynamic_cast<caf::PdmUiTreeViewQModel*>(model());
if (treeViewModel && treeViewModel->dragDropInterface()) if (treeViewModel && treeViewModel->dragDropInterface())

44
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.h
View File

@@ -90,48 +90,48 @@ class PdmUiTreeViewEditor : public PdmUiTreeEditorHandle
Q_OBJECT Q_OBJECT
public: public:
PdmUiTreeViewEditor(); PdmUiTreeViewEditor();
~PdmUiTreeViewEditor(); ~PdmUiTreeViewEditor() override;
void enableDefaultContextMenu(bool enable); void enableDefaultContextMenu(bool enable);
void enableSelectionManagerUpdating(bool enable); void enableSelectionManagerUpdating(bool enable);
void enableAppendOfClassNameToUiItemText(bool enable); void enableAppendOfClassNameToUiItemText(bool enable);
bool isAppendOfClassNameToUiItemTextEnabled(); bool isAppendOfClassNameToUiItemTextEnabled();
QTreeView* treeView(); QTreeView* treeView();
bool isTreeItemEditWidgetActive() const; bool isTreeItemEditWidgetActive() const;
void selectAsCurrentItem(const PdmUiItem* uiItem); void selectAsCurrentItem(const PdmUiItem* uiItem);
void selectedUiItems(std::vector<PdmUiItem*>& objects); void selectedUiItems(std::vector<PdmUiItem*>& objects);
void setExpanded(const PdmUiItem* uiItem, bool doExpand) const; void setExpanded(const PdmUiItem* uiItem, bool doExpand) const;
PdmUiItem* uiItemFromModelIndex(const QModelIndex& index) const; PdmUiItem* uiItemFromModelIndex(const QModelIndex& index) const;
QModelIndex findModelIndex(const PdmUiItem* object) const; QModelIndex findModelIndex(const PdmUiItem* object) const;
QWidget* createWidget(QWidget* parent); QWidget* createWidget(QWidget* parent) override;
void setDragDropInterface(PdmUiDragDropInterface* dragDropInterface); void setDragDropInterface(PdmUiDragDropInterface* dragDropInterface);
signals: signals:
void selectionChanged(); void selectionChanged();
protected: protected:
virtual void configureAndUpdateUi(const QString& uiConfigName); void configureAndUpdateUi(const QString& uiConfigName) override;
virtual void updateMySubTree(PdmUiItem* uiItem); void updateMySubTree(PdmUiItem* uiItem) override;
void updateContextMenuSignals(); void updateContextMenuSignals();
private slots: private slots:
void customMenuRequested(QPoint pos); void customMenuRequested(QPoint pos);
void slotOnSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected); void slotOnSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected);
private: private:
PdmChildArrayFieldHandle* currentChildArrayFieldHandle(); PdmChildArrayFieldHandle* currentChildArrayFieldHandle();
void updateSelectionManager(); void updateSelectionManager();
virtual bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event) override;
private: private:
QPointer<QWidget> m_mainWidget; QPointer<QWidget> m_mainWidget;

24
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.h
View File

@@ -98,22 +98,22 @@ private:
// Overrides from QAbstractItemModel // Overrides from QAbstractItemModel
virtual QModelIndex index(int row, int column, const QModelIndex &parentIndex = QModelIndex( )) const; QModelIndex index(int row, int column, const QModelIndex &parentIndex = QModelIndex( )) const override;
virtual QModelIndex parent(const QModelIndex &index) const; QModelIndex parent(const QModelIndex &index) const override;
virtual int rowCount(const QModelIndex &parentIndex = QModelIndex( ) ) const; int rowCount(const QModelIndex &parentIndex = QModelIndex( ) ) const override;
virtual int columnCount(const QModelIndex &parentIndex = QModelIndex( ) ) const; int columnCount(const QModelIndex &parentIndex = QModelIndex( ) ) const override;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole ) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole ) const override;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
virtual Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
virtual QStringList mimeTypes() const; QStringList mimeTypes() const override;
virtual QMimeData* mimeData(const QModelIndexList &indexes) const; QMimeData* mimeData(const QModelIndexList &indexes) const override;
virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
virtual Qt::DropActions supportedDropActions() const; Qt::DropActions supportedDropActions() const override;
}; };