Changeset 41145 in vbox

Timestamp:

May 3, 2012 4:40:59 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Update Manager stuff: Refactoring/Cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/net

Files:

• UIUpdateManager.cpp (modified) (8 diffs)
• UIUpdateManager.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIUpdateManager class implementation.
+ *
+ * VBox frontends: Qt4 GUI ("VirtualBox"):
+ * UIUpdateManager class implementation
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +19 @@
 
 /* Global includes: */
-#include <QEventLoop>
 #include <QNetworkReply>
 #include <QTimer>
@@ -36 +37 @@
 #include "VBoxDefs.h"
 
+/* Forward declarations: */
+class UIUpdateStep;
+
 /* Using declarations: */
 using namespace VBoxGlobalDefs;
 
-/* Interface representing update step: */
+/* Queue for processing update-steps: */
+class UIUpdateQueue : public QObject
+{
+    Q_OBJECT;
+
+signals:
+
+    /* Starting-signal of the queue: */
+    void sigStartQueue();
+
+    /* Completion-signal of the queue: */
+    void sigQueueFinished();
+
+public:
+
+    /* Constructor: */
+    UIUpdateQueue(UIUpdateManager *pParent) : QObject(pParent) {}
+
+    /* Starts a queue: */
+    void start() { emit sigStartQueue(); }
+
+private:
+
+    /* Helpers: */
+    bool isEmpty() const { return m_pLastStep.isNull(); }
+    UIUpdateStep* lastStep() const { return m_pLastStep; }
+    void setLastStep(UIUpdateStep *pStep) { m_pLastStep = pStep; }
+
+    /* Variables: */
+    QPointer<UIUpdateStep> m_pLastStep;
+
+    /* Friend classes: */
+    friend class UIUpdateStep;
+};
+
+/* Interface representing update-step: */
 class UIUpdateStep : public UINetworkCustomer
 {
@@ -52 +91 @@
 
     /* Constructor: */
-    UIUpdateStep()
-    {
-        /* Connect completion-signal of the step to the destruction-slot of the step: */
+    UIUpdateStep(UIUpdateQueue *pQueue) : UINetworkCustomer(pQueue)
+    {
+        /* If queue has no steps yet: */
+        if (pQueue->isEmpty())
+        {
+            /* Connect starting-signal of the queue to starting-slot of this step: */
+            connect(pQueue, SIGNAL(sigStartQueue()), this, SLOT(sltStartStep()), Qt::QueuedConnection);
+        }
+        /* If queue has at least one step already: */
+        else
+        {
+            /* Reconnect completion-signal of the last-step from completion-signal of the queue to starting-slot of this step: */
+            disconnect(pQueue->lastStep(), SIGNAL(sigStepComplete()), pQueue, SIGNAL(sigQueueFinished()));
+            connect(pQueue->lastStep(), SIGNAL(sigStepComplete()), this, SLOT(sltStartStep()), Qt::QueuedConnection);
+        }
+
+        /* Connect completion-signal of this step to the completion-signal of the queue: */
+        connect(this, SIGNAL(sigStepComplete()), pQueue, SIGNAL(sigQueueFinished()), Qt::QueuedConnection);
+        /* Connect completion-signal of this step to the destruction-slot of this step: */
         connect(this, SIGNAL(sigStepComplete()), this, SLOT(deleteLater()), Qt::QueuedConnection);
+
+        /* Remember this step as the last one: */
+        pQueue->setLastStep(this);
     }
 
@@ -73 +131 @@
 };
 
-/* Queue for processing update steps: */
-class UIUpdateQueue : public QObject
+/* Update-step to check for the new VirtualBox version: */
+class UIUpdateStepVirtualBox : public UIUpdateStep
 {
     Q_OBJECT;
 
-signals:
-
-    /* Starting-signal of the queue: */
-    void sigStartQueue();
-
-    /* Completion-signal of the queue: */
-    void sigQueueFinished();
-
 public:
 
     /* Constructor: */
-    UIUpdateQueue(UIUpdateManager *pParent) : QObject(pParent) {}
-
-    /* Enqueue passed-step with previously queued (if any) passed-steps: */
-    void add(UIUpdateStep *pStep)
-    {
-        /* Set 'this' as parent for passed step,
-         * that way passed-step could be cleaned-up in case of queue destruction: */
-        pStep->setParent(this);
-
-        /* If queue had no passed-steps yet: */
-        if (!m_pLastStep)
-        {
-            /* Connect starting-signal of the queue to starting-slot of the passed-step: */
-            connect(this, SIGNAL(sigStartQueue()), pStep, SLOT(sltStartStep()), Qt::QueuedConnection);
-        }
-        /* If queue already had at least one passed-step: */
-        else
-        {
-            /* Reconnect completion-signal of the last-step from completion-signal of the queue to starting-slot of the passed-step: */
-            disconnect(m_pLastStep, SIGNAL(sigStepComplete()), this, SIGNAL(sigQueueFinished()));
-            connect(m_pLastStep, SIGNAL(sigStepComplete()), pStep, SLOT(sltStartStep()), Qt::QueuedConnection);
-        }
-
-        /* Connect completion-signal of the passed-step to the completion-signal of the queue: */
-        connect(pStep, SIGNAL(sigStepComplete()), this, SIGNAL(sigQueueFinished()), Qt::QueuedConnection);
-
-        /* Remember last-step: */
-        m_pLastStep = pStep;
-    }
-
-    /* Starts a queue: */
-    void start()
-    {
-        /* Emit signal which starts queue: */
-        emit sigStartQueue();
-    }
-
-private:
-
-    /* Guarded pointer to the last passed-step: */
-    QPointer<UIUpdateStep> m_pLastStep;
-};
-
-/* Update step to check for the new VirtualBox version: */
-class UIUpdateStepVirtualBox : public UIUpdateStep
-{
-    Q_OBJECT;
-
-public:
-
-    /* Constructor: */
-    UIUpdateStepVirtualBox(bool fForceCall)
-        : m_url("http://update.virtualbox.org/query.php")
+    UIUpdateStepVirtualBox(UIUpdateQueue *pQueue, bool fForceCall)
+        : UIUpdateStep(pQueue)
+        , m_url("http://update.virtualbox.org/query.php")
         , m_fForceCall(fForceCall)
     {
@@ -243 +243 @@
 };
 
-/* Update step to check for the new VirtualBox Extension Pack version: */
+/* Update-step to check for the new VirtualBox Extension Pack version: */
 class UIUpdateStepVirtualBoxExtensionPack : public UIUpdateStep
 {
@@ -251 +251 @@
 
     /* Constructor: */
-    UIUpdateStepVirtualBoxExtensionPack() {}
+    UIUpdateStepVirtualBoxExtensionPack(UIUpdateQueue *pQueue)
+        : UIUpdateStep(pQueue)
+    {
+    }
 
 private slots:
@@ -409 +412 @@
     {
         /* Prepare update queue: */
-        m_pQueue->add(new UIUpdateStepVirtualBox(fForceCall));
-        m_pQueue->add(new UIUpdateStepVirtualBoxExtensionPack);
+        new UIUpdateStepVirtualBox(m_pQueue, fForceCall);
+        new UIUpdateStepVirtualBoxExtensionPack(m_pQueue);
         /* Start update queue: */
         m_pQueue->start();

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 class UIUpdateQueue;
 
-/* Singleton to perform new version checks and
- * updates of various VirtualBox parts. */
+/* Singleton to perform new version checks
+ * and update of various VirtualBox parts. */
 class UIUpdateManager : public QObject
 {
@@ -69 +69 @@
 
 #endif // __UIUpdateManager_h__
+