Changeset 64494 in vbox

Timestamp:

Oct 31, 2016 3:25:16 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 118): Selector UI: Snapshot pane: Move item casting stuff to corresponding place.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISnapshotPane.cpp (modified) (17 diffs)
• UISnapshotPane.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp

@@ -62 +62 @@
 public:
 
+    /** Casts QTreeWidgetItem* to UISnapshotItem* if possible. */
+    static UISnapshotItem *toSnapshotItem(QTreeWidgetItem *pItem);
+    /** Casts const QTreeWidgetItem* to const UISnapshotItem* if possible. */
+    static const UISnapshotItem *toSnapshotItem(const QTreeWidgetItem *pItem);
+
     /** Item type for UISnapshotItem. */
     enum { ItemType = QTreeWidgetItem::UserType + 1 };
@@ -182 +187 @@
 *********************************************************************************************************************************/
 
+/* static */
+UISnapshotItem *UISnapshotItem::toSnapshotItem(QTreeWidgetItem *pItem)
+{
+    /* Make sure alive UISnapshotItem passed: */
+    if (!pItem || pItem->type() != UISnapshotItem::ItemType)
+        return 0;
+
+    /* Return casted UISnapshotItem then: */
+    return static_cast<UISnapshotItem*>(pItem);
+}
+
+/* static */
+const UISnapshotItem *UISnapshotItem::toSnapshotItem(const QTreeWidgetItem *pItem)
+{
+    /* Make sure alive UISnapshotItem passed: */
+    if (!pItem || pItem->type() != UISnapshotItem::ItemType)
+        return 0;
+
+    /* Return casted UISnapshotItem then: */
+    return static_cast<const UISnapshotItem*>(pItem);
+}
+
 UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidget *pTreeWidget, const CSnapshot &comSnapshot)
     : QTreeWidgetItem(pTreeWidget, ItemType)
@@ -227 +254 @@
 {
     /* Return the parent snapshot item if any: */
-    return QTreeWidgetItem::parent() ? UISnapshotPane::toSnapshotItem(QTreeWidgetItem::parent()) : 0;
+    return QTreeWidgetItem::parent() ? toSnapshotItem(QTreeWidgetItem::parent()) : 0;
 }
 
@@ -233 +260 @@
 {
     /* Return the child snapshot item with iIndex if any: */
-    return QTreeWidgetItem::child(iIndex) ? UISnapshotPane::toSnapshotItem(QTreeWidgetItem::child(iIndex)) : 0;
+    return QTreeWidgetItem::child(iIndex) ? toSnapshotItem(QTreeWidgetItem::child(iIndex)) : 0;
 }
 
@@ -539 +566 @@
 {
     /* Return the child snapshot item with iIndex if any: */
-    return invisibleRootItem()->child(iIndex) ? UISnapshotPane::toSnapshotItem(invisibleRootItem()->child(iIndex)) : 0;
+    return invisibleRootItem()->child(iIndex) ? UISnapshotItem::toSnapshotItem(invisibleRootItem()->child(iIndex)) : 0;
 }
 
@@ -546 +573 @@
 *   Class UISnapshotPane implementation.                                                                                         *
 *********************************************************************************************************************************/
-
-/* static  */
-UISnapshotItem *UISnapshotPane::toSnapshotItem(QTreeWidgetItem *pItem)
-{
-    /* Make sure alive UISnapshotItem passed: */
-    if (!pItem || pItem->type() != UISnapshotItem::ItemType)
-        return 0;
-
-    /* Return casted UISnapshotItem then: */
-    return static_cast<UISnapshotItem*>(pItem);
-}
-
-/* static */
-const UISnapshotItem *UISnapshotPane::toSnapshotItem(const QTreeWidgetItem *pItem)
-{
-    /* Make sure alive UISnapshotItem passed: */
-    if (!pItem || pItem->type() != UISnapshotItem::ItemType)
-        return 0;
-
-    /* Return casted UISnapshotItem then: */
-    return static_cast<const UISnapshotItem*>(pItem);
-}
 
 UISnapshotPane::UISnapshotPane(QWidget *pParent)
@@ -723 +728 @@
 {
     /* Acquire corresponding snapshot item: */
-    const UISnapshotItem *pSnapshotItem = toSnapshotItem(pItem);
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(pItem);
 
     /* Make the selected item visible: */
@@ -791 +796 @@
 
     /* Acquire corresponding snapshot item: */
-    const UISnapshotItem *pSnapshotItem = toSnapshotItem(pItem);
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(pItem);
     AssertReturnVoid(pSnapshotItem);
 
@@ -824 +829 @@
 
     /* Acquire corresponding snapshot item: */
-    const UISnapshotItem *pSnapshotItem = toSnapshotItem(pItem);
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(pItem);
     AssertReturnVoid(pSnapshotItem);
 
@@ -839 +844 @@
 {
     /* Acquire corresponding snapshot item: */
-    const UISnapshotItem *pSnapshotItem = toSnapshotItem(pItem);
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(pItem);
     AssertReturnVoid(pSnapshotItem);
 
@@ -1012 +1017 @@
     {
         /* Acquire currently chosen snapshot item: */
-        const UISnapshotItem *pSnapshotItem = toSnapshotItem(m_pSnapshotTree->currentItem());
+        const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
         AssertPtr(pSnapshotItem);
         if (!pSnapshotItem)
@@ -1087 +1092 @@
     {
         /* Acquire currently chosen snapshot item: */
-        const UISnapshotItem *pSnapshotItem = toSnapshotItem(m_pSnapshotTree->currentItem());
+        const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
         AssertPtr(pSnapshotItem);
         if (!pSnapshotItem)
@@ -1157 +1162 @@
 {
     /* Acquire currently chosen snapshot item: */
-    const UISnapshotItem *pSnapshotItem = toSnapshotItem(m_pSnapshotTree->currentItem());
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
     AssertReturnVoid(pSnapshotItem);
 
@@ -1176 +1181 @@
 {
     /* Acquire currently chosen snapshot item: */
-    const UISnapshotItem *pSnapshotItem = toSnapshotItem(m_pSnapshotTree->currentItem());
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
     AssertReturnVoid(pSnapshotItem);
 
@@ -1214 +1219 @@
     /* Remember the selected item and it's first child: */
     QString strSelectedItem, strFirstChildOfSelectedItem;
-    const UISnapshotItem *pSnapshotItem = toSnapshotItem(m_pSnapshotTree->currentItem());
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
     if (pSnapshotItem)
     {
         strSelectedItem = pSnapshotItem->snapshotID();
         if (pSnapshotItem->child(0))
-            strFirstChildOfSelectedItem = toSnapshotItem(pSnapshotItem->child(0))->snapshotID();
+            strFirstChildOfSelectedItem = UISnapshotItem::toSnapshotItem(pSnapshotItem->child(0))->snapshotID();
     }
 
@@ -1308 +1313 @@
     while (*it)
     {
-        UISnapshotItem *pSnapshotItem = toSnapshotItem(*it);
+        UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(*it);
         if (pSnapshotItem->snapshotID() == strSnapshotID)
             return pSnapshotItem;
@@ -1330 +1335 @@
 {
     /* Acquire corresponding snapshot item: */
-    UISnapshotItem *pSnapshotItem = toSnapshotItem(pItem);
+    UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(pItem);
 
     /* Fetch the snapshot age of the root if it's valid: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.h

@@ -54 +54 @@
 
 public:
-
-    /** Casts QTreeWidgetItem to UISnapshotItem if possible. */
-    static UISnapshotItem *toSnapshotItem(QTreeWidgetItem *pItem);
-    /** Casts const QTreeWidgetItem to const UISnapshotItem if possible. */
-    static const UISnapshotItem *toSnapshotItem(const QTreeWidgetItem *pItem);
 
     /** Constructs snapshot pane passing @a pParent to the base-class. */