Changeset 64487 in vbox for trunk/src/VBox

Timestamp:

Oct 31, 2016 1:44:41 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 111): Settings: Storage page: Adjust AbstractItem and it's sub-class member names to suit QITreeViewItem prototype.

Location:

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

Files:

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

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

@@ -508 +508 @@
 }
 
-AbstractItem* RootItem::childByPos (int aIndex)
+AbstractItem* RootItem::childItem (int aIndex) const
 {
     return mControllers [aIndex];
 }
 
-AbstractItem* RootItem::childById (const QUuid &aId)
+AbstractItem* RootItem::childItemById (const QUuid &aId) const
 {
     for (int i = 0; i < childCount(); ++ i)
@@ -699 +699 @@
 }
 
-AbstractItem* ControllerItem::childByPos (int aIndex)
+AbstractItem* ControllerItem::childItem (int aIndex) const
 {
     return mAttachments [aIndex];
 }
 
-AbstractItem* ControllerItem::childById (const QUuid &aId)
+AbstractItem* ControllerItem::childItemById (const QUuid &aId) const
 {
     for (int i = 0; i < childCount(); ++ i)
@@ -955 +955 @@
 }
 
-AbstractItem* AttachmentItem::childByPos (int /* aIndex */)
+AbstractItem* AttachmentItem::childItem (int /* aIndex */) const
 {
     return 0;
 }
 
-AbstractItem* AttachmentItem::childById (const QUuid& /* aId */)
+AbstractItem* AttachmentItem::childItemById (const QUuid& /* aId */) const
 {
     return 0;
@@ -1052 +1052 @@
 
     AbstractItem *item = !aParent.isValid() ? mRootItem :
-                         static_cast <AbstractItem*> (aParent.internalPointer())->childByPos (aRow);
+                         static_cast <AbstractItem*> (aParent.internalPointer())->childItem (aRow);
 
     return item ? createIndex (aRow, aColumn, item) : QModelIndex();
@@ -1673 +1673 @@
 void StorageModel::delController (const QUuid &aCtrId)
 {
-    if (AbstractItem *item = mRootItem->childById (aCtrId))
+    if (AbstractItem *item = mRootItem->childItemById (aCtrId))
     {
         int itemPosition = mRootItem->posOfChild (item);
@@ -1684 +1684 @@
 QModelIndex StorageModel::addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType, const QString &strMediumId)
 {
-    if (AbstractItem *parent = mRootItem->childById (aCtrId))
+    if (AbstractItem *parent = mRootItem->childItemById (aCtrId))
     {
         int parentPosition = mRootItem->posOfChild (parent);
@@ -1700 +1700 @@
 void StorageModel::delAttachment (const QUuid &aCtrId, const QUuid &aAttId)
 {
-    if (AbstractItem *parent = mRootItem->childById (aCtrId))
+    if (AbstractItem *parent = mRootItem->childItemById (aCtrId))
     {
         int parentPosition = mRootItem->posOfChild (parent);
-        if (AbstractItem *item = parent->childById (aAttId))
+        if (AbstractItem *item = parent->childItemById (aAttId))
         {
             int itemPosition = parent->posOfChild (item);
@@ -1726 +1726 @@
     {
         /* Get iterated controller item: */
-        AbstractItem *pItemLevel1 = mRootItem->childByPos(iItemLevel1Pos);
+        AbstractItem *pItemLevel1 = mRootItem->childItem(iItemLevel1Pos);
         ControllerItem *pControllerItem = static_cast<ControllerItem*>(pItemLevel1);
         /* Count of attachment items: */
@@ -1736 +1736 @@
         {
             /* Get iterated attachment item: */
-            AbstractItem *pItemLevel2 = pItemLevel1->childByPos(iItemLevel2Pos);
+            AbstractItem *pItemLevel2 = pItemLevel1->childItem(iItemLevel2Pos);
             AttachmentItem *pAttachmentItem = static_cast<AttachmentItem*>(pItemLevel2);
             /* Get iterated attachment storage slot: */
@@ -1813 +1813 @@
     {
         beginRemoveRows(root(), 0, 0);
-        delete mRootItem->childByPos(0);
+        delete mRootItem->childItem(0);
         endRemoveRows();
     }

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

@@ -268 +268 @@
 
     virtual ItemType rtti() const = 0;
-    virtual AbstractItem* childByPos (int aIndex) = 0;
-    virtual AbstractItem* childById (const QUuid &aId) = 0;
+    virtual AbstractItem* childItem (int aIndex) const = 0;
+    virtual AbstractItem* childItemById (const QUuid &aId) const = 0;
     virtual int posOfChild (AbstractItem *aItem) const = 0;
     virtual int childCount() const = 0;
@@ -300 +300 @@
 
     ItemType rtti() const;
-    AbstractItem* childByPos (int aIndex);
-    AbstractItem* childById (const QUuid &aId);
+    AbstractItem* childItem (int aIndex) const;
+    AbstractItem* childItemById (const QUuid &aId) const;
     int posOfChild (AbstractItem *aItem) const;
     int childCount() const;
@@ -344 +344 @@
 
     ItemType rtti() const;
-    AbstractItem* childByPos (int aIndex);
-    AbstractItem* childById (const QUuid &aId);
+    AbstractItem* childItem (int aIndex) const;
+    AbstractItem* childItemById (const QUuid &aId) const;
     int posOfChild (AbstractItem *aItem) const;
     int childCount() const;
@@ -400 +400 @@
 
     ItemType rtti() const;
-    AbstractItem* childByPos (int aIndex);
-    AbstractItem* childById (const QUuid &aId);
+    AbstractItem* childItem (int aIndex) const;
+    AbstractItem* childItemById (const QUuid &aId) const;
     int posOfChild (AbstractItem *aItem) const;
     int childCount() const;