Changeset 78077 in vbox

Timestamp:

Apr 10, 2019 11:24:12 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9152: More cleanup for Export Appliance wizard.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance

Files:

• UIWizardExportAppPageBasic2.cpp (modified) (3 diffs)
• UIWizardExportAppPageBasic2.h (modified) (2 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (2 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

@@ -735 +735 @@
 }
 
-CCloudProfile UIWizardExportAppPage2::profile() const
-{
-    return m_comCloudProfile;
-}
-
 AbstractVSDParameterList UIWizardExportAppPage2::cloudClientParameters() const
 {
@@ -1033 +1028 @@
     registerField("includeISOsSelected", this, "includeISOsSelected");
     registerField("providerShortName", this, "providerShortName");
-    registerField("profileName", this, "profileName");
-    registerField("profile", this, "profile");
     registerField("cloudClientParameters", this, "cloudClientParameters");
 }
@@ -1177 +1170 @@
         const bool fCSP =    field("isFormatCloudOne").toBool();
 
-        const QString &strFile = field("path").toString().toLower();
-        const QString &strAccount = field("profileName").toString();
-
         fResult =    (   fOVF
-                      && VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts))
+                      && VBoxGlobal::hasAllowedExtension(path().toLower(), OVFFileExts))
                   || (   fCSP
-                      && !strAccount.isNull());
+                      && !m_comCloudProfile.isNull());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h

@@ -162 +162 @@
     /** Returns profile name. */
     QString profileName() const;
-    /** Returns Cloud Profile object. */
-    CCloudProfile profile() const;
     /** Returns Cloud Client parameters. */
     AbstractVSDParameterList cloudClientParameters() const;
@@ -241 +239 @@
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
     Q_PROPERTY(QString providerShortName READ providerShortName);
-    Q_PROPERTY(QString profileName READ profileName);
-    Q_PROPERTY(CCloudProfile profile READ profile);
     Q_PROPERTY(AbstractVSDParameterList cloudClientParameters READ cloudClientParameters);
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

@@ -381 +381 @@
     registerField("includeISOsSelected", this, "includeISOsSelected");
     registerField("providerShortName", this, "providerShortName");
-    registerField("profileName", this, "profileName");
-    registerField("profile", this, "profile");
     registerField("cloudClientParameters", this, "cloudClientParameters");
     registerField("applianceWidget", this, "applianceWidget");
@@ -526 +524 @@
         const bool fCSP =    field("isFormatCloudOne").toBool();
 
-        const QString &strFile = field("path").toString().toLower();
-        const QString &strAccount = field("profileName").toString();
-        const AbstractVSDParameterList &parameters = field("cloudClientParameters").value<AbstractVSDParameterList>();
-
         fResult =    (   fOVF
-                      && VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts))
+                      && VBoxGlobal::hasAllowedExtension(path().toLower(), OVFFileExts))
                   || (   fCSP
-                      && !strAccount.isNull()
-                      && !parameters.isEmpty());
+                      && !m_comCloudProfile.isNull()
+                      && !m_cloudClientParameters.isEmpty());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

@@ -46 +46 @@
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
     Q_PROPERTY(QString providerShortName READ providerShortName);
-    Q_PROPERTY(QString profileName READ profileName);
-    Q_PROPERTY(CCloudProfile profile READ profile);
     Q_PROPERTY(AbstractVSDParameterList cloudClientParameters READ cloudClientParameters);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);