Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (revision 64694) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (revision 64695) @@ -124,13 +124,13 @@ /** Returns the data stored under the given @a iRole for the item referred to by the @a iColumn. */ - virtual QVariant data(int iColumn, int iRole) const; + virtual QVariant data(int iColumn, int iRole) const /* override */; /** Cache currently stored values, such as @a finalStates, @a finalValues and @a finalExtraValues. */ - virtual void putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues); + virtual void putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues) /* override */; private: /** Holds the Virtual System Description. */ - CVirtualSystemDescription m_comDescription; + CVirtualSystemDescription m_comDescription; }; @@ -165,45 +165,45 @@ /** Returns the item flags for the given @a iColumn. */ - virtual Qt::ItemFlags itemFlags(int iColumn) const; + virtual Qt::ItemFlags itemFlags(int iColumn) const /* override */; /** Defines the @a iRole data for the item at @a iColumn to @a value. */ - virtual bool setData(int iColumn, const QVariant &value, int iRole); + virtual bool setData(int iColumn, const QVariant &value, int iRole) /* override */; /** Returns the data stored under the given @a iRole for the item referred to by the @a iColumn. */ - virtual QVariant data(int iColumn, int iRole) const; + virtual QVariant data(int iColumn, int iRole) const /* override */; /** Returns the widget used to edit the item specified by @a idx for editing. * @param pParent Brings the parent to be assigned for newly created editor. * @param styleOption Bring the style option set for the newly created editor. */ - virtual QWidget *createEditor(QWidget *pParent, const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const; + virtual QWidget *createEditor(QWidget *pParent, const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const /* override */; /** Defines the contents of the given @a pEditor to the data for the item at the given @a idx. */ - virtual bool setEditorData(QWidget *pEditor, const QModelIndex &idx) const; + virtual bool setEditorData(QWidget *pEditor, const QModelIndex &idx) const /* override */; /** Defines the data for the item at the given @a idx in the @a pModel to the contents of the given @a pEditor. */ - virtual bool setModelData(QWidget *pEditor, QAbstractItemModel *pModel, const QModelIndex &idx); + virtual bool setModelData(QWidget *pEditor, QAbstractItemModel *pModel, const QModelIndex &idx) /* override */; /** Restores the default values. */ - virtual void restoreDefaults(); + virtual void restoreDefaults() /* override */; /** Cache currently stored values, such as @a finalStates, @a finalValues and @a finalExtraValues. */ - virtual void putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues); + virtual void putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues) /* override */; private: /** Holds the Virtual System Description type. */ - KVirtualSystemDescriptionType m_enmType; + KVirtualSystemDescriptionType m_enmType; /** Holds something totally useless. */ - QString m_strRef; + QString m_strRef; /** Holds the original value. */ - QString m_strOrigValue; + QString m_strOrigValue; /** Holds the configuration value. */ - QString m_strConfigValue; + QString m_strConfigValue; /** Holds the default configuration value. */ - QString m_strConfigDefaultValue; + QString m_strConfigDefaultValue; /** Holds the extra configuration value. */ - QString m_strExtraConfigValue; + QString m_strExtraConfigValue; /** Holds the item check state. */ - Qt::CheckState m_checkState; + Qt::CheckState m_checkState; /** Holds whether item was modified. */ - bool m_fModified; + bool m_fModified; }; @@ -1294,6 +1294,6 @@ /* static */ -int UIApplianceEditorWidget::m_minGuestRAM = -1; -int UIApplianceEditorWidget::m_maxGuestRAM = -1; +int UIApplianceEditorWidget::m_minGuestRAM = -1; +int UIApplianceEditorWidget::m_maxGuestRAM = -1; int UIApplianceEditorWidget::m_minGuestCPUCount = -1; int UIApplianceEditorWidget::m_maxGuestCPUCount = -1; Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h (revision 64694) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h (revision 64695) @@ -61,4 +61,6 @@ class UIApplianceModel : public QAbstractItemModel { + Q_OBJECT; + public: @@ -70,25 +72,25 @@ /** Returns the index of the item in the model specified by the given @a iRow, @a iColumn and @a parentIdx. */ - QModelIndex index(int iRow, int iColumn, const QModelIndex &parentIdx = QModelIndex()) const; + virtual QModelIndex index(int iRow, int iColumn, const QModelIndex &parentIdx = QModelIndex()) const /* override */; /** Returns the parent of the model item with the given @a idx. */ - QModelIndex parent(const QModelIndex &idx) const; + virtual QModelIndex parent(const QModelIndex &idx) const /* override */; /** Returns the number of rows for the children of the given @a parentIdx. */ - int rowCount(const QModelIndex &parentIdx = QModelIndex()) const; + virtual int rowCount(const QModelIndex &parentIdx = QModelIndex()) const /* override */; /** Returns the number of columns for the children of the given @a parentIdx. */ - int columnCount(const QModelIndex &parentIdx = QModelIndex()) const; + virtual int columnCount(const QModelIndex &parentIdx = QModelIndex()) const /* override */; /** Returns the item flags for the given @a idx. */ - Qt::ItemFlags flags(const QModelIndex &idx) const; + virtual Qt::ItemFlags flags(const QModelIndex &idx) const /* override */; /** Returns the data for the given @a iRole and @a iSection in the header with the specified @a enmOrientation. */ - QVariant headerData(int iSection, Qt::Orientation enmOrientation, int iRole) const; + virtual QVariant headerData(int iSection, Qt::Orientation enmOrientation, int iRole) const /* override */; /** Defines the @a iRole data for the item at @a idx to @a value. */ - bool setData(const QModelIndex &idx, const QVariant &value, int iRole); + virtual bool setData(const QModelIndex &idx, const QVariant &value, int iRole) /* override */; /** Returns the data stored under the given @a iRole for the item referred to by the @a idx. */ - QVariant data(const QModelIndex &idx, int iRole = Qt::DisplayRole) const; + virtual QVariant data(const QModelIndex &idx, int iRole = Qt::DisplayRole) const /* override */; /** Returns a model index for the buddy of the item represented by @a idx. */ - QModelIndex buddy(const QModelIndex &idx) const; + virtual QModelIndex buddy(const QModelIndex &idx) const /* override */; /** Restores the default values for the item with the given @a parentIdx. */ @@ -108,4 +110,6 @@ class UIApplianceDelegate : public QItemDelegate { + Q_OBJECT; + public: @@ -117,16 +121,16 @@ * @param pParent Brings the parent to be assigned for newly created editor. * @param styleOption Bring the style option set for the newly created editor. */ - QWidget *createEditor(QWidget *pParent, const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const; + virtual QWidget *createEditor(QWidget *pParent, const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const /* override */; /** Defines the contents of the given @a pEditor to the data for the item at the given @a idx. */ - void setEditorData(QWidget *pEditor, const QModelIndex &idx) const; + virtual void setEditorData(QWidget *pEditor, const QModelIndex &idx) const /* override */; /** Defines the data for the item at the given @a idx in the @a pModel to the contents of the given @a pEditor. */ - void setModelData(QWidget *pEditor, QAbstractItemModel *pModel, const QModelIndex &idx) const; + virtual void setModelData(QWidget *pEditor, QAbstractItemModel *pModel, const QModelIndex &idx) const /* override */; /** Updates the geometry of the @a pEditor for the item with the given @a idx, according to the rectangle specified in the @a styleOption. */ - void updateEditorGeometry(QWidget *pEditor, const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const; + virtual void updateEditorGeometry(QWidget *pEditor, const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const /* override */; /** Returns the size hint for the item at the given @a idx and specified @a styleOption. */ - QSize sizeHint(const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const; + virtual QSize sizeHint(const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const /* override */; protected: @@ -134,5 +138,5 @@ #ifdef VBOX_WS_MAC /** Filters @a pEvent if this object has been installed as an event filter for the watched @a pObject. */ - bool eventFilter(QObject *pObject, QEvent *pEvent); + virtual bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */; #endif @@ -147,4 +151,6 @@ class UIApplianceSortProxyModel : public QSortFilterProxyModel { + Q_OBJECT; + public: @@ -155,9 +161,9 @@ /** Returns whether item in the row indicated by the given @a iSourceRow and @a srcParenIdx should be included in the model. */ - bool filterAcceptsRow(int iSourceRow, const QModelIndex &srcParenIdx) const; + virtual bool filterAcceptsRow(int iSourceRow, const QModelIndex &srcParenIdx) const /* override */; /** Returns whether value of the item referred to by the given index @a leftIdx is less * than the value of the item referred to by the given index @a rightIdx. */ - bool lessThan(const QModelIndex &leftIdx, const QModelIndex &rightIdx) const; + virtual bool lessThan(const QModelIndex &leftIdx, const QModelIndex &rightIdx) const /* override */; /** Holds the array of sorted Virtual System Description types. */ @@ -201,5 +207,5 @@ /** Handles translation event. */ - virtual void retranslateUi(); + virtual void retranslateUi() /* override */; /** Holds the currently set appliance reference. */