Changeset 83288 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 13, 2020 3:57:50 PM (5 years ago)

Author:

vboxsync

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

136448

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Rename id/name of UICloudMachine to be actually instanceId/instanceName to make it more precise.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICloudMachine.cpp (modified) (6 diffs)
• globals/UICloudMachine.h (modified) (5 diffs)
• globals/UIDetailsGenerator.cpp (modified) (1 diff)
• manager/UIVirtualMachineItemCloud.cpp (modified) (1 diff)

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

@@ -29 +29 @@
 
 UICloudMachineData::UICloudMachineData(const CCloudClient &comCloudClient,
-                                       const QString &strId,
-                                       const QString &strName)
+                                       const QString &strInstanceId,
+                                       const QString &strInstanceName)
     : m_comCloudClient(comCloudClient)
-    , m_strId(strId)
-    , m_strName(strName)
+    , m_strInstanceId(strInstanceId)
+    , m_strInstanceName(strInstanceName)
     , m_fAccessible(true)
     , m_enmMachineState(KMachineState_PoweredOff)
@@ -40 +40 @@
     , m_iCpuCount(0)
 {
-    //printf("Data for machine with id = {%s} is created\n", m_strId.toUtf8().constData());
+    //printf("Data for machine with id = {%s} is created\n", m_strInstanceId.toUtf8().constData());
 }
 
@@ -46 +46 @@
     : QSharedData(other)
     , m_comCloudClient(other.m_comCloudClient)
-    , m_strId(other.m_strId)
-    , m_strName(other.m_strName)
+    , m_strInstanceId(other.m_strInstanceId)
+    , m_strInstanceName(other.m_strInstanceName)
     , m_fAccessible(other.m_fAccessible)
     , m_strAccessError(other.m_strAccessError)
@@ -59 +59 @@
     , m_strImageId(other.m_strImageId)
 {
-    //printf("Data for machine with id = {%s} is copied\n", m_strId.toUtf8().constData());
+    //printf("Data for machine with id = {%s} is copied\n", m_strInstanceId.toUtf8().constData());
 }
 
 UICloudMachineData::~UICloudMachineData()
 {
-    //printf("Data for machine with id = {%s} is deleted\n", m_strId.toUtf8().constData());
+    //printf("Data for machine with id = {%s} is deleted\n", m_strInstanceId.toUtf8().constData());
 }
 
@@ -73 +73 @@
 
     /* Acquire instance info sync way, be aware, this is blocking stuff, it takes some time: */
-    const QMap<KVirtualSystemDescriptionType, QString> instanceInfoMap = getInstanceInfo(m_comCloudClient, m_strId, m_strAccessError);
+    const QMap<KVirtualSystemDescriptionType, QString> instanceInfoMap = getInstanceInfo(m_comCloudClient,
+                                                                                         m_strInstanceId,
+                                                                                         m_strAccessError);
     /* Update accessibility state: */
     m_fAccessible = m_strAccessError.isNull();
@@ -134 +136 @@
 
 UICloudMachine::UICloudMachine(const CCloudClient &comCloudClient,
-                               const QString &strId,
-                               const QString &strName)
-    : d(new UICloudMachineData(comCloudClient, strId, strName))
+                               const QString &strInstanceId,
+                               const QString &strInstanceName)
+    : d(new UICloudMachineData(comCloudClient, strInstanceId, strInstanceName))
 {
 }

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

@@ -39 +39 @@
 
     /** Constructs shared cloud VM data on the basis of arguments.
-      * @param  comCloudClient  Brings the cloud client object reference.
-      * @param  strId           Brings the cloud VM id.
-      * @param  strName         Brings the cloud VM name. */
+      * @param  comCloudClient   Brings the cloud client object reference.
+      * @param  strInstanceId    Brings the cloud instance id.
+      * @param  strInstanceName  Brings the cloud instance name. */
     UICloudMachineData(const CCloudClient &comCloudClient,
-                       const QString &strId,
-                       const QString &strName);
+                       const QString &strInstanceId,
+                       const QString &strInstanceName);
     /** Constructs shared cloud VM data on the basis of @a other data. */
     UICloudMachineData(const UICloudMachineData &other);
@@ -56 +56 @@
     CCloudClient cloudClient() const { return m_comCloudClient; }
 
-    /** Returns cloud VM id. */
-    QString id() const { return m_strId; }
-    /** Returns cloud VM name. */
-    QString name() const { return m_strName; }
+    /** Returns cloud instance id. */
+    QString instanceId() const { return m_strInstanceId; }
+    /** Returns cloud instance name. */
+    QString instanceName() const { return m_strInstanceName; }
 
     /** Returns whether cloud VM is accessible. */
@@ -93 +93 @@
     CCloudClient  m_comCloudClient;
 
-    /** Holds the cloud VM id. */
-    const QString  m_strId;
-    /** Holds the cloud VM name. */
-    const QString  m_strName;
+    /** Holds the cloud instance id. */
+    const QString  m_strInstanceId;
+    /** Holds the cloud instance name. */
+    const QString  m_strInstanceName;
 
     /** Holds whether cloud VM is accessible. */
@@ -137 +137 @@
     UICloudMachine();
     /** Constructs cloud VM wrapper on the basis of arguments.
-      * @param  comCloudClient  Brings the cloud client object instance.
-      * @param  strId           Brings the cloud VM id.
-      * @param  strName         Brings the cloud VM name. */
+      * @param  comCloudClient   Brings the cloud client object instance.
+      * @param  strInstanceId    Brings the cloud instance id.
+      * @param  strInstanceName  Brings the cloud instance name. */
     UICloudMachine(const CCloudClient &comCloudClient,
-                   const QString &strId,
-                   const QString &strName);
+                   const QString &strInstanceId,
+                   const QString &strInstanceName);
     /** Constructs cloud VM wrapper on the basis of @a other wrapper. */
     UICloudMachine(const UICloudMachine &other);
@@ -155 +155 @@
     CCloudClient client() const { return d->cloudClient(); }
 
-    /** Returns cloud VM id. */
-    QString id() const { return d->id(); }
-    /** Returns cloud VM name. */
-    QString name() const { return d->name(); }
+    /** Returns cloud instance id. */
+    QString instanceId() const { return d->instanceId(); }
+    /** Returns cloud instance name. */
+    QString instanceName() const { return d->instanceName(); }
 
     /** Returns whether cloud VM is accessible. */

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

@@ -140 +140 @@
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral_Name)
         table << UITextTableLine(QApplication::translate("UIDetails", "Name", "details (general)"),
-                                 guiCloudMachine.name());
+                                 guiCloudMachine.instanceName());
 
     /* Operating system: */

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

@@ -104 +104 @@
     if (!m_guiCloudMachine.isNull())
     {
-        m_strId = m_guiCloudMachine.id();
-        m_strName = m_guiCloudMachine.name();
+        m_strId = m_guiCloudMachine.instanceId();
+        m_strName = m_guiCloudMachine.instanceName();
     }