Changeset 64489 in vbox for trunk/src/VBox

Timestamp:

Oct 31, 2016 2:09:57 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 113): Settings: Storage page: Move AbstractItem onto QITreeViewItem rails.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsStorage.cpp (modified) (5 diffs)
• UIMachineSettingsStorage.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -447 +447 @@
 
 /* Abstract Item */
-AbstractItem::AbstractItem (AbstractItem *aParent)
-    : mParent (aParent)
-    , mId (QUuid::createUuid())
-{
-    if (mParent) mParent->addChild (this);
+AbstractItem::AbstractItem(AbstractItem *pParentItem)
+    : QITreeViewItem(pParentItem)
+    , m_pParentItem(pParentItem)
+    , mId(QUuid::createUuid())
+{
+    if (m_pParentItem)
+        m_pParentItem->addChild(this);
 }
 
 AbstractItem::~AbstractItem()
 {
-    if (mParent) mParent->delChild (this);
+    if (m_pParentItem)
+        m_pParentItem->delChild(this);
 }
 
 AbstractItem* AbstractItem::parent() const
 {
-    return mParent;
+    return m_pParentItem;
 }
 
@@ -566 +569 @@
 {
     /* Check for proper parent type */
-    AssertMsg (mParent->rtti() == AbstractItem::Type_RootItem, ("Incorrect parent type!\n"));
+    AssertMsg(m_pParentItem->rtti() == AbstractItem::Type_RootItem, ("Incorrect parent type!\n"));
 
     /* Select default type */
@@ -763 +766 @@
 {
     /* Check for proper parent type */
-    AssertMsg (mParent->rtti() == AbstractItem::Type_ControllerItem, ("Incorrect parent type!\n"));
+    AssertMsg(m_pParentItem->rtti() == AbstractItem::Type_ControllerItem, ("Incorrect parent type!\n"));
 
     /* Select default slot */
@@ -777 +780 @@
 SlotsList AttachmentItem::attSlots() const
 {
-    ControllerItem *ctr = static_cast <ControllerItem*> (mParent);
+    ControllerItem *ctr = static_cast<ControllerItem*>(m_pParentItem);
 
     /* Filter list from used slots */
@@ -796 +799 @@
 DeviceTypeList AttachmentItem::attDeviceTypes() const
 {
-    return static_cast <ControllerItem*> (mParent)->ctrDeviceTypeList();
+    return static_cast<ControllerItem*>(m_pParentItem)->ctrDeviceTypeList();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -246 +246 @@
 
 /* Abstract Item */
-class AbstractItem
-{
+class AbstractItem : public QITreeViewItem
+{
+    Q_OBJECT;
+
 public:
 
@@ -258 +260 @@
     };
 
-    AbstractItem (AbstractItem *aParent = 0);
+    AbstractItem(AbstractItem *pParentItem = 0);
     virtual ~AbstractItem();
 
@@ -271 +273 @@
     virtual AbstractItem* childItemById (const QUuid &aId) const = 0;
     virtual int posOfChild (AbstractItem *aItem) const = 0;
-    virtual int childCount() const = 0;
-    virtual QString text() const = 0;
     virtual QString tip() const = 0;
     virtual QPixmap pixmap (ItemState aState = State_DefaultItem) = 0;
@@ -281 +281 @@
     virtual void delChild (AbstractItem *aItem) = 0;
 
-    AbstractItem *mParent;
+    AbstractItem *m_pParentItem;
     QUuid         mId;
     QString       mMachineId;