Changeset 83203 in vbox

Timestamp:

Mar 4, 2020 4:37:11 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: A bit of cleanup for UICloudMachine and UICloudNetworkingStuff stuff.

Location:

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

Files:

• UICloudMachine.cpp (modified) (3 diffs)
• UICloudMachine.h (modified) (3 diffs)
• UICloudNetworkingStuff.cpp (modified) (1 diff)
• UIDetailsGenerator.cpp (modified) (1 diff)

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

@@ -39 +39 @@
     , m_iMemorySize(0)
     , m_iCpuCount(0)
-    //, m_strInstanceShape("None")
-    //, m_strDomain("None")
-    //, m_strBootingFirmware("None")
-    //, m_strImageId(QString())
 {
     //printf("Data for machine with id = {%s} is created\n", m_strId.toUtf8().constData());
@@ -57 +53 @@
     , m_iMemorySize(other.m_iMemorySize)
     , m_iCpuCount(other.m_iCpuCount)
-    , m_strInstanceShape(other.m_strInstanceShape)
+    , m_strShape(other.m_strShape)
     , m_strDomain(other.m_strDomain)
     , m_strBootingFirmware(other.m_strBootingFirmware)
@@ -80 +76 @@
     m_iCpuCount = fetchCpuCount(instanceInfoMap);
     m_enmMachineState = fetchMachineState(instanceInfoMap);
-    m_strInstanceShape = fetchShape(instanceInfoMap);
+    m_strShape = fetchShape(instanceInfoMap);
     m_strDomain = fetchDomain(instanceInfoMap);
     m_strBootingFirmware = fetchBootingFirmware(instanceInfoMap);

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

@@ -73 +73 @@
     /** Returns cloud VM CPU count. */
     int cpuCount() const { return m_iCpuCount; }
-    /** Returns cloud VM instance shape. */
-    QString instanceShape() const { return m_strInstanceShape; }
+    /** Returns cloud VM shape. */
+    QString shape() const { return m_strShape; }
     /** Returns cloud VM domain. */
     QString domain() const { return m_strDomain; }
@@ -108 +108 @@
     /** Holds the cloud VM CPU count. */
     int      m_iCpuCount;
-    /** Holds the cloud VM instance shape. */
-    QString  m_strInstanceShape;
+    /** Holds the cloud VM shape. */
+    QString  m_strShape;
     /** Holds the cloud VM domain. */
     QString  m_strDomain;
@@ -168 +168 @@
     /** Returns cloud VM CPU count. */
     int cpuCount() const { return d->cpuCount(); }
-    /** Returns cloud VM instance shape. */
-    QString instanceShape() const { return d->instanceShape(); }
+    /** Returns cloud VM shape. */
+    QString shape() const { return d->shape(); }
     /** Returns cloud VM domain. */
     QString domain() const { return d->domain(); }

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

@@ -263 +263 @@
 QString UICloudNetworkingStuff::fetchShape(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
 {
-    /* Return instance shape value: */
+    /* Return shape value: */
     return infoMap.value(KVirtualSystemDescriptionType_CloudInstanceShape);
 }

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

@@ -298 +298 @@
     }
 
-    /* Instance Shape: */
-    {
-        const QString strShape = guiCloudMachine.instanceShape();
+    /* Shape: */
+    {
+        const QString strShape = guiCloudMachine.shape();
         const QString strResult = !strShape.isEmpty()
                                 ? strShape