Changeset 90560 in vbox for trunk/src

Timestamp:

Aug 7, 2021 7:36:02 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Moving singleton functionality from UIDownloaderExtensionPack to UINotificationDownloaderExtensionPack.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• networking/UIDownloaderExtensionPack.cpp (modified) (3 diffs)
• networking/UIDownloaderExtensionPack.h (modified) (3 diffs)
• networking/UIUpdateManager.cpp (modified) (3 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderExtensionPack.cpp

@@ -34 +34 @@
 
 
-/* static */
-UIDownloaderExtensionPack *UIDownloaderExtensionPack::s_pInstance = 0;
-
-/* static */
-UIDownloaderExtensionPack *UIDownloaderExtensionPack::create()
-{
-    if (!s_pInstance)
-        s_pInstance = new UIDownloaderExtensionPack;
-    return s_pInstance;
-}
-
 UIDownloaderExtensionPack::UIDownloaderExtensionPack()
 {
-    /* Prepare instance: */
-    if (!s_pInstance)
-        s_pInstance = this;
-
     /* Get version number and adjust it for test and trunk builds. The server only has official releases. */
     const QString strVersion = UIVersion(uiCommon().vboxVersionStringNormalized()).effectiveReleasedVersion().toString();
@@ -66 +51 @@
     setTarget(strTarget);
     setPathSHA256SumsFile(strPathSHA256SumsFile);
-}
-
-UIDownloaderExtensionPack::~UIDownloaderExtensionPack()
-{
-    /* Cleanup instance: */
-    if (s_pInstance == this)
-        s_pInstance = 0;
 }
 
@@ -187 +165 @@
     }
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderExtensionPack.h

@@ -43 +43 @@
 public:
 
-    /** Creates downloader instance. */
-    static UIDownloaderExtensionPack *create();
-    /** Returns current downloader instance. */
-    static UIDownloaderExtensionPack *current() { return s_pInstance; }
+    /** Constructs downloader. */
+    UIDownloaderExtensionPack();
 
 private:
-
-    /** Constructs downloader. */
-    UIDownloaderExtensionPack();
-    /** Destructs downloader. */
-    ~UIDownloaderExtensionPack();
 
     /** Returns description of the current network operation. */
@@ -65 +58 @@
     virtual void handleVerifiedObject(UINetworkReply *pReply) /* override */;
 
-    /** Holds the static singleton instance. */
-    static UIDownloaderExtensionPack *s_pInstance;
-
     /** Holds the cached received data awaiting for verification. */
     QByteArray m_receivedData;
@@ -73 +63 @@
 
 #endif /* !FEQT_INCLUDED_SRC_networking_UIDownloaderExtensionPack_h */
-

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

@@ -27 +27 @@
 #include "UICommon.h"
 #include "VBoxUtils.h"
-#include "UIDownloaderExtensionPack.h"
 #include "UIExtraDataManager.h"
 #include "UIMessageCenter.h"
@@ -420 +419 @@
 
     /* Return if already downloading: */
-    if (UIDownloaderExtensionPack::current())
+    if (UINotificationDownloaderExtensionPack::exists())
     {
         emit sigStepComplete();
@@ -491 +490 @@
 
     /* Download extension pack: */
-    UINotificationDownloaderExtensionPack *pNotification = new UINotificationDownloaderExtensionPack(GUI_ExtPackName);
+    UINotificationDownloaderExtensionPack *pNotification = UINotificationDownloaderExtensionPack::instance(GUI_ExtPackName);
     /* After downloading finished => propose to install the Extension Pack: */
     connect(pNotification, &UINotificationDownloaderExtensionPack::sigExtensionPackDownloaded,

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

@@ -1492 +1492 @@
 *********************************************************************************************************************************/
 
+/* static */
+UINotificationDownloaderExtensionPack *UINotificationDownloaderExtensionPack::s_pInstance = 0;
+
+/* static */
+UINotificationDownloaderExtensionPack *UINotificationDownloaderExtensionPack::instance(const QString &strPackName)
+{
+    if (!s_pInstance)
+        new UINotificationDownloaderExtensionPack(strPackName);
+    return s_pInstance;
+}
+
+/* static */
+bool UINotificationDownloaderExtensionPack::exists()
+{
+    return !!s_pInstance;
+}
+
 UINotificationDownloaderExtensionPack::UINotificationDownloaderExtensionPack(const QString &strPackName)
     : m_strPackName(strPackName)
 {
+    s_pInstance = this;
+}
+
+UINotificationDownloaderExtensionPack::~UINotificationDownloaderExtensionPack()
+{
+    s_pInstance = 0;
 }
 
@@ -1510 +1533 @@
 {
     /* Create and configure the Extension Pack downloader: */
-    UIDownloaderExtensionPack *pDownloader = UIDownloaderExtensionPack::create();
+    UIDownloaderExtensionPack *pDownloader = new UIDownloaderExtensionPack;
     if (pDownloader)
     {

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

@@ -1118 +1118 @@
 };
 
-/** UINotificationDownloader extension for Extension Pack downloading functionality. */
+/** UINotificationDownloader extension for extension pack downloading functionality. */
 class SHARED_LIBRARY_STUFF UINotificationDownloaderExtensionPack : public UINotificationDownloader
 {
@@ -1135 +1135 @@
 public:
 
-    /** Constructs host-only network interface remove notification-progress. */
+    /** Returns singleton instance, creates if necessary.
+      * @param  strPackName  Brings the package name. */
+    static UINotificationDownloaderExtensionPack *instance(const QString &strPackName);
+    /** Returns whether singleton instance already created. */
+    static bool exists();
+
+    /** Destructs extension pack downloading notification-progress.
+      * @note  Notification-center can destroy us at any time. */
+    virtual ~UINotificationDownloaderExtensionPack() /* override final */;
+
+protected:
+
+    /** Constructs extension pack downloading notification-progress.
+      * @param  strPackName  Brings the package name. */
     UINotificationDownloaderExtensionPack(const QString &strPackName);
 
-protected:
-
     /** Returns object name. */
     virtual QString name() const /* override final */;
@@ -1149 +1160 @@
 private:
 
-    /** Holds the pack being dowloaded. */
+    /** Holds the singleton instance. */
+    static UINotificationDownloaderExtensionPack *s_pInstance;
+
+    /** Holds the name of pack being dowloaded. */
     QString  m_strPackName;
 };