Changeset 91522 in vbox for trunk/src/VBox

Timestamp:

Oct 1, 2021 3:08:36 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: UIWizardImportApp: Forgot something in r147213.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance

Files:

• UIWizardImportAppPageBasic1.cpp (modified) (5 diffs)
• UIWizardImportAppPageBasic1.h (modified) (1 diff)
• UIWizardImportAppPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -229 +229 @@
 {
     /* Clear appliance: */
-    m_comAppliance = CAppliance();
+    m_comCloudAppliance = CAppliance();
     /* Clear form properties: */
     m_comVSDForm = CVirtualSystemDescriptionForm();
@@ -249 +249 @@
 
             /* Remember appliance: */
-            m_comAppliance = comAppliance;
+            m_comCloudAppliance = comAppliance;
 
             /* Read cloud instance info: */
-            CProgress comReadProgress = m_comAppliance.Read(QString("OCI://%1/%2").arg(profileName(), machineId()));
-            if (!m_comAppliance.isOk())
-            {
-                msgCenter().cannotImportAppliance(m_comAppliance);
+            CProgress comReadProgress = m_comCloudAppliance.Read(QString("OCI://%1/%2").arg(profileName(), machineId()));
+            if (!m_comCloudAppliance.isOk())
+            {
+                msgCenter().cannotImportAppliance(m_comCloudAppliance);
                 break;
             }
@@ -264 +264 @@
             if (!comReadProgress.isOk() || comReadProgress.GetResultCode() != 0)
             {
-                msgCenter().cannotImportAppliance(comReadProgress, m_comAppliance.GetPath());
+                msgCenter().cannotImportAppliance(comReadProgress, m_comCloudAppliance.GetPath());
                 break;
             }
 
             /* Acquire virtual system description: */
-            QVector<CVirtualSystemDescription> descriptions = m_comAppliance.GetVirtualSystemDescriptions();
-            if (!m_comAppliance.isOk())
-            {
-                msgCenter().cannotAcquireVirtualSystemDescription(m_comAppliance);
+            QVector<CVirtualSystemDescription> descriptions = m_comCloudAppliance.GetVirtualSystemDescriptions();
+            if (!m_comCloudAppliance.isOk())
+            {
+                msgCenter().cannotAcquireVirtualSystemDescription(m_comCloudAppliance);
                 break;
             }
@@ -352 +352 @@
 CAppliance UIWizardImportAppPage1::cloudAppliance() const
 {
-    return m_comAppliance;
+    return m_comCloudAppliance;
 }
 
@@ -677 +677 @@
         populateFormProperties();
         /* And make sure they are not null: */
-        return m_comAppliance.isNotNull() && m_comVSDForm.isNotNull();
+        return m_comCloudAppliance.isNotNull() && m_comVSDForm.isNotNull();
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h

@@ -116 +116 @@
     /** Holds the Cloud Client object reference. */
     CCloudClient                   m_comCloudClient;
-    /** Holds the Appliance object reference. */
-    CAppliance                     m_comAppliance;
+    /** Holds the Cloud Appliance object reference. */
+    CAppliance                     m_comCloudAppliance;
     /** Holds the Virtual System Description Form object reference. */
     CVirtualSystemDescriptionForm  m_comVSDForm;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

@@ -328 +328 @@
                       && !m_comCloudClient.isNull()
                       && !machineId().isNull()
-                      && !m_comAppliance.isNull()
+                      && !m_comCloudAppliance.isNull()
                       && !m_comVSDForm.isNull());
     }