Changeset 92106 in vbox for trunk

Timestamp:

Oct 27, 2021 2:01:36 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Replace the macro we use to check unattended install setup with a function.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (3 diffs)
• UIVirtualBoxManager.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -95 +95 @@
 #include <VBox/version.h>
 
-#define checkUnattendedInstallError(comUnattendedInstaller) \
-    do { \
-        if (!comUnattendedInstaller.isOk())      \
-        { \
-        COMErrorInfo comErrorInfo =  comUnattendedInstaller.errorInfo(); \
-        QString strErrorInfo = UIErrorString::formatErrorInfo(comErrorInfo); \
-        msgCenter().cannotRunUnattendedGuestInstall(comUnattendedInstaller); \
-        return; \
-        } \
-    } while (0)
-
-
 /** QDialog extension used to ask for a public key for console connection needs. */
 class UIAcquirePublicKeyDialog : public QIWithRetranslateUI<QDialog>
@@ -2431 +2419 @@
 }
 
+bool UIVirtualBoxManager::checkUnattendedInstallError(CUnattended &comUnattendedInstaller) const
+{
+    if (!comUnattendedInstaller.isOk())
+    {
+        COMErrorInfo comErrorInfo =  comUnattendedInstaller.errorInfo();
+        QString strErrorInfo = UIErrorString::formatErrorInfo(comErrorInfo);
+        msgCenter().cannotRunUnattendedGuestInstall(comUnattendedInstaller);
+        return false;
+    }
+    return true;
+}
+
 void UIVirtualBoxManager::openAddMachineDialog(const QString &strFileName /* = QString() */)
 {
@@ -2542 +2542 @@
 
     comUnattendedInstaller.SetIsoPath(unattendedData.m_strISOPath);
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.SetMachine(comMachine);
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.SetUser(unattendedData.m_strUserName);
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.SetPassword(unattendedData.m_strPassword);
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.SetHostname(unattendedData.m_strHostnameDomainName);
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.SetProductKey(unattendedData.m_strProductKey);
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.SetInstallGuestAdditions(unattendedData.m_fInstallGuestAdditions);
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.SetAdditionsIsoPath(unattendedData.m_strGuestAdditionsISOPath);
 
     comUnattendedInstaller.Prepare();
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.ConstructMedia();
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
     comUnattendedInstaller.ReconfigureVM();
-    checkUnattendedInstallError(comUnattendedInstaller);
+    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
 
     UICommon::LaunchMode enmLaunchMode = UICommon::LaunchMode_Default;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -41 +41 @@
 class UIVirtualMachineItem;
 class CCloudMachine;
+class CUnattended;
 
 /* Type definitions: */
@@ -353 +354 @@
         /** Returns whether at least one cloud profile currently being updated. */
         bool isCloudProfileUpdateInProgress() const;
+
+        /* Checks if @p comUnattendedInstaller has any errors. If so shows an error message and return false, else returns true. */
+        bool checkUnattendedInstallError(CUnattended &comUnattendedInstaller) const;
     /** @} */