Changeset 43542 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 4, 2012 1:28:09 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

81145

Message:

FE/Qt: VM group feature UI: Current-item handling cleanup (part 4).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserModel.cpp (modified) (3 diffs)
• UIGChooserModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -188 +188 @@
 UIVMItem* UIGChooserModel::currentMachineItem() const
 {
-    /* Search for the first selected machine: */
-    return searchCurrentItem(currentItems());
+    /* Return first machine-item: */
+    return firstMachineItem(currentItems());
 }
 
@@ -1315 +1315 @@
 }
 
-UIVMItem* UIGChooserModel::searchCurrentItem(const QList<UIGChooserItem*> &list) const
+UIGChooserItemMachine* UIGChooserModel::firstMachineItem(const QList<UIGChooserItem*> &list) const
 {
     /* Iterate over all the passed items: */
     foreach (UIGChooserItem *pItem, list)
     {
-        /* If item is machine, just return it: */
+        /* If that is machine-item, just return it: */
         if (pItem->type() == UIGChooserItemType_Machine)
         {
@@ -1326 +1326 @@
                 return pMachineItem;
         }
-        /* If item is group: */
+        /* If that is group-item: */
         else if (pItem->type() == UIGChooserItemType_Group)
         {
-            /* If it have at least one machine item: */
+            /* If that group-item have at least one machine-item: */
             if (pItem->hasItems(UIGChooserItemType_Machine))
-                /* Iterate over all the machine items recursively: */
-                return searchCurrentItem(pItem->items(UIGChooserItemType_Machine));
-            /* If it have at least one group item: */
+                /* Iterate over all the machine-items recursively: */
+                return firstMachineItem(pItem->items(UIGChooserItemType_Machine));
+            /* If that group-item have at least one group-item: */
             else if (pItem->hasItems(UIGChooserItemType_Group))
-                /* Iterate over all the group items recursively: */
-                return searchCurrentItem(pItem->items(UIGChooserItemType_Group));
+                /* Iterate over all the group-items recursively: */
+                return firstMachineItem(pItem->items(UIGChooserItemType_Group));
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h

@@ -240 +240 @@
 
     /* Helpers: Current-item stuff: */
-    UIVMItem* searchCurrentItem(const QList<UIGChooserItem*> &list) const;
+    UIGChooserItemMachine* firstMachineItem(const QList<UIGChooserItem*> &list) const;
     void enumerateCurrentItems(const QList<UIGChooserItem*> &il, QList<UIVMItem*> &ol) const;
     bool contains(const QList<UIVMItem*> &list, UIVMItem *pItem) const;