Changeset 83099 in vbox

Timestamp:

Feb 17, 2020 5:33:37 PM (5 years ago)

Author:

vboxsync

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

136159

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Small UITaskCloudAcquireInstances cleanup.

Location:

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

Files:

• UITaskCloudAcquireInstances.cpp (modified) (3 diffs)
• UITaskCloudAcquireInstances.h (modified) (3 diffs)
• chooser/UIChooserAbstractModel.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudAcquireInstances.cpp

@@ -31 +31 @@
 }
 
-QList<UICloudMachine> UITaskCloudAcquireInstances::instances() const
+QList<UICloudMachine> UITaskCloudAcquireInstances::result() const
 {
     m_mutex.lock();
-    const QList<UICloudMachine> instances = m_instances;
+    const QList<UICloudMachine> resultList = m_result;
     m_mutex.unlock();
-    return instances;
+    return resultList;
 }
 
@@ -51 +51 @@
     m_mutex.lock();
 
-    do
+    /* Gather VM names, ids and states.
+     * Currently we are interested in Running and Stopped VMs only. */
+    CStringArray comNames;
+    CStringArray comIDs;
+    const QVector<KCloudMachineState> cloudMachineStates  = QVector<KCloudMachineState>()
+                                                         << KCloudMachineState_Running
+                                                         << KCloudMachineState_Stopped;
+
+    /* Ask for cloud instance list: */
+    CProgress comProgress = m_comCloudClient.ListInstances(cloudMachineStates, comNames, comIDs);
+    if (!m_comCloudClient.isOk())
     {
-        /* Gather VM names, ids and states.
-         * Currently we are interested in Running and Stopped VMs only. */
-        CStringArray comNames;
-        CStringArray comIDs;
-        const QVector<KCloudMachineState> cloudMachineStates  = QVector<KCloudMachineState>()
-                                                             << KCloudMachineState_Running
-                                                             << KCloudMachineState_Stopped;
-
-        /* Ask for cloud instance list: */
-        CProgress comProgress = m_comCloudClient.ListInstances(cloudMachineStates, comNames, comIDs);
-        if (!m_comCloudClient.isOk())
-        {
-            /// @todo pack error info to m_comErrorInfo
-            break;
-        }
-
+        /// @todo pack error info to m_comErrorInfo
+    }
+    else
+    {
         /* Wait for "Acquire cloud instances" progress: */
         comProgress.WaitForCompletion(-1);
@@ -74 +72 @@
         {
             /// @todo pack error info to m_comErrorInfo
-            break;
         }
-
-        /* Fetch acquired objects to lists: */
-        const QVector<QString> instanceIds = comIDs.GetValues();
-        const QVector<QString> instanceNames = comNames.GetValues();
-        for (int i = 0; i < instanceIds.size(); ++i)
-            m_instances << UICloudMachine(m_comCloudClient, instanceIds.at(i), instanceNames.at(i));
+        else
+        {
+            /* Fetch acquired objects to lists: */
+            const QVector<QString> instanceIds = comIDs.GetValues();
+            const QVector<QString> instanceNames = comNames.GetValues();
+            for (int i = 0; i < instanceIds.size(); ++i)
+                m_result << UICloudMachine(m_comCloudClient, instanceIds.at(i), instanceNames.at(i));
+        }
     }
-    while (0);
 
     m_mutex.unlock();

trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudAcquireInstances.h

@@ -55 +55 @@
     CVirtualBoxErrorInfo errorInfo();
 
-    /** Returns the instance object list. */
-    QList<UICloudMachine> instances() const;
+    /** Returns the task result. */
+    QList<UICloudMachine> result() const;
 
 protected:
@@ -65 +65 @@
 private:
 
-    /** Holds the mutex to access m_guiMedium member. */
+    /** Holds the mutex to access result. */
     mutable QMutex  m_mutex;
 
@@ -76 +76 @@
     CVirtualBoxErrorInfo  m_comErrorInfo;
 
-    /** Holds the instance object list. */
-    QList<UICloudMachine>  m_instances;
+    /** Holds the task result. */
+    QList<UICloudMachine>  m_result;
 };
 

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

@@ -301 +301 @@
     /* Add real cloud VM items: */
     int iPosition = 1; /* we've got item with index 0 already, the "Empty" one .. */
-    foreach (const UICloudMachine &guiCloudMachine, pAcquiringTask->instances())
+    foreach (const UICloudMachine &guiCloudMachine, pAcquiringTask->result())
         new UIChooserNodeMachine(pParentNode,
                                  false /* favorite */,