Changeset 64126 in vbox for trunk/src

Timestamp:

Oct 3, 2016 3:38:04 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 67): Extend QITreeWidget with QITreeWidgetItem interface required to make this widget accessible.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QITreeWidget.cpp (modified) (2 diffs)
• QITreeWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp

@@ -30 +30 @@
 
 
+/*********************************************************************************************************************************
+*   Class QITreeWidgetItem implementation.                                                                                       *
+*********************************************************************************************************************************/
+
+/* static */
+QITreeWidgetItem *QITreeWidgetItem::toItem(QTreeWidgetItem *pItem)
+{
+    /* Make sure alive QITreeWidgetItem passed: */
+    if (!pItem || pItem->type() != QITreeWidgetItem::ItemType)
+        return 0;
+
+    /* Return casted QITreeWidgetItem: */
+    return static_cast<QITreeWidgetItem*>(pItem);
+}
+
+/* static */
+const QITreeWidgetItem *QITreeWidgetItem::toItem(const QTreeWidgetItem *pItem)
+{
+    /* Make sure alive QITreeWidgetItem passed: */
+    if (!pItem || pItem->type() != QITreeWidgetItem::ItemType)
+        return 0;
+
+    /* Return casted QITreeWidgetItem: */
+    return static_cast<const QITreeWidgetItem*>(pItem);
+}
+
+QITreeWidgetItem::QITreeWidgetItem(QITreeWidget *pTreeWidget)
+    : QTreeWidgetItem(pTreeWidget, ItemType)
+{
+}
+
+QITreeWidgetItem::QITreeWidgetItem(QITreeWidgetItem *pTreeWidgetItem)
+    : QTreeWidgetItem(pTreeWidgetItem, ItemType)
+{
+}
+
+QITreeWidgetItem::QITreeWidgetItem(QITreeWidget *pTreeWidget, const QStringList &strings)
+    : QTreeWidgetItem(pTreeWidget, strings, ItemType)
+{
+}
+
+QITreeWidgetItem::QITreeWidgetItem(QITreeWidgetItem *pTreeWidgetItem, const QStringList &strings)
+    : QTreeWidgetItem(pTreeWidgetItem, strings, ItemType)
+{
+}
+
+QITreeWidget *QITreeWidgetItem::parentTree() const
+{
+    /* Return the parent tree if any: */
+    return treeWidget() ? qobject_cast<QITreeWidget*>(treeWidget()) : 0;
+}
+
+QITreeWidgetItem *QITreeWidgetItem::parentItem() const
+{
+    /* Return the parent item if any: */
+    return QTreeWidgetItem::parent() ? toItem(QTreeWidgetItem::parent()) : 0;
+}
+
+QITreeWidgetItem *QITreeWidgetItem::childItem(int iIndex) const
+{
+    /* Return the child item with iIndex if any: */
+    return QTreeWidgetItem::child(iIndex) ? toItem(QTreeWidgetItem::child(iIndex)) : 0;
+}
+
+
+/*********************************************************************************************************************************
+*   Class QITreeWidget implementation.                                                                                           *
+*********************************************************************************************************************************/
+
 QITreeWidget::QITreeWidget(QWidget *pParent)
     : QTreeWidget(pParent)
@@ -48 +117 @@
 }
 
-QTreeWidgetItem *QITreeWidget::childItem(int iIndex) const
+QITreeWidgetItem *QITreeWidget::childItem(int iIndex) const
 {
     /* Return the child item with iIndex if any: */
-    return invisibleRootItem()->child(iIndex);
+    return invisibleRootItem()->child(iIndex) ? QITreeWidgetItem::toItem(invisibleRootItem()->child(iIndex)) : 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.h

@@ -21 +21 @@
 /* Qt includes: */
 #include <QTreeWidget>
+#include <QTreeWidgetItem>
+
+/* Forward declarations: */
+class QITreeWidget;
+
+
+/** QTreeWidgetItem subclass extending standard functionality. */
+class QITreeWidgetItem : public QObject, public QTreeWidgetItem
+{
+    Q_OBJECT;
+
+public:
+
+    /** Item type for QITreeWidgetItem. */
+    enum { ItemType = QTreeWidgetItem::UserType + 1 };
+
+    /** Casts QTreeWidgetItem* to QITreeWidgetItem* if possible. */
+    static QITreeWidgetItem *toItem(QTreeWidgetItem *pItem);
+    /** Casts const QTreeWidgetItem* to const QITreeWidgetItem* if possible. */
+    static const QITreeWidgetItem *toItem(const QTreeWidgetItem *pItem);
+
+    /** Constructs item passing @a pTreeWidget into the base-class. */
+    QITreeWidgetItem(QITreeWidget *pTreeWidget);
+    /** Constructs item passing @a pTreeWidgetItem into the base-class. */
+    QITreeWidgetItem(QITreeWidgetItem *pTreeWidgetItem);
+
+    /** Constructs item passing @a pTreeWidget and @a strings into the base-class. */
+    QITreeWidgetItem(QITreeWidget *pTreeWidget, const QStringList &strings);
+    /** Constructs item passing @a pTreeWidgetItem and @a strings into the base-class. */
+    QITreeWidgetItem(QITreeWidgetItem *pTreeWidgetItem, const QStringList &strings);
+
+    /** Returns the parent tree-widget. */
+    QITreeWidget *parentTree() const;
+    /** Returns the parent tree-widget item. */
+    QITreeWidgetItem *parentItem() const;
+    /** Returns the child tree-widget item with @a iIndex. */
+    QITreeWidgetItem *childItem(int iIndex) const;
+};
 
 
@@ -46 +84 @@
     int childCount() const;
     /** Returns the child item with @a iIndex. */
-    QTreeWidgetItem *childItem(int iIndex) const;
+    QITreeWidgetItem *childItem(int iIndex) const;
 
 protected: