Changeset 41484 in vbox

Timestamp:

May 29, 2012 3:15:39 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: UISession cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -60 +60 @@
     /* Common variables: */
     , m_pMenuPool(0)
-    , m_machineState(KMachineState_Null)
-#if defined(Q_WS_WIN)
+    , m_machineState(session().GetMachine().GetState())
+#ifdef Q_WS_WIN
     , m_alphaCursor(0)
-#endif
+#endif /* Q_WS_WIN */
     /* Common flags: */
     , m_fIsFirstTimeStarted(false)
@@ -89 +89 @@
     , m_fIsHidingHostPointer(true)
 {
-    /* Explicit initialize the console event handler */
-    UIConsoleEventHandler::instance(this);
-
-    /* Add console event connections */
-    connect(gConsoleEvents, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)),
-            this, SLOT(sltMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)));
-
-    connect(gConsoleEvents, SIGNAL(sigMouseCapabilityChange(bool, bool, bool)),
-            this, SLOT(sltMouseCapabilityChange(bool, bool, bool)));
-
-    connect(gConsoleEvents, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)),
-            this, SLOT(sltKeyboardLedsChangeEvent(bool, bool, bool)));
-
-    connect(gConsoleEvents, SIGNAL(sigStateChange(KMachineState)),
-            this, SLOT(sltStateChange(KMachineState)));
-
-    connect(gConsoleEvents, SIGNAL(sigAdditionsChange()),
-            this, SLOT(sltAdditionsChange()));
-
-    connect(gConsoleEvents, SIGNAL(sigVRDEChange()),
-            this, SLOT(sltVRDEChange()));
-
-    connect(gConsoleEvents, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)),
-            this, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)));
-
-    connect(gConsoleEvents, SIGNAL(sigMediumChange(CMediumAttachment)),
-            this, SIGNAL(sigMediumChange(CMediumAttachment)));
-
-    connect(gConsoleEvents, SIGNAL(sigUSBControllerChange()),
-            this, SIGNAL(sigUSBControllerChange()));
-
-    connect(gConsoleEvents, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)),
-            this, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)));
-
-    connect(gConsoleEvents, SIGNAL(sigSharedFolderChange()),
-            this, SIGNAL(sigSharedFolderChange()));
-
-    connect(gConsoleEvents, SIGNAL(sigRuntimeError(bool, QString, QString)),
-            this, SIGNAL(sigRuntimeError(bool, QString, QString)));
-
-#ifdef Q_WS_MAC
-    connect(gConsoleEvents, SIGNAL(sigShowWindow()),
-            this, SIGNAL(sigShowWindows()),
-            Qt::QueuedConnection);
-#endif /* Q_WS_MAC */
-
-    connect(gConsoleEvents, SIGNAL(sigCPUExecutionCapChange()),
-            this, SIGNAL(sigCPUExecutionCapChange()));
-
-    connect(gConsoleEvents, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
-            this, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
+    /* Prepare console event-handlers: */
+    prepareConsoleEventHandlers();
 
     /* Prepare framebuffers: */
     prepareFramebuffers();
 
-    /* Prepare main menu: */
+    /* Prepare main-menu: */
     prepareMenuPool();
 
-    /* Load uisession settings: */
+    /* Load settings: */
     loadSessionSettings();
 
@@ -161 +112 @@
 UISession::~UISession()
 {
-    /* Save uisession settings: */
+    /* Save settings: */
     saveSessionSettings();
 
-    /* Cleanup main menu: */
+    /* Cleanup main-menu: */
     cleanupMenuPool();
 
@@ -170 +121 @@
     cleanupFramebuffers();
 
-    /* Destroy the console event handler */
-    UIConsoleEventHandler::destroy();
-
-#if defined(Q_WS_WIN)
+    /* Cleanup console event-handlers: */
+    cleanupConsoleEventHandlers();
+
+#ifdef Q_WS_WIN
     /* Destroy alpha cursor: */
     if (m_alphaCursor)
         DestroyIcon(m_alphaCursor);
-#endif
+#endif /* Q_WS_WIN */
 }
 
@@ -313 +264 @@
 }
 
+UIMachineLogic* UISession::machineLogic() const
+{
+    return uimachine()->machineLogic();
+}
+
 QWidget* UISession::mainMachineWindow() const
 {
-    return uimachine()->machineLogic()->mainMachineWindow();
-}
-
-UIMachineLogic* UISession::machineLogic() const
-{
-    return uimachine()->machineLogic();
+    return machineLogic()->mainMachineWindow();
 }
 
@@ -349 +300 @@
 bool UISession::setPause(bool fOn)
 {
-    /* Commenting it out as isPaused() could reflect
-     * quite obsolete state due to synchronization: */
-    //if (isPaused() == fOn)
-    //    return true;
-
     CConsole console = session().GetConsole();
 
@@ -655 +601 @@
 }
 
+void UISession::prepareConsoleEventHandlers()
+{
+    /* Initialize console event-handler: */
+    UIConsoleEventHandler::instance(this);
+
+    /* Add console event connections: */
+    connect(gConsoleEvents, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)),
+            this, SLOT(sltMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)));
+
+    connect(gConsoleEvents, SIGNAL(sigMouseCapabilityChange(bool, bool, bool)),
+            this, SLOT(sltMouseCapabilityChange(bool, bool, bool)));
+
+    connect(gConsoleEvents, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)),
+            this, SLOT(sltKeyboardLedsChangeEvent(bool, bool, bool)));
+
+    connect(gConsoleEvents, SIGNAL(sigStateChange(KMachineState)),
+            this, SLOT(sltStateChange(KMachineState)));
+
+    connect(gConsoleEvents, SIGNAL(sigAdditionsChange()),
+            this, SLOT(sltAdditionsChange()));
+
+    connect(gConsoleEvents, SIGNAL(sigVRDEChange()),
+            this, SLOT(sltVRDEChange()));
+
+    connect(gConsoleEvents, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)),
+            this, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)));
+
+    connect(gConsoleEvents, SIGNAL(sigMediumChange(CMediumAttachment)),
+            this, SIGNAL(sigMediumChange(CMediumAttachment)));
+
+    connect(gConsoleEvents, SIGNAL(sigUSBControllerChange()),
+            this, SIGNAL(sigUSBControllerChange()));
+
+    connect(gConsoleEvents, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)),
+            this, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)));
+
+    connect(gConsoleEvents, SIGNAL(sigSharedFolderChange()),
+            this, SIGNAL(sigSharedFolderChange()));
+
+    connect(gConsoleEvents, SIGNAL(sigRuntimeError(bool, QString, QString)),
+            this, SIGNAL(sigRuntimeError(bool, QString, QString)));
+
+#ifdef Q_WS_MAC
+    connect(gConsoleEvents, SIGNAL(sigShowWindow()),
+            this, SIGNAL(sigShowWindows()), Qt::QueuedConnection);
+#endif /* Q_WS_MAC */
+
+    connect(gConsoleEvents, SIGNAL(sigCPUExecutionCapChange()),
+            this, SIGNAL(sigCPUExecutionCapChange()));
+
+    connect(gConsoleEvents, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
+            this, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
+}
+
 void UISession::prepareFramebuffers()
 {
@@ -749 +749 @@
     }
     m_frameBufferVector.clear();
+}
+
+void UISession::cleanupConsoleEventHandlers()
+{
+    /* Destroy console event-handler: */
+    UIConsoleEventHandler::destroy();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -88 +88 @@
     CSession& session() { return m_session; }
     KMachineState machineState() const { return m_machineState; }
+    UIMachineLogic* machineLogic() const;
     QWidget* mainMachineWindow() const;
-    UIMachineLogic* machineLogic() const;
     QMenu* newMenu(UIMainMenuType fOptions = UIMainMenuType_All);
     QMenuBar* newMenuBar(UIMainMenuType fOptions = UIMainMenuType_All);
@@ -201 +201 @@
 
     /* Prepare helpers: */
+    void prepareConsoleEventHandlers();
     void prepareFramebuffers();
     void prepareMenuPool();
@@ -209 +210 @@
     void cleanupMenuPool();
     void cleanupFramebuffers();
+    void cleanupConsoleEventHandlers();
 
     /* Common helpers: */