Changeset 64430 in vbox for trunk

Timestamp:

Oct 26, 2016 2:05:53 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 103): Medium Manager: Move tree-widget stuff onto QITreeWidget rails.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumManager.cpp (modified) (30 diffs)
• UIMediumManager.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -57 +57 @@
 
 /** QTreeWidgetItem extension representing Medium Manager item. */
-class UIMediumItem : public QTreeWidgetItem
+class UIMediumItem : public QITreeWidgetItem
 {
 public:
 
-    /** UIMediumItem type for rtti needs. */
-    enum { Type = QTreeWidgetItem::UserType + 1 };
-
     /** Constructor for top-level item. */
-    UIMediumItem(const UIMedium &medium, QTreeWidget *pParent)
-        : QTreeWidgetItem(pParent, Type)
+    UIMediumItem(const UIMedium &medium, QITreeWidget *pParent)
+        : QITreeWidgetItem(pParent)
         , m_medium(medium)
     { refresh(); }
@@ -72 +69 @@
     /** Constructor for child item. */
     UIMediumItem(const UIMedium &medium, UIMediumItem *pParent)
-        : QTreeWidgetItem(pParent, Type)
+        : QITreeWidgetItem(pParent)
         , m_medium(medium)
     { refresh(); }
@@ -226 +223 @@
 
     /** Constructor for top-level item. */
-    UIMediumItemHD(const UIMedium &medium, QTreeWidget *pParent)
+    UIMediumItemHD(const UIMedium &medium, QITreeWidget *pParent)
         : UIMediumItem(medium, pParent)
     {}
@@ -401 +398 @@
 
     /** Constructor for top-level item. */
-    UIMediumItemCD(const UIMedium &medium, QTreeWidget *pParent)
+    UIMediumItemCD(const UIMedium &medium, QITreeWidget *pParent)
         : UIMediumItem(medium, pParent)
     {}
@@ -484 +481 @@
 
     /** Constructor for top-level item. */
-    UIMediumItemFD(const UIMedium &medium, QTreeWidget *pParent)
+    UIMediumItemFD(const UIMedium &medium, QITreeWidget *pParent)
         : UIMediumItem(medium, pParent)
     {}
@@ -868 +865 @@
 {
     /* Get current tree-widget: */
-    QTreeWidget *pTreeWidget = currentTreeWidget();
+    QITreeWidget *pTreeWidget = currentTreeWidget();
     if (pTreeWidget)
     {
         /* If another tree-widget was focused before,
          * move focus to current tree-widget: */
-        if (qobject_cast<QTreeWidget*>(focusWidget()))
+        if (qobject_cast<QITreeWidget*>(focusWidget()))
             pTreeWidget->setFocus();
     }
@@ -887 +884 @@
 {
     /* Get sender() tree-widget: */
-    QTreeWidget *pTreeWidget = qobject_cast<QTreeWidget*>(sender());
+    QITreeWidget *pTreeWidget = qobject_cast<QITreeWidget*>(sender());
     AssertMsgReturnVoid(pTreeWidget, ("This slot should be called by tree-widget only!\n"));
 
@@ -907 +904 @@
 {
     /* Get current tree-widget: */
-    QTreeWidget *pTreeWidget = currentTreeWidget();
+    QITreeWidget *pTreeWidget = currentTreeWidget();
     AssertPtrReturnVoid(pTreeWidget);
 
@@ -926 +923 @@
 {
     /* Get all the tree-widgets: */
-    const QList<QTreeWidget*> trees = m_trees.values();
+    const QList<QITreeWidget*> trees = m_trees.values();
 
     /* Calculate deduction for every header: */
     QList<int> deductions;
-    foreach (QTreeWidget *pTreeWidget, trees)
+    foreach (QITreeWidget *pTreeWidget, trees)
     {
         int iDeduction = 0;
@@ -941 +938 @@
     for (int iTreeIndex = 0; iTreeIndex < trees.size(); ++iTreeIndex)
     {
-        QTreeWidget *pTreeWidget = trees[iTreeIndex];
+        QITreeWidget *pTreeWidget = trees[iTreeIndex];
         int iSize0 = pTreeWidget->viewport()->width() - deductions[iTreeIndex];
         if (pTreeWidget->header()->sectionSize(0) != iSize0)
@@ -1219 +1216 @@
     /* Create tree-widget: */
     m_trees.insert(tabIndex(type), new QITreeWidget);
-    QTreeWidget *pTreeWidget = treeWidget(type);
+    QITreeWidget *pTreeWidget = treeWidget(type);
     AssertPtrReturnVoid(pTreeWidget);
     {
@@ -1353 +1350 @@
 
     /* Clear tree-widgets: */
-    QTreeWidget *pTreeWidgetHD = treeWidget(UIMediumType_HardDisk);
+    QITreeWidget *pTreeWidgetHD = treeWidget(UIMediumType_HardDisk);
     if (pTreeWidgetHD)
     {
@@ -1359 +1356 @@
         pTreeWidgetHD->clear();
     }
-    QTreeWidget *pTreeWidgetCD = treeWidget(UIMediumType_DVD);
+    QITreeWidget *pTreeWidgetCD = treeWidget(UIMediumType_DVD);
     if (pTreeWidgetCD)
     {
@@ -1365 +1362 @@
         pTreeWidgetCD->clear();
     }
-    QTreeWidget *pTreeWidgetFD = treeWidget(UIMediumType_Floppy);
+    QITreeWidget *pTreeWidgetFD = treeWidget(UIMediumType_Floppy);
     if (pTreeWidgetFD)
     {
@@ -1564 +1561 @@
                 CheckIfSuitableByState lookForState(KMediumState_Inaccessible);
                 CheckIfSuitableByID ignoreID(pMediumItem->id());
-                UIMediumItem *pInaccessibleMediumItem = searchItem(pMediumItem->treeWidget(), lookForState, &ignoreID);
+                UIMediumItem *pInaccessibleMediumItem = searchItem(pMediumItem->parentTree(), lookForState, &ignoreID);
                 *pfInaccessible = !!pInaccessibleMediumItem;
             }
@@ -1795 +1792 @@
 
     /* Translate HD tree-widget: */
-    QTreeWidget *pTreeWidgetHD = treeWidget(UIMediumType_HardDisk);
+    QITreeWidget *pTreeWidgetHD = treeWidget(UIMediumType_HardDisk);
     if (pTreeWidgetHD)
     {
@@ -1820 +1817 @@
 
     /* Translate CD tree-widget: */
-    QTreeWidget *pTreeWidgetCD = treeWidget(UIMediumType_DVD);
+    QITreeWidget *pTreeWidgetCD = treeWidget(UIMediumType_DVD);
     if (pTreeWidgetCD)
     {
@@ -1836 +1833 @@
 
     /* Translate FD tree-widget: */
-    QTreeWidget *pTreeWidgetFD = treeWidget(UIMediumType_Floppy);
+    QITreeWidget *pTreeWidgetFD = treeWidget(UIMediumType_Floppy);
     if (pTreeWidgetFD)
     {
@@ -1885 +1882 @@
         {
             /* Make sure corresponding tree-widget exists: */
-            QTreeWidget *pTreeWidget = treeWidget(UIMediumType_HardDisk);
+            QITreeWidget *pTreeWidget = treeWidget(UIMediumType_HardDisk);
             if (pTreeWidget)
             {
@@ -1905 +1902 @@
         {
             /* Make sure corresponding tree-widget exists: */
-            QTreeWidget *pTreeWidget = treeWidget(UIMediumType_DVD);
+            QITreeWidget *pTreeWidget = treeWidget(UIMediumType_DVD);
             if (pTreeWidget)
             {
@@ -1926 +1923 @@
         {
             /* Make sure corresponding tree-widget exists: */
-            QTreeWidget *pTreeWidget = treeWidget(UIMediumType_Floppy);
+            QITreeWidget *pTreeWidget = treeWidget(UIMediumType_Floppy);
             if (pTreeWidget)
             {
@@ -1967 +1964 @@
 
     /* Make sure corresponding tree-widget exists: */
-    QTreeWidget *pTreeWidget = treeWidget(UIMediumType_HardDisk);
+    QITreeWidget *pTreeWidget = treeWidget(UIMediumType_HardDisk);
     if (pTreeWidget)
     {
@@ -2048 +2045 @@
     QList<UIMediumType> types;
     types << UIMediumType_HardDisk << UIMediumType_DVD << UIMediumType_Floppy;
-    QTreeWidget *pTreeWidget = 0;
+    QITreeWidget *pTreeWidget = 0;
     UIMediumItem *pMediumItem = 0;
     foreach (UIMediumType type, types)
@@ -2090 +2087 @@
 }
 
-QTreeWidget* UIMediumManager::treeWidget(UIMediumType type) const
+QITreeWidget* UIMediumManager::treeWidget(UIMediumType type) const
 {
     /* Determine tab index for passed medium type: */
@@ -2106 +2103 @@
 {
     /* Get corresponding tree-widget: */
-    QTreeWidget *pTreeWidget = treeWidget(type);
+    QITreeWidget *pTreeWidget = treeWidget(type);
     /* Return corresponding medium-item: */
     return pTreeWidget ? toMediumItem(pTreeWidget->currentItem()) : 0;
@@ -2160 +2157 @@
 }
 
-UIMediumType UIMediumManager::mediumType(QTreeWidget *pTreeWidget) const
+UIMediumType UIMediumManager::mediumType(QITreeWidget *pTreeWidget) const
 {
     /* Determine tab index of passed tree-widget: */
@@ -2183 +2180 @@
 }
 
-QTreeWidget* UIMediumManager::currentTreeWidget() const
+QITreeWidget* UIMediumManager::currentTreeWidget() const
 {
     /* Return current tree-widget: */
@@ -2195 +2192 @@
 }
 
-void UIMediumManager::setCurrentItem(QTreeWidget *pTreeWidget, QTreeWidgetItem *pItem)
+void UIMediumManager::setCurrentItem(QITreeWidget *pTreeWidget, QTreeWidgetItem *pItem)
 {
     /* Make sure passed tree-widget is valid: */
@@ -2248 +2245 @@
 
 /* static */
-UIMediumItem* UIMediumManager::searchItem(QTreeWidget *pTreeWidget, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException)
+UIMediumItem* UIMediumManager::searchItem(QITreeWidget *pTreeWidget, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException)
 {
     /* Make sure argument is valid: */
@@ -2336 +2333 @@
 {
     /* Cast passed QTreeWidgetItem to UIMediumItem if possible: */
-    return pItem && pItem->type() == UIMediumItem::Type ? static_cast<UIMediumItem*>(pItem) : 0;
+    return pItem && pItem->type() == QITreeWidgetItem::ItemType ? static_cast<UIMediumItem*>(pItem) : 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -32 +32 @@
 class UIEnumerationProgressBar;
 class QTabWidget;
-class QTreeWidget;
+class QITreeWidget;
 class QTreeWidgetItem;
 class QFrame;
@@ -182 +182 @@
     QWidget* tab(UIMediumType type) const;
     /** Returns tree-widget for passed medium @a type. */
-    QTreeWidget* treeWidget(UIMediumType type) const;
+    QITreeWidget* treeWidget(UIMediumType type) const;
     /** Returns item for passed medium @a type. */
     UIMediumItem* mediumItem(UIMediumType type) const;
@@ -193 +193 @@
 
     /** Returns medium type for passed @a pTreeWidget. */
-    UIMediumType mediumType(QTreeWidget *pTreeWidget) const;
+    UIMediumType mediumType(QITreeWidget *pTreeWidget) const;
 
     /** Returns current medium type. */
     UIMediumType currentMediumType() const;
     /** Returns current tree-widget. */
-    QTreeWidget* currentTreeWidget() const;
+    QITreeWidget* currentTreeWidget() const;
     /** Returns current item. */
     UIMediumItem* currentMediumItem() const;
 
     /** Defines current item for passed @a pTreeWidget as @a pItem. */
-    void setCurrentItem(QTreeWidget *pTreeWidget, QTreeWidgetItem *pItem);
+    void setCurrentItem(QITreeWidget *pTreeWidget, QTreeWidgetItem *pItem);
 
     /** Returns tab index for passed UIMediumType. */
@@ -211 +211 @@
 
     /** Performs search for the @a pTree child which corresponds to the @a condition but not @a pException. */
-    static UIMediumItem* searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0);
+    static UIMediumItem* searchItem(QITreeWidget *pTree, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0);
     /** Performs search for the @a pParentItem child which corresponds to the @a condition but not @a pException. */
     static UIMediumItem* searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0);
@@ -244 +244 @@
     const int m_iTabCount;
     /** Tree-widgets. */
-    QMap<int, QTreeWidget*> m_trees;
+    QMap<int, QITreeWidget*> m_trees;
     /** Information-containers. */
     QMap<int, QFrame*> m_containers;