Changeset 90109 in vbox for trunk

Timestamp:

Jul 9, 2021 10:12:29 AM (4 years ago)

Author:

vboxsync

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

145609

Message:

FE/Qt: bugref:9996: Removing redundant data members

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (5 diffs)
• UIWizardNewVM.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -61 +61 @@
     , m_iSASCount(0)
     , m_iUSBCount(0)
-    , m_fInstallGuestAdditions(false)
-    , m_fStartHeadless(false)
     , m_fSkipUnattendedInstall(false)
     , m_fEFIEnabled(false)
@@ -564 +562 @@
 {
     m_unattendedInstallData = unattendedInstallData;
-    setFieldsFromDefaultUnttendedInstallData();
-}
-
-void UIWizardNewVM::setFieldsFromDefaultUnttendedInstallData()
-{
-    m_strUserName = m_unattendedInstallData.m_strUserName;
-    m_strPassword = m_unattendedInstallData.m_strPassword;
-    m_strHostname = m_unattendedInstallData.m_strHostname;
-    m_fInstallGuestAdditions = m_unattendedInstallData.m_fInstallGuestAdditions;
-    m_strGuestAdditionsISOPath = m_unattendedInstallData.m_strGuestAdditionsISOPath;
 }
 
@@ -672 +660 @@
 bool UIWizardNewVM::installGuestAdditions() const
 {
-    return m_fInstallGuestAdditions;
+    return m_unattendedInstallData.m_fInstallGuestAdditions;
 }
 
 void UIWizardNewVM::setInstallGuestAdditions(bool fInstallGA)
 {
-    m_fInstallGuestAdditions = fInstallGA;
+    m_unattendedInstallData.m_fInstallGuestAdditions = fInstallGA;
 }
 
 bool UIWizardNewVM::startHeadless() const
 {
-    return m_fStartHeadless;
+    return m_unattendedInstallData.m_fStartHeadless;
 }
 
 void UIWizardNewVM::setStartHeadless(bool fStartHeadless)
 {
-    m_fStartHeadless = fStartHeadless;
+    m_unattendedInstallData.m_fStartHeadless = fStartHeadless;
 }
 
@@ -726 +714 @@
 const QString &UIWizardNewVM::userName() const
 {
-    return m_strUserName;
+    return m_unattendedInstallData.m_strUserName;
 }
 
 void UIWizardNewVM::setUserName(const QString &strUserName)
 {
-    m_strUserName = strUserName;
+    m_unattendedInstallData.m_strUserName = strUserName;
 }
 
 const QString &UIWizardNewVM::password() const
 {
-    return m_strPassword;
+    return m_unattendedInstallData.m_strPassword;
 }
 
 void UIWizardNewVM::setPassword(const QString &strPassword)
 {
-    m_strPassword = strPassword;
+    m_unattendedInstallData.m_strPassword = strPassword;
 }
 
 const QString &UIWizardNewVM::guestAdditionsISOPath() const
 {
-    return m_strGuestAdditionsISOPath;
+    return m_unattendedInstallData.m_strGuestAdditionsISOPath;
 }
 
 void UIWizardNewVM::setGuestAdditionsISOPath(const QString &strGAISOPath)
 {
-    m_strGuestAdditionsISOPath = strGAISOPath;
+    m_unattendedInstallData.m_strGuestAdditionsISOPath = strGAISOPath;
 }
 
 const QString &UIWizardNewVM::hostname() const
 {
-    return m_strHostname;
+    return m_unattendedInstallData.m_strHostname;
 }
 
 void UIWizardNewVM::setHostname(const QString &strHostname)
 {
-    m_strHostname = strHostname;
+    m_unattendedInstallData.m_strHostname = strHostname;
 }
 
 const QString &UIWizardNewVM::productKey() const
 {
-    return m_strProductKey;
+    return m_unattendedInstallData.m_strProductKey;
 }
 
 void UIWizardNewVM::setProductKey(const QString &productKey)
 {
-    m_strProductKey = productKey;
+    m_unattendedInstallData.m_strProductKey = productKey;
 }
 
@@ -838 +826 @@
 {
     m_unattendedInstallData.m_strISOPath = m_strISOFilePath;
-    m_unattendedInstallData.m_strUserName = m_strUserName;
-    m_unattendedInstallData.m_strPassword = m_strPassword;
-    m_unattendedInstallData.m_strHostname = m_strHostname;
-
-    m_unattendedInstallData.m_strDetectedOSTypeId = m_strDetectedOSTypeId;
-    // // m_unattendedInstallData.m_strDetectedOSVersion = getStringFieldValue("detectedOSVersion");
-    // // m_unattendedInstallData.m_strDetectedOSFlavor = getStringFieldValue("detectedOSFlavor");
-    // // m_unattendedInstallData.m_strDetectedOSLanguages = getStringFieldValue("detectedOSLanguages");
-    // // m_unattendedInstallData.m_strDetectedOSHints = getStringFieldValue("detectedOSHints");
-    m_unattendedInstallData.m_strProductKey = m_strProductKey;
-    m_unattendedInstallData.m_strGuestAdditionsISOPath = m_strGuestAdditionsISOPath;
     m_unattendedInstallData.m_fUnattendedEnabled = isUnattendedEnabled();
-    m_unattendedInstallData.m_fStartHeadless = m_fStartHeadless;
-    m_unattendedInstallData.m_fInstallGuestAdditions = m_fInstallGuestAdditions;
     m_unattendedInstallData.m_uMachineUid = createdMachineId();
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -45 +45 @@
 {
     UIUnattendedInstallData();
-    bool m_fUnattendedEnabled;
     QUuid m_uMachineUid;
     QString m_strISOPath;
+
+    bool m_fUnattendedEnabled;
     bool m_fStartHeadless;
     QString m_strUserName;
     QString m_strPassword;
     QString m_strHostname;
-    QString m_strDetectedOSTypeId;
+    QString m_strProductKey;
+    bool m_fInstallGuestAdditions;
+    QString m_strGuestAdditionsISOPath;
+#if 0
     QString m_strDetectedOSVersion;
     QString m_strDetectedOSFlavor;
     QString m_strDetectedOSLanguages;
     QString m_strDetectedOSHints;
-    QString m_strProductKey;
-    bool m_fInstallGuestAdditions;
-    QString m_strGuestAdditionsISOPath;
+#endif
 };
 
@@ -171 +173 @@
     void retranslateUi();
     QString getNextControllerName(KStorageBus type);
-    void setFieldsFromDefaultUnttendedInstallData();
     void setUnattendedPageVisible(bool fVisible);
     /** Returns the Id of newly created VM. */
@@ -214 +215 @@
     /** True if guest additions are to be installed during unattended install. */
     bool m_fInstallGuestAdditions;
-    bool m_fStartHeadless;
     bool m_fSkipUnattendedInstall;
     bool m_fEFIEnabled;
-
-    QString m_strUserName;
-    QString m_strPassword;
-    QString m_strGuestAdditionsISOPath;
-    QString m_strHostname;
-    QString m_strProductKey;
 
     int m_iCPUCount;