Changeset 86739 in vbox

Timestamp:

Oct 28, 2020 4:02:34 PM (4 years ago)

Author:

vboxsync

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

141130

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Logic fix for r141119, cloud machine is represented by id, not name.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (4 diffs)
• UIChooserAbstractModel.h (modified) (2 diffs)

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

@@ -355 +355 @@
 UICloudEntityKey::UICloudEntityKey(const QString &strProviderShortName /* = QString() */,
                                    const QString &strProfileName /* = QString() */,
-                                   const QString &strMachineName /* = QString() */)
+                                   const QUuid &uMachineId /* = QUuid() */)
     : m_strProviderShortName(strProviderShortName)
     , m_strProfileName(strProfileName)
-    , m_strMachineName(strMachineName)
+    , m_uMachineId(uMachineId)
 {
 }
@@ -365 +365 @@
     : m_strProviderShortName(another.m_strProviderShortName)
     , m_strProfileName(another.m_strProfileName)
-    , m_strMachineName(another.m_strMachineName)
+    , m_uMachineId(another.m_uMachineId)
 {
 }
@@ -374 +374 @@
            && m_strProviderShortName == another.m_strProviderShortName
            && m_strProfileName == another.m_strProfileName
-           && m_strProfileName == another.m_strProfileName
+           && m_uMachineId == another.m_uMachineId
               ;
 }
@@ -387 +387 @@
         return strResult;
     strResult += QString("/%1").arg(m_strProfileName);
-    if (m_strMachineName.isEmpty())
+    if (m_uMachineId.isNull())
         return strResult;
-    strResult += QString("/%1").arg(m_strMachineName);
+    strResult += QString("/%1").arg(m_uMachineId.toString());
     return strResult;
 }

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

@@ -47 +47 @@
       * @param  strProviderShortName  Brings provider short name.
       * @param  strProfileName        Brings profile name.
-      * @param  strMachineName        Brings machine name. */
+      * @param  uMachineId            Brings machine id. */
     UICloudEntityKey(const QString &strProviderShortName = QString(),
                      const QString &strProfileName = QString(),
-                     const QString &strMachineName = QString());
+                     const QUuid &uMachineId = QUuid());
     /** Constructs cloud entity key on the basis of @a another one. */
     UICloudEntityKey(const UICloudEntityKey &another);
@@ -64 +64 @@
     /** Holds profile name. */
     QString m_strProfileName;
-    /** Holds machine name. */
-    QString m_strMachineName;
+    /** Holds machine id. */
+    QUuid m_uMachineId;
 };