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

Timestamp:

Oct 29, 2020 2:28:00 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: A part of cleanup forgotten in r141119.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1297 +1297 @@
 {
     /* For every selected item: */
-    QSet<UICloudEntityKey> selectedCloudAccountKeys;
+    QSet<UICloudEntityKey> selectedCloudEntityKeys;
     foreach (UIChooserItem *pSelectedItem, selectedItems())
     {
@@ -1316 +1316 @@
                             const QString strProfileName = pChildItem->name();
                             const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-                            if (!selectedCloudAccountKeys.contains(cloudEntityKey))
-                                selectedCloudAccountKeys.insert(cloudEntityKey);
+                            if (!selectedCloudEntityKeys.contains(cloudEntityKey))
+                                selectedCloudEntityKeys.insert(cloudEntityKey);
                         }
                         break;
@@ -1326 +1326 @@
                         const QString strProfileName = pSelectedItem->name();
                         const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-                        if (!selectedCloudAccountKeys.contains(cloudEntityKey))
-                            selectedCloudAccountKeys.insert(cloudEntityKey);
+                        if (!selectedCloudEntityKeys.contains(cloudEntityKey))
+                            selectedCloudEntityKeys.insert(cloudEntityKey);
                         break;
                     }
@@ -1345 +1345 @@
                     const QString strProfileName = pMachineItem->parentItem()->name();
                     const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-                    if (!selectedCloudAccountKeys.contains(cloudEntityKey))
-                        selectedCloudAccountKeys.insert(cloudEntityKey);
+                    if (!selectedCloudEntityKeys.contains(cloudEntityKey))
+                        selectedCloudEntityKeys.insert(cloudEntityKey);
                 }
                 break;
@@ -1353 +1353 @@
     }
 
-    /* Restart List Cloud Machines task for selected account keys: */
-    foreach (const UICloudEntityKey &cloudEntityKey, selectedCloudAccountKeys)
+    /* Restart List Cloud Machines task for selected entity keys: */
+    foreach (const UICloudEntityKey &cloudEntityKey, selectedCloudEntityKeys)
     {
         /* Skip cloud entity keys already being updated: */
@@ -1911 +1911 @@
 
     /* For every selected machine-item: */
-    QSet<UICloudEntityKey> changedCloudAccountKeys;
+    QSet<UICloudEntityKey> changedCloudEntityKeys;
     foreach (UIChooserItemMachine *pMachineItem, machineItems)
     {
+        /* Compose cloud entity keys for profile: */
+        const QString strProviderShortName = pMachineItem->parentItem()->parentItem()->name();
+        const QString strProfileName = pMachineItem->parentItem()->name();
+        const UICloudEntityKey cloudEntityKeyForProfile = UICloudEntityKey(strProviderShortName, strProfileName);
+
         /* Acquire cloud machine: */
         CCloudMachine comMachine = pMachineItem->cache()->toCloud()->machine();
@@ -1935 +1940 @@
             continue;
         }
-        /* Compose cloud entity key to update: */
-        const QString strProviderShortName = pMachineItem->parentItem()->parentItem()->name();
-        const QString strProfileName = pMachineItem->parentItem()->name();
-        const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-        if (!changedCloudAccountKeys.contains(cloudEntityKey))
-            changedCloudAccountKeys.insert(cloudEntityKey);
-    }
-
-    /* Restart List Cloud Machines task for required account keys: */
-    foreach (const UICloudEntityKey &cloudEntityKey, changedCloudAccountKeys)
+
+        /* Append cloud entity key for profile to update: */
+        if (!changedCloudEntityKeys.contains(cloudEntityKeyForProfile))
+            changedCloudEntityKeys.insert(cloudEntityKeyForProfile);
+    }
+
+    /* Restart List Cloud Machines task for required entity keys: */
+    foreach (const UICloudEntityKey &cloudEntityKey, changedCloudEntityKeys)
     {
         /* Skip cloud entity keys already being updated: */