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

Timestamp:

Mar 9, 2023 12:01:30 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Simplify UIStarter code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIStarter.cpp (modified) (6 diffs)
• globals/UIStarter.h (modified) (3 diffs)
• main.cpp (modified) (4 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIStarter.cpp

@@ -42 +42 @@
 
 
-/* static */
-UIStarter *UIStarter::s_pInstance = 0;
-
-/* static */
-void UIStarter::create()
-{
-    /* Pretect versus double 'new': */
-    if (s_pInstance)
-        return;
-
-    /* Create instance: */
-    new UIStarter;
-}
-
-/* static */
-void UIStarter::destroy()
-{
-    /* Pretect versus double 'delete': */
-    if (!s_pInstance)
-        return;
-
-    /* Destroy instance: */
-    delete s_pInstance;
-}
-
 UIStarter::UIStarter()
-{
-    /* Assign instance: */
-    s_pInstance = this;
-}
-
-UIStarter::~UIStarter()
-{
-    /* Unassign instance: */
-    s_pInstance = 0;
-}
-
-void UIStarter::init()
 {
     /* Listen for UICommon signals: */
@@ -88 +51 @@
 }
 
-void UIStarter::deinit()
+UIStarter::~UIStarter()
 {
     /* Listen for UICommon signals no more: */
@@ -105 +68 @@
 #ifndef VBOX_RUNTIME_UI
 
-    /* Make sure Selector UI is permitted, quit if not: */
+    /* Make sure Manager UI is permitted, quit if not: */
     if (gEDataManager->guiFeatureEnabled(GUIFeatureType_NoSelector))
     {
@@ -130 +93 @@
 #else /* VBOX_RUNTIME_UI */
 
-    /* Make sure Runtime UI is even possible, quit if not: */
+    /* Make sure Runtime UI is possible at all, quit if not: */
     if (uiCommon().managedVMUuid().isNull())
     {
@@ -137 +100 @@
     }
 
-    /* Make sure machine is started, quit if not: */
+    /* Try to start virtual machine, quit if failed: */
     if (!UIMachine::startMachine(uiCommon().managedVMUuid()))
         return QApplication::quit();
@@ -157 +120 @@
 #ifndef VBOX_RUNTIME_UI
     /* Destroy Manager UI: */
-    if (gpManager)
-        UIVirtualBoxManager::destroy();
+    UIVirtualBoxManager::destroy();
 #else
     /* Destroy Runtime UI: */
-    if (gpMachine)
-        UIMachine::destroy();
+    UIMachine::destroy();
 #endif
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIStarter.h

@@ -35 +35 @@
 #include <QObject>
 
-/** QObject subclass allowing to control GUI part
+/** QObject subclass allowing to start/close GUI parts
   * of VirtualBox application in sync/async modes. */
 class UIStarter : public QObject
@@ -41 +41 @@
     Q_OBJECT;
 
+public:
+
     /** Constructs UI starter. */
     UIStarter();
     /** Destructs UI starter. */
     virtual ~UIStarter();
-
-public:
-
-    /** Returns the singleton UI starter instance. */
-    static UIStarter *instance() { return s_pInstance; }
-
-    /** Create the singleton UI starter instance. */
-    static void create();
-    /** Create the singleton UI starter instance. */
-    static void destroy();
-
-    /** Init UICommon connections. */
-    void init();
-    /** Deinit UICommon connections. */
-    void deinit();
 
 private slots:
@@ -69 +56 @@
     /** Closes corresponding part of the UI. */
     void sltCloseUI();
-
-private:
-
-    /** Holds the singleton UI starter instance. */
-    static UIStarter *s_pInstance;
 };
 
-/** Singleton UI starter 'official' name. */
-#define gStarter UIStarter::instance()
-
 #endif /* !FEQT_INCLUDED_SRC_globals_UIStarter_h */

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -521 +521 @@
         UIModalWindowManager::create();
 
-        /* Create UI starter: */
-        UIStarter::create();
 #ifndef VBOX_RUNTIME_UI
         /* Create global app instance for Selector UI: */
@@ -540 +538 @@
             if (uiCommon().processArgs())
                 break;
-
-            /* Init link between UI starter and global app instance: */
-            gStarter->init();
 
             // WORKAROUND:
@@ -555 +550 @@
             a.setQuitOnLastWindowClosed(false);
 
+            /* Create UI starter: */
+            UIStarter uiStarter;
             /* Request to Start UI _after_ QApplication executed: */
-            QMetaObject::invokeMethod(gStarter, "sltStartUI", Qt::QueuedConnection);
+            QMetaObject::invokeMethod(&uiStarter, "sltStartUI", Qt::QueuedConnection);
 
             /* Start application: */
             iResultCode = a.exec();
-
-            /* Break link between UI starter and global app instance: */
-            gStarter->deinit();
         }
         while (0);
@@ -568 +562 @@
         /* Destroy global app instance: */
         UICommon::destroy();
-        /* Destroy UI starter: */
-        UIStarter::destroy();
 
         /* Destroy modal-window manager: */

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

@@ -452 +452 @@
 {
     /* Make sure VirtualBox Manager is created: */
-    AssertPtrReturnVoid(s_pInstance);
+    if (!s_pInstance)
+        return;
 
     /* Unregister in the modal window manager: */