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

Timestamp:

Nov 2, 2020 5:54:03 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Small cleanup for Chooser pane.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserAbstractModel.cpp (modified) (6 diffs)
• UIChooserModel.cpp (modified) (7 diffs)

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

@@ -629 +629 @@
     UIChooserNode *pMachineNode = searchMachineNode(invisibleRoot(), uId);
 
-    /* Insert cloud entity key into a list of keys currently being updated: */
-    const UICloudEntityKey cloudEntityKey = UICloudEntityKey(pMachineNode->parentNode()->parentNode()->name(),
-                                                             pMachineNode->parentNode()->name(),
-                                                             pMachineNode->toMachineNode()->id());
-    insertCloudEntityKey(cloudEntityKey);
+    /* Insert cloud machine key into a list of keys currently being updated: */
+    const UICloudEntityKey guiCloudMachineKey = UICloudEntityKey(pMachineNode->parentNode()->parentNode()->name(),
+                                                                 pMachineNode->parentNode()->name(),
+                                                                 pMachineNode->toMachineNode()->id());
+    insertCloudEntityKey(guiCloudMachineKey);
 }
 
@@ -648 +648 @@
     UIChooserNode *pMachineNode = searchMachineNode(invisibleRoot(), uId);
 
-    /* Remove cloud entity key from the list of keys currently being updated: */
-    const UICloudEntityKey cloudEntityKey = UICloudEntityKey(pMachineNode->parentNode()->parentNode()->name(),
-                                                             pMachineNode->parentNode()->name(),
-                                                             pMachineNode->toMachineNode()->id());
-    removeCloudEntityKey(cloudEntityKey);
+    /* Remove cloud machine key from the list of keys currently being updated: */
+    const UICloudEntityKey guiCloudMachineKey = UICloudEntityKey(pMachineNode->parentNode()->parentNode()->name(),
+                                                                 pMachineNode->parentNode()->name(),
+                                                                 pMachineNode->toMachineNode()->id());
+    removeCloudEntityKey(guiCloudMachineKey);
 
     /* Notify listeners: */
@@ -755 +755 @@
         addLocalMachineIntoTheTree(comMachine, true /* make it visible */);
     }
-}
-
-void UIChooserAbstractModel::sltStartGroupSaving()
-{
-    saveGroupSettings();
-    saveGroupDefinitions();
 }
 
@@ -911 +905 @@
 
     /* Remove cloud entity key from the list of keys currently being updated: */
-    const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-    removeCloudEntityKey(cloudEntityKey);
+    const UICloudEntityKey guiCloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
+    removeCloudEntityKey(guiCloudEntityKey);
 }
 
@@ -919 +913 @@
     /* Reload cloud tree: */
     reloadCloudTree();
+}
+
+void UIChooserAbstractModel::sltStartGroupSaving()
+{
+    saveGroupSettings();
+    saveGroupDefinitions();
 }
 
@@ -1111 +1111 @@
             createCloudMachineNode(pProfileNode, UIFakeCloudVirtualMachineItemState_Loading);
 
-            /* Insert cloud entity key into a list of keys currently being updated: */
-            const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-            insertCloudEntityKey(cloudEntityKey);
+            /* Insert cloud profile key into a list of keys currently being updated: */
+            const UICloudEntityKey guiCloudProfileKey = UICloudEntityKey(strProviderShortName, strProfileName);
+            insertCloudEntityKey(guiCloudProfileKey);
 
             /* Create list cloud machines task: */

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

@@ -940 +940 @@
                 AssertPtrReturnVoid(pParentOfParent);
 
-                /* Insert cloud entity key into a list of keys currently being updated: */
-                const UICloudEntityKey cloudEntityKey = UICloudEntityKey(pParentOfParent->name(), pParent->name());
-                insertCloudEntityKey(cloudEntityKey);
+                /* Insert cloud profile key into a list of keys currently being updated: */
+                const UICloudEntityKey guiCloudProfileKey = UICloudEntityKey(pParentOfParent->name(), pParent->name());
+                insertCloudEntityKey(guiCloudProfileKey);
 
                 /* Create list cloud machines task: */
-                UITaskCloudListMachines *pTask = new UITaskCloudListMachines(cloudEntityKey.m_strProviderShortName,
-                                                                             cloudEntityKey.m_strProfileName,
+                UITaskCloudListMachines *pTask = new UITaskCloudListMachines(guiCloudProfileKey.m_strProviderShortName,
+                                                                             guiCloudProfileKey.m_strProfileName,
                                                                              true /* with refresh? */);
                 AssertPtrReturnVoid(pTask);
@@ -1303 +1303 @@
 {
     /* For every selected item: */
-    QSet<UICloudEntityKey> selectedCloudEntityKeys;
+    QSet<UICloudEntityKey> selectedCloudProfileKeys;
     foreach (UIChooserItem *pSelectedItem, selectedItems())
     {
-        /* Enumerate cloud entity keys to update: */
+        /* Enumerate cloud profile keys to update: */
         switch (pSelectedItem->type())
         {
@@ -1321 +1321 @@
                         {
                             const QString strProfileName = pChildItem->name();
-                            const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-                            if (!selectedCloudEntityKeys.contains(cloudEntityKey))
-                                selectedCloudEntityKeys.insert(cloudEntityKey);
+                            const UICloudEntityKey guiCloudProfileKey = UICloudEntityKey(strProviderShortName, strProfileName);
+                            if (!selectedCloudProfileKeys.contains(guiCloudProfileKey))
+                                selectedCloudProfileKeys.insert(guiCloudProfileKey);
                         }
                         break;
@@ -1331 +1331 @@
                         const QString strProviderShortName = pSelectedItem->parentItem()->name();
                         const QString strProfileName = pSelectedItem->name();
-                        const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-                        if (!selectedCloudEntityKeys.contains(cloudEntityKey))
-                            selectedCloudEntityKeys.insert(cloudEntityKey);
+                        const UICloudEntityKey guiCloudProfileKey = UICloudEntityKey(strProviderShortName, strProfileName);
+                        if (!selectedCloudProfileKeys.contains(guiCloudProfileKey))
+                            selectedCloudProfileKeys.insert(guiCloudProfileKey);
                         break;
                     }
@@ -1350 +1350 @@
                     const QString strProviderShortName = pMachineItem->parentItem()->parentItem()->name();
                     const QString strProfileName = pMachineItem->parentItem()->name();
-                    const UICloudEntityKey cloudEntityKey = UICloudEntityKey(strProviderShortName, strProfileName);
-                    if (!selectedCloudEntityKeys.contains(cloudEntityKey))
-                        selectedCloudEntityKeys.insert(cloudEntityKey);
+                    const UICloudEntityKey guiCloudProfileKey = UICloudEntityKey(strProviderShortName, strProfileName);
+                    if (!selectedCloudProfileKeys.contains(guiCloudProfileKey))
+                        selectedCloudProfileKeys.insert(guiCloudProfileKey);
                 }
                 break;
@@ -1359 +1359 @@
     }
 
-    /* Restart List Cloud Machines task for selected entity keys: */
-    foreach (const UICloudEntityKey &cloudEntityKey, selectedCloudEntityKeys)
-    {
-        /* Skip cloud entity keys already being updated: */
-        if (containsCloudEntityKey(cloudEntityKey))
+    /* Restart List Cloud Machines task for selected profile keys: */
+    foreach (const UICloudEntityKey &guiCloudProfileKey, selectedCloudProfileKeys)
+    {
+        /* Skip cloud profile keys already being updated: */
+        if (containsCloudEntityKey(guiCloudProfileKey))
             continue;
-        insertCloudEntityKey(cloudEntityKey);
+        insertCloudEntityKey(guiCloudProfileKey);
 
         /* Create a task for particular cloud entity key: */
-        UITaskCloudListMachines *pTask = new UITaskCloudListMachines(cloudEntityKey.m_strProviderShortName,
-                                                                     cloudEntityKey.m_strProfileName,
+        UITaskCloudListMachines *pTask = new UITaskCloudListMachines(guiCloudProfileKey.m_strProviderShortName,
+                                                                     guiCloudProfileKey.m_strProfileName,
                                                                      false /* with refresh? */);
         AssertPtrReturnVoid(pTask);
@@ -1958 +1958 @@
     }
 
-    /* Restart List Cloud Machines task for required entity keys: */
-    foreach (const UICloudEntityKey &cloudEntityKey, changedCloudEntityKeys)
-    {
-        /* Skip cloud entity keys already being updated: */
-        if (containsCloudEntityKey(cloudEntityKey))
+    /* Restart List Cloud Machines task for required profile keys: */
+    foreach (const UICloudEntityKey &guiCloudProfileKey, changedCloudEntityKeys)
+    {
+        /* Skip cloud profile keys already being updated: */
+        if (containsCloudEntityKey(guiCloudProfileKey))
             continue;
-        insertCloudEntityKey(cloudEntityKey);
+        insertCloudEntityKey(guiCloudProfileKey);
 
         /* Create a task for particular cloud entity key: */
-        UITaskCloudListMachines *pTask = new UITaskCloudListMachines(cloudEntityKey.m_strProviderShortName,
-                                                                     cloudEntityKey.m_strProfileName,
+        UITaskCloudListMachines *pTask = new UITaskCloudListMachines(guiCloudProfileKey.m_strProviderShortName,
+                                                                     guiCloudProfileKey.m_strProfileName,
                                                                      false /* with refresh? */);
         AssertPtrReturnVoid(pTask);