Changeset 83720 in vbox

Timestamp:

Apr 16, 2020 4:41:10 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Rework UICloudNetworkingStuff to not use UICloudMachine anymore.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICloudNetworkingStuff.cpp (modified) (2 diffs)
• UICloudNetworkingStuff.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.cpp

@@ -119 +119 @@
 }
 
-QList<UICloudMachine> UICloudNetworkingStuff::listInstances(const CCloudClient &comCloudClient,
-                                                            QString &strErrorMessage,
-                                                            QWidget *pParent /* = 0 */)
+QMap<QString, QString> UICloudNetworkingStuff::listInstances(const CCloudClient &comCloudClient,
+                                                             QString &strErrorMessage,
+                                                             QWidget *pParent /* = 0 */)
 {
     /* Prepare VM names, ids and states.
@@ -158 +158 @@
         else
         {
-            /* Fetch acquired objects to lists: */
+            /* Fetch acquired objects to map: */
             const QVector<QString> instanceIds = comIDs.GetValues();
             const QVector<QString> instanceNames = comNames.GetValues();
-            QList<UICloudMachine> resultList;
+            QMap<QString, QString> resultMap;
             for (int i = 0; i < instanceIds.size(); ++i)
-                resultList << UICloudMachine(comCloudClient, instanceIds.at(i), instanceNames.at(i));
-            return resultList;
-        }
-    }
-
-    /* Return empty list by default: */
-    return QList<UICloudMachine>();
+                resultMap[instanceIds.at(i)] = instanceNames.at(i);
+            return resultMap;
+        }
+    }
+
+    /* Return empty map by default: */
+    return QMap<QString, QString>();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.h

@@ -23 +23 @@
 
 /* GUI includes: */
-#include "UICloudMachine.h"
 #include "UILibraryDefs.h"
 
@@ -52 +51 @@
                                                         const QUuid &uMachineId);
 
-    /** Acquires instance list.
+    /** Acquires instance map.
       * @param  comCloudClient   Brings cloud client object.
       * @param  strErrorMessage  Brings error message container.
       * @param  pWidget          Brings parent widget to show messages according to,
       *                          if no parent set, progress will be executed in blocking way. */
-    SHARED_LIBRARY_STUFF QList<UICloudMachine> listInstances(const CCloudClient &comCloudClient,
-                                                             QString &strErrorMessage,
-                                                             QWidget *pParent = 0);
-    /** Acquires cloud machine list.
+    SHARED_LIBRARY_STUFF QMap<QString, QString> listInstances(const CCloudClient &comCloudClient,
+                                                              QString &strErrorMessage,
+                                                              QWidget *pParent = 0);
+    /** Acquires cloud machine vector.
       * @param  comCloudClient   Brings cloud client object.
       * @param  strErrorMessage  Brings error message container.