Changeset 91877 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 20, 2021 11:26:48 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UINotificationCenter: Make handleNow() return result value.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationCenter.cpp (modified) (5 diffs)
• notificationcenter/UINotificationCenter.h (modified) (2 diffs)
• wizards/UINativeWizard.cpp (modified) (1 diff)
• wizards/UINativeWizard.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

@@ -156 +156 @@
     , m_iAnimatedValue(0)
     , m_pTimerOpen(0)
+    , m_fLastResult(false)
 {
     prepare();
@@ -227 +228 @@
 }
 
-void UINotificationCenter::handleNow(UINotificationProgress *pProgress)
+bool UINotificationCenter::handleNow(UINotificationProgress *pProgress)
 {
     /* Check for the recursive run: */
-    AssertMsgReturnVoid(!m_pEventLoop, ("UINotificationCenter::handleNow() is called recursively!\n"));
+    AssertMsgReturn(!m_pEventLoop, ("UINotificationCenter::handleNow() is called recursively!\n"), false);
+
+    /* Reset the result: */
+    m_fLastResult = false;
 
     /* Guard progress for the case
@@ -241 +245 @@
     /* Is progress still valid? */
     if (guardProgress.isNull())
-        return;
+        return m_fLastResult;
     /* Is progress still running? */
     if (guardProgress->isFinished())
-        return;
+        return m_fLastResult;
 
     /* Create a local event-loop: */
@@ -259 +263 @@
     /* Are we still valid? */
     if (guardThis.isNull())
-        return;
+        return false;
 
     /* Cleanup event-loop: */
     m_pEventLoop = 0;
+
+    /* Return actual result: */
+    return m_fLastResult;
 }
 
@@ -401 +408 @@
 void UINotificationCenter::sltHandleProgressFinished()
 {
+    /* Acquire the sender: */
+    UINotificationProgress *pProgress = qobject_cast<UINotificationProgress*>(sender());
+    AssertPtrReturnVoid(pProgress);
+
+    /* Set the result: */
+    m_fLastResult = pProgress->error().isNull();
+
     /* Break the loop if exists: */
     if (m_pEventLoop)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

@@ -83 +83 @@
     /** Immediately and synchronously handles passed notification @a pProgress.
       * @note It's a blocking call finished by sltHandleProgressFinished(). */
-    void handleNow(UINotificationProgress *pProgress);
+    bool handleNow(UINotificationProgress *pProgress);
 
 protected:
@@ -175 +175 @@
       *        handles progress directly via handleNow(). */
     QPointer<QEventLoop>  m_pEventLoop;
+    /** Holds the last handleNow() result. */
+    bool                  m_fLastResult;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

@@ -80 +80 @@
 
 
-void UINativeWizard::handleNotificationProgressNow(UINotificationProgress *pProgress)
-{
-    m_pNotificationCenter->handleNow(pProgress);
+bool UINativeWizard::handleNotificationProgressNow(UINotificationProgress *pProgress)
+{
+    return m_pNotificationCenter->handleNow(pProgress);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.h

@@ -81 +81 @@
 
     /** Immediately handles notification @a pProgress object. */
-    void handleNotificationProgressNow(UINotificationProgress *pProgress);
+    bool handleNotificationProgressNow(UINotificationProgress *pProgress);
 
 public slots: