Changeset 60223 in vbox

Timestamp:

Mar 28, 2016 3:13:10 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​bugref:8308: Event handlers rework/cleanup (part 02): Basic prepare/cleanup cascade sync, styling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIConsoleEventHandler.cpp (modified) (7 diffs)
• runtime/UIConsoleEventHandler.h (modified) (3 diffs)
• selector/UIVirtualBoxEventHandler.cpp (modified) (3 diffs)
• selector/UIVirtualBoxEventHandler.h (modified) (1 diff)

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

@@ -43 +43 @@
 {
     if (!m_spInstance)
-    {
         m_spInstance = new UIConsoleEventHandler(pSession);
-        m_spInstance->prepare();
-    }
 }
 
@@ -54 +51 @@
     if (m_spInstance)
     {
-        m_spInstance->cleanup();
         delete m_spInstance;
         m_spInstance = 0;
@@ -86 +82 @@
     : m_pSession(pSession)
 {
+    /* Prepare: */
+    prepare();
+}
+
+UIConsoleEventHandler::~UIConsoleEventHandler()
+{
+    /* Cleanup: */
+    cleanup();
 }
 
@@ -176 +180 @@
             this, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
             Qt::QueuedConnection);
-
     connect(pListener->getWrapped(), SIGNAL(sigRuntimeError(bool, QString, QString)),
             this, SIGNAL(sigRuntimeError(bool, QString, QString)),
@@ -182 +185 @@
 
     /* Create direct (sync) connections for waitable signals: */
-    connect(pListener->getWrapped(), SIGNAL(sigCanShowWindow(bool&, QString&)),
-            this, SLOT(sltCanShowWindow(bool&, QString&)),
+    connect(pListener->getWrapped(), SIGNAL(sigCanShowWindow(bool &, QString &)),
+            this, SLOT(sltCanShowWindow(bool &, QString &)),
             Qt::DirectConnection);
-    connect(pListener->getWrapped(), SIGNAL(sigShowWindow(qint64&)),
-            this, SLOT(sltShowWindow(qint64&)),
+    connect(pListener->getWrapped(), SIGNAL(sigShowWindow(qint64 &)),
+            this, SLOT(sltShowWindow(qint64 &)),
             Qt::DirectConnection);
 }
@@ -192 +195 @@
 void UIConsoleEventHandler::cleanup()
 {
+    /* Make sure session is passed: */
+    AssertPtrReturnVoid(m_pSession);
+
     /* Get console: */
     const CConsole console = m_pSession->session().GetConsole();
@@ -198 +204 @@
     /* Get event-source: */
     CEventSource eventSource = console.GetEventSource();
-    AssertReturnVoid(!eventSource.isNull() || eventSource.isOk());
+    AssertWrapperOk(eventSource);
     /* Unregister listener: */
     eventSource.UnregisterListener(m_mainEventListener);

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

@@ -36 +36 @@
 /** Singleton QObject extension
   * providing GUI with the CConsole event-source. */
-class UIConsoleEventHandler: public QObject
+class UIConsoleEventHandler : public QObject
 {
     Q_OBJECT;
@@ -99 +99 @@
     /** Constructs console event handler for passed @a pSession. */
     UIConsoleEventHandler(UISession *pSession);
+    /** Destructs console event handler. */
+    ~UIConsoleEventHandler();
 
     /** Prepares all. */
@@ -108 +110 @@
     static UIConsoleEventHandler *m_spInstance;
 
+    /** Holds the COM event listener instance. */
+    CEventListener m_mainEventListener;
+
     /** Holds the UI session reference. */
     UISession *m_pSession;
-
-    /** Holds the main event listener instance. */
-    CEventListener m_mainEventListener;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp

@@ -32 +32 @@
 
 /* static */
-UIVirtualBoxEventHandler *UIVirtualBoxEventHandler::m_pInstance = 0;
+UIVirtualBoxEventHandler *UIVirtualBoxEventHandler::m_spInstance = 0;
 
 /* static */
 UIVirtualBoxEventHandler* UIVirtualBoxEventHandler::instance()
 {
-    if (!m_pInstance)
-        m_pInstance = new UIVirtualBoxEventHandler;
-    return m_pInstance;
+    if (!m_spInstance)
+        m_spInstance = new UIVirtualBoxEventHandler;
+    return m_spInstance;
 }
 
@@ -45 +45 @@
 void UIVirtualBoxEventHandler::destroy()
 {
-    if (m_pInstance)
+    if (m_spInstance)
     {
-        delete m_pInstance;
-        m_pInstance = 0;
+        delete m_spInstance;
+        m_spInstance = 0;
     }
 }
 
 UIVirtualBoxEventHandler::UIVirtualBoxEventHandler()
+{
+    /* Prepare: */
+    prepare();
+}
+
+UIVirtualBoxEventHandler::~UIVirtualBoxEventHandler()
+{
+    /* Cleanup: */
+    cleanup();
+}
+
+void UIVirtualBoxEventHandler::prepare()
 {
     /* Create Main event listener instance: */
@@ -124 +136 @@
 }
 
-UIVirtualBoxEventHandler::~UIVirtualBoxEventHandler()
+void UIVirtualBoxEventHandler::cleanup()
 {
     /* Get VirtualBox: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h

@@ -69 +69 @@
     ~UIVirtualBoxEventHandler();
 
+    /** Prepares all. */
+    void prepare();
+    /** Cleanups all. */
+    void cleanup();
+
     /** Holds the singleton static VirtualBox event handler instance. */
-    static UIVirtualBoxEventHandler *m_pInstance;
+    static UIVirtualBoxEventHandler *m_spInstance;
 
     /** Holds the COM event listener instance. */