Changeset 83254 in vbox

Timestamp:

Mar 11, 2020 10:21:46 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Go away from CVirtualBoxErrorInfo representation of last access error; Convert it to QString instantly, this will be useful when filling error information in another than the GUI thread.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (2 diffs)
• UIVirtualMachineItem.h (modified) (3 diffs)
• UIVirtualMachineItemCloud.cpp (modified) (1 diff)
• UIVirtualMachineItemLocal.cpp (modified) (4 diffs)

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

@@ -25 +25 @@
 #include "QISplitter.h"
 #include "UIActionPoolManager.h"
-#include "UIErrorString.h"
 #include "UIExtraDataManager.h"
 #include "UIChooser.h"
@@ -787 +786 @@
             /* Propagate last access error to update the Error-pane (if machine selected but inaccessible): */
             if (pItem)
-                m_pPaneToolsMachine->setErrorDetails(UIErrorString::formatErrorInfo(pItem->accessError()));
+                m_pPaneToolsMachine->setErrorDetails(pItem->accessError());
         }
 

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

@@ -31 +31 @@
 #include "UISettingsDefs.h"
 
-/* COM includes: */
-#include "COMEnums.h"
-#include "CVirtualBoxErrorInfo.h"
-
 /* Forward declarations: */
 class UIVirtualMachineItemCloud;
@@ -72 +68 @@
         bool accessible() const { return m_fAccessible; }
         /** Returns the last cached access error. */
-        const CVirtualBoxErrorInfo &accessError() const { return m_comAccessError; }
+        QString accessError() const { return m_strAccessError; }
     /** @} */
 
@@ -152 +148 @@
       * @{ */
         /** Holds whether VM was accessible. */
-        bool                  m_fAccessible;
+        bool     m_fAccessible;
         /** Holds the last cached access error. */
-        CVirtualBoxErrorInfo  m_comAccessError;
+        QString  m_strAccessError;
     /** @} */
 

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

@@ -113 +113 @@
     {
         /* Reset last access error information: */
-        m_comAccessError = CVirtualBoxErrorInfo();
+        m_strAccessError.clear();
 
         /* Determine own VM attributes: */

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

@@ -23 +23 @@
 #include "UICommon.h"
 #include "UIConverter.h"
+#include "UIErrorString.h"
 #include "UIExtraDataManager.h"
 #include "UIVirtualMachineItemLocal.h"
@@ -31 +32 @@
 /* COM includes: */
 #include "CSnapshot.h"
+#include "CVirtualBoxErrorInfo.h"
 
 
@@ -61 +63 @@
     {
         /* Reset last access error information: */
-        m_comAccessError = CVirtualBoxErrorInfo();
+        m_strAccessError.clear();
 
         /* Determine own VM attributes: */
@@ -108 +110 @@
     {
         /* Update last access error information: */
-        m_comAccessError = m_comMachine.GetAccessError();
+        m_strAccessError = UIErrorString::formatErrorInfo(m_comMachine.GetAccessError());
 
         /* Determine machine name on the basis of settings file only: */