Changeset 78247 in vbox for trunk

Timestamp:

Apr 22, 2019 11:57:15 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: Form Editor widget: A bit of cleanup (coding-style + reordering, no other changes).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIFormEditorWidget.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIFormEditorWidget.cpp

@@ -230 +230 @@
 
     /** Returns flags for item with certain @a index. */
-    Qt::ItemFlags flags(const QModelIndex &index) const;
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const /* override */;
 
     /** Returns row count of certain @a parent. */
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-
+    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const /* override */;
     /** Returns column count of certain @a parent. */
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    virtual int columnCount(const QModelIndex &parent = QModelIndex()) const /* override */;
 
     /** Returns header data for @a iSection, @a enmOrientation and @a iRole specified. */
-    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 item with @a index as @a value. */
-    bool setData(const QModelIndex &index, const QVariant &value, int iRole = Qt::EditRole);
+    virtual bool setData(const QModelIndex &index, const QVariant &value, int iRole = Qt::EditRole) /* override */;
     /** Returns the @a iRole data for item with @a index. */
-    QVariant data(const QModelIndex &index, int iRole) const;
+    virtual QVariant data(const QModelIndex &index, int iRole) const /* override */;
 
 private:
@@ -256 +255 @@
     /** Holds the Form Editor row list. */
     QList<UIFormEditorRow*>  m_dataList;
+};
+
+
+/** QSortFilterProxyModel subclass used as the Form Editor proxy-model. */
+class UIFormEditorProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs the Form Editor proxy-model passing @a pParent to the base-class. */
+    UIFormEditorProxyModel(QObject *pParent = 0);
+
+protected:
+
+    /** Returns whether item in the row indicated by the given @a iSourceRow and @a srcParenIdx should be included in the model. */
+    virtual bool filterAcceptsRow(int iSourceRow, const QModelIndex &srcParenIdx) const /* override */;
 };
 
@@ -275 +291 @@
     /** Returns the child item with @a iIndex. */
     virtual QITableViewRow *childItem(int iIndex) const /* override */;
-};
-
-
-/** QSortFilterProxyModel subclass used as the Form Editor proxy-model. */
-class UIFormEditorProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs the Form Editor proxy-model passing @a pParent to the base-class. */
-    UIFormEditorProxyModel(QObject *pParent = 0);
-
-protected:
-
-    /** Returns whether item in the row indicated by the given @a iSourceRow and @a srcParenIdx should be included in the model. */
-    virtual bool filterAcceptsRow(int iSourceRow, const QModelIndex &srcParenIdx) const /* override */;
 };
 
@@ -780 +779 @@
 
 /*********************************************************************************************************************************
-*   Class UIFormEditorView implementation.                                                                                       *
-*********************************************************************************************************************************/
-
-UIFormEditorView::UIFormEditorView(QWidget * /* pParent = 0 */)
-{
-}
-
-int UIFormEditorView::childCount() const
-{
-    /* Redirect request to model: */
-    AssertPtrReturn(model(), 0);
-    return qobject_cast<UIFormEditorModel*>(model())->childCount();
-}
-
-QITableViewRow *UIFormEditorView::childItem(int iIndex) const
-{
-    /* Redirect request to model: */
-    AssertPtrReturn(model(), 0);
-    return qobject_cast<UIFormEditorModel*>(model())->childItem(iIndex);
-}
-
-
-/*********************************************************************************************************************************
 *   Class UIFormEditorProxyModel implementation.                                                                                 *
 *********************************************************************************************************************************/
@@ -824 +800 @@
     }
     return true;
+}
+
+
+/*********************************************************************************************************************************
+*   Class UIFormEditorView implementation.                                                                                       *
+*********************************************************************************************************************************/
+
+UIFormEditorView::UIFormEditorView(QWidget * /* pParent = 0 */)
+{
+}
+
+int UIFormEditorView::childCount() const
+{
+    /* Redirect request to model: */
+    AssertPtrReturn(model(), 0);
+    return qobject_cast<UIFormEditorModel*>(model())->childCount();
+}
+
+QITableViewRow *UIFormEditorView::childItem(int iIndex) const
+{
+    /* Redirect request to model: */
+    AssertPtrReturn(model(), 0);
+    return qobject_cast<UIFormEditorModel*>(model())->childItem(iIndex);
 }