Changeset 43614 in vbox

Timestamp:

Oct 11, 2012 11:28:34 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group feature UI: Navigation stuff cleanup (part 1).

Location:

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

Files:

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

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

@@ -339 +339 @@
         {
             /* If model is performing lookup: */
-            if (model()->isPerformingLookup())
+            if (model()->isLookupInProgress())
             {
                 /* Continue lookup: */

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

@@ -191 +191 @@
 }
 
-void UIGChooserModel::clearNavigationList()
+void UIGChooserModel::updateNavigation()
 {
     m_navigationList.clear();
-}
-
-void UIGChooserModel::updateNavigation()
-{
-    clearNavigationList();
     m_navigationList = createNavigationList(root());
 }
@@ -574 +569 @@
 }
 
-bool UIGChooserModel::isPerformingLookup() const
+bool UIGChooserModel::isLookupInProgress() const
 {
     return m_pLookupTimer->isActive();
@@ -932 +927 @@
     QList<UIGChooserItemMachine*> inaccessibleMachineItemList;
     UIGChooserItemMachine::enumerateMachineItems(currentItems(), inaccessibleMachineItemList,
-                                                 UIGChooserItemMachineEnumerationFlag_Unique | UIGChooserItemMachineEnumerationFlag_Inaccessible);
+                                                 UIGChooserItemMachineEnumerationFlag_Unique |
+                                                 UIGChooserItemMachineEnumerationFlag_Inaccessible);
 
     /* For each machine-item: */

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

@@ -106 +106 @@
     const QList<UIGChooserItem*>& navigationList() const;
     void removeFromNavigationList(UIGChooserItem *pItem);
-    void clearNavigationList();
     void updateNavigation();
 
@@ -148 +147 @@
     /* API: Item lookup stuff: */
     void lookFor(const QString &strLookupSymbol);
-    bool isPerformingLookup() const;
+    bool isLookupInProgress() const;
 
     /* API: Saving stuff: */