Changeset 42851 in vbox for trunk/src/VBox

Timestamp:

Aug 16, 2012 5:06:40 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Fixing bugs in machine (item) remove procedure.

Location:

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

Files:

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

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

@@ -716 +716 @@
     QList<UIGChooserItem*> existingMachineItemList = gatherMachineItems(mainRoot()->items());
 
-    /* Prepare removing map: */
-    QMap<QString, bool> removingMap;
+    /* Prepare maps: */
+    QMap<QString, bool> verdictMap;
+    QMap<QString, QString> namesMap;
 
     /* For each selected machine item: */
     foreach (UIGChooserItem *pItem, selectedMachineItemList)
     {
-        /* Get item name: */
+        /* Get item name/id: */
         QString strName = pItem->name();
+        QString strId = pItem->toMachineItem()->id();
 
         /* Check if we already decided for that machine: */
-        if (removingMap.contains(strName))
+        if (verdictMap.contains(strId))
             continue;
 
@@ -732 +734 @@
         int iSelectedCopyCount = 0;
         foreach (UIGChooserItem *pSelectedItem, selectedMachineItemList)
-            if (pSelectedItem->name() == strName)
+            if (pSelectedItem->toMachineItem()->id() == strId)
                 ++iSelectedCopyCount;
 
@@ -738 +740 @@
         int iExistingCopyCount = 0;
         foreach (UIGChooserItem *pExistingItem, existingMachineItemList)
-            if (pExistingItem->name() == strName)
+            if (pExistingItem->toMachineItem()->id() == strId)
                 ++iExistingCopyCount;
 
@@ -744 +746 @@
          * we will propose ro unregister machine fully else
          * we will just propose to remove selected items: */
-        removingMap.insert(strName, iSelectedCopyCount == iExistingCopyCount);
+        verdictMap.insert(strId, iSelectedCopyCount == iExistingCopyCount);
+        namesMap.insert(strId, strName);
     }
 
     /* If we have something to remove: */
-    if (removingMap.values().contains(false))
+    if (verdictMap.values().contains(false))
     {
         /* Gather names: */
         QStringList names;
-        foreach (const QString &strName, removingMap.keys())
-            if (!removingMap[strName])
-                names << strName;
+        foreach (const QString &strId, verdictMap.keys())
+            if (!verdictMap[strId])
+                names << namesMap[strId];
         removeMachineItems(names, selectedMachineItemList);
     }
     /* If we have something to unregister: */
-    if (removingMap.values().contains(true))
-    {
-        /* Gather names: */
-        QStringList names;
-        foreach (const QString &strName, removingMap.keys())
-            if (removingMap[strName])
-                names << strName;
-        unregisterMachines(names);
+    if (verdictMap.values().contains(true))
+    {
+        /* Gather ids: */
+        QStringList ids;
+        foreach (const QString &strId, verdictMap.keys())
+            if (verdictMap[strId])
+                ids << strId;
+        unregisterMachines(ids);
     }
 }
@@ -1749 +1752 @@
     else
         unsetCurrentItem();
-}
-
-void UIGChooserModel::unregisterMachines(const QStringList &names)
+    saveGroupSettings();
+}
+
+void UIGChooserModel::unregisterMachines(const QStringList &ids)
 {
     /* Populate machine list: */
     QList<CMachine> machines;
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    foreach (const QString &strName, names)
-    {
-        CMachine machine = vbox.FindMachine(strName);
+    foreach (const QString &strId, ids)
+    {
+        CMachine machine = vbox.FindMachine(strId);
         if (!machine.isNull())
             machines << machine;

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

@@ -296 +296 @@
     /* Helpers: Remove stuff: */
     void removeMachineItems(const QStringList &names, QList<UIGChooserItem*> &selectedItems);
-    void unregisterMachines(const QStringList &names);
+    void unregisterMachines(const QStringList &ids);
 
     /* Helper: Sorting stuff: */