Changeset 83158 in vbox

Timestamp:

Feb 26, 2020 11:39:17 AM (5 years ago)

Author:

vboxsync

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

136279

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Moving OS type and machine state fetching functionality from UIVirtualMachineItemCloud to UICloudNetworkingStuff to make it reusable.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICloudNetworkingStuff.cpp (modified) (1 diff)
• globals/UICloudNetworkingStuff.h (modified) (1 diff)
• manager/UIVirtualMachineItemCloud.cpp (modified) (2 diffs)
• manager/UIVirtualMachineItemCloud.h (modified) (1 diff)

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

@@ -183 +183 @@
     return getInstanceInfo(comCloudClient, strId, pParent).value(enmType, QString());
 }
+
+QString UICloudNetworkingStuff::fetchOsType(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+{
+    /* Prepare a map of known OS types: */
+    QMap<QString, QString> osTypes;
+    osTypes["Custom"] = QString("Other");
+    osTypes["Oracle Linux"] = QString("Oracle_64");
+    osTypes["Canonical Ubuntu"] = QString("Ubuntu_64");
+
+    /* Return OS type value: */
+    return osTypes.value(infoMap.value(KVirtualSystemDescriptionType_OS), "Other");
+}
+
+KMachineState UICloudNetworkingStuff::fetchMachineState(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+{
+    /* Prepare a map of known machine states: */
+    QMap<QString, KMachineState> machineStates;
+    machineStates["RUNNING"] = KMachineState_Running;
+    machineStates["STOPPED"] = KMachineState_Paused;
+    machineStates["STOPPING"] = KMachineState_Stopping;
+    machineStates["STARTING"] = KMachineState_Starting;
+
+    /* Return machine state value: */
+    return machineStates.value(infoMap.value(KVirtualSystemDescriptionType_CloudInstanceState), KMachineState_PoweredOff);
+}

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

@@ -57 +57 @@
                                                  const QString &strId,
                                                  QWidget *pParent = 0);
+
+    /** Fetches cloud VM OS type from the passed @a info. */
+    SHARED_LIBRARY_STUFF QString fetchOsType(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
+    /** Fetches cloud VM state from the passed @a info. */
+    SHARED_LIBRARY_STUFF KMachineState fetchMachineState(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
 }
 

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

@@ -326 +326 @@
 {
     /* Update info: */
-    updateOsType(infoMap.value(KVirtualSystemDescriptionType_OS));
-    updateState(infoMap.value(KVirtualSystemDescriptionType_CloudInstanceState));
+    m_strOSTypeId = fetchOsType(infoMap);
+    m_enmMachineState = fetchMachineState(infoMap);
 
     /* Recache: */
@@ -335 +335 @@
     emit sigStateChange();
 }
-
-void UIVirtualMachineItemCloud::updateOsType(const QString &strInfo)
-{
-    /* Prepare a map of known OS types: */
-    QMap<QString, QString> osTypes;
-    osTypes["Custom"] = QString("Other");
-    osTypes["Oracle Linux"] = QString("Oracle_64");
-    osTypes["Canonical Ubuntu"] = QString("Ubuntu_64");
-
-    /* Update OS type value: */
-    m_strOSTypeId = osTypes.value(strInfo, "Other");
-}
-
-void UIVirtualMachineItemCloud::updateState(const QString &strInfo)
-{
-    /* Prepare a map of known states: */
-    QMap<QString, KMachineState> states;
-    states["RUNNING"] = KMachineState_Running;
-    states["STOPPED"] = KMachineState_Paused;
-    states["STOPPING"] = KMachineState_Stopping;
-    states["STARTING"] = KMachineState_Starting;
-
-    /* Update state value: */
-    m_enmMachineState = states.value(strInfo, KMachineState_PoweredOff);
-}

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

@@ -137 +137 @@
         /** Updates cloud VM info on the basis of @a infoMap value. */
         void updateInfo(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
-
-        /** Updates cloud VM OS type on the basis of @a strInfo value. */
-        void updateOsType(const QString &strInfo);
-        /** Updates cloud VM state on the basis of @a strInfo value. */
-        void updateState(const QString &strInfo);
     /** @} */