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

Timestamp:

Sep 21, 2020 7:32:28 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Rename UIProgress::run to UIProgress::exec since that is a blocking event-loop call.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UITaskCloudRefreshMachineInfo.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (1 diff)
• widgets/UIProgressDialog.cpp (modified) (4 diffs)
• widgets/UIProgressDialog.h (modified) (2 diffs)

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

@@ -52 +52 @@
         /* Show "Refresh cloud machine information" progress: */
         QPointer<UIProgress> pObject = new UIProgress(m_comCloudMachineRefreshProgress, this);
-        pObject->run();
+        pObject->exec();
         if (pObject)
             delete pObject;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -1166 +1166 @@
                                     this, &UIMachineSettingsGeneral::sigOperationProgressError,
                                     Qt::BlockingQueuedConnection);
-                            pObject->run();
+                            pObject->exec();
                             if (pObject)
                                 delete pObject;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

@@ -561 +561 @@
 }
 
-void UIProgress::run()
+void UIProgress::exec()
 {
     /* Make sure progress hasn't aborted/finished already: */
@@ -570 +570 @@
      * but holding a pointer to it for a control needs: */
     QEventLoop eventLoop;
-    m_pEventLoop = &eventLoop;
+    m_pEventLoopExec = &eventLoop;
 
     /* Guard ourself for the case
@@ -585 +585 @@
 
     /* Cleanup the pointer finally: */
-    m_pEventLoop = 0;
+    m_pEventLoopExec = 0;
 }
 
@@ -602 +602 @@
         emit sigProgressError(UIErrorString::formatErrorInfo(m_comProgress));
 
-    /* Exit from the event-loop if there is any: */
-    if (m_pEventLoop)
-        m_pEventLoop->exit();
+    /* Exit from the exec event-loop if there is any: */
+    if (m_pEventLoopExec)
+        m_pEventLoopExec->exit();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h

@@ -202 +202 @@
     virtual ~UIProgress() /* override */;
 
-    /** Executes the progress-handler within its loop. */
-    void run();
+    /** Executes the progress within local event-loop. */
+    void exec();
 
 private slots:
@@ -229 +229 @@
     UIProgressEventHandler *m_pEventHandler;
 
-    /** Holds the personal event-loop instance. */
-    QPointer<QEventLoop>  m_pEventLoop;
+    /** Holds the exec event-loop instance. */
+    QPointer<QEventLoop>  m_pEventLoopExec;
 };