Changeset 64794 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 6, 2016 5:02:35 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 149): Simplifying UIApplianceEditorWidget tree-view according to r112160 changes.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/widgets/UIApplianceEditorWidget.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -556 +556 @@
         src/settings/machine/UIMachineSettingsStorage.cpp \
         src/settings/machine/UIMachineSettingsUSB.cpp \
-        src/widgets/UIApplianceEditorWidget.cpp \
         src/widgets/UIHotKeyEditor.cpp \
         src/widgets/UIMiniToolBar.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -44 +44 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Forward declarations: */
-class UIApplianceView;
 
 
@@ -214 +211 @@
     /** Holds whether item was modified. */
     bool                           m_fModified;
-};
-
-
-/** QITreeView subclass used as Storage-view. */
-class UIApplianceView : public QITreeView
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs storage-view passing @a pParent to the base-class. */
-    UIApplianceView(QWidget *pParent = 0) : QITreeView(pParent) {}
-
-protected:
-
-    /** Returns the number of children. */
-    virtual int childCount() const /* override */;
-    /** Returns the child item with @a iIndex. */
-    virtual QITreeViewItem *childItem(int iIndex) const /* override */;
 };
 
@@ -1318 +1296 @@
 
 /*********************************************************************************************************************************
-*   Class UIApplianceView implementation.                                                                                        *
-*********************************************************************************************************************************/
-
-int UIApplianceView::childCount() const
-{
-    UIApplianceSortProxyModel *pSortProxyModel = qobject_cast<UIApplianceSortProxyModel*>(model());
-    AssertPtrReturn(pSortProxyModel, 0);
-    UIApplianceModel *pModel = qobject_cast<UIApplianceModel*>(pSortProxyModel->sourceModel());
-    AssertPtrReturn(pModel, 0);
-    return pModel->rowCount(pModel->root());
-}
-
-QITreeViewItem *UIApplianceView::childItem(int iIndex) const
-{
-    UIApplianceSortProxyModel *pSortProxyModel = qobject_cast<UIApplianceSortProxyModel*>(model());
-    AssertPtrReturn(pSortProxyModel, 0);
-    UIApplianceModel *pModel = qobject_cast<UIApplianceModel*>(pSortProxyModel->sourceModel());
-    AssertPtrReturn(pModel, 0);
-    return (UIApplianceModelItem*)pModel->index(iIndex, 0, pModel->root()).internalPointer();
-}
-
-
-/*********************************************************************************************************************************
 *   Class UIApplianceEditorWidget implementation.                                                                                *
 *********************************************************************************************************************************/
@@ -1374 +1329 @@
 
                 /* Create tree-view: */
-                m_pTreeViewSettings = new UIApplianceView;
+                m_pTreeViewSettings = new QITreeView;
                 {
                     /* Configure tree-view: */