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

Timestamp:

May 28, 2018 4:39:19 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Small cleanup for UIStarter: Removing sltDestroyUI, it's the only part of cleanup anyway.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIStarter.cpp (modified) (4 diffs)
• UIStarter.h (modified) (2 diffs)

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

@@ -76 +76 @@
 }
 
-void UIStarter::prepare()
-{
-    /* Listen for QApplication signals: */
-    connect(qApp, &QGuiApplication::aboutToQuit,
-            this, &UIStarter::sltDestroyUI);
-}
-
 void UIStarter::init()
 {
@@ -103 +96 @@
 }
 
-void UIStarter::cleanup()
-{
-    /* Destroy UI if there is still something to: */
-    sltDestroyUI();
+void UIStarter::prepare()
+{
+    /* Listen for QApplication signals: */
+    connect(qApp, &QGuiApplication::aboutToQuit,
+            this, &UIStarter::cleanup);
 }
 
@@ -153 +147 @@
     }
 # if defined(VBOX_GUI_WITH_SHARED_LIBRARY) && defined(VBOX_RUNTIME_UI)
+    /* Show the error message otherwise and quit: */
     else
     {
-        /* Show the error message otherwise: */
         msgCenter().cannotStartRuntime();
         return QApplication::quit();
@@ -172 +166 @@
 }
 
-void UIStarter::sltDestroyUI()
+void UIStarter::cleanup()
 {
 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)

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

@@ -33 +33 @@
     virtual ~UIStarter() /* override */;
 
-    /** Prepares everything. */
-    void prepare();
-    /** Cleanups everything. */
-    void cleanup();
-
 public:
 
@@ -55 +50 @@
 private slots:
 
+    /** Prepares everything. */
+    void prepare();
+
     /** Starts corresponding part of the UI. */
     void sltStartUI();
     /** Restarts corresponding part of the UI. */
     void sltRestartUI();
-    /** Destroys corresponding part of the UI. */
-    void sltDestroyUI();
+
+    /** Cleanups everything. */
+    void cleanup();
 
     /** Opens URLs in Selector UI. */