Changeset 88679 in vbox for trunk/src/VBox

Timestamp:

Apr 23, 2021 2:50:25 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: A bit of cleanup for UIConsoleEventHandler.

Location:

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

Files:

• UIConsoleEventHandler.cpp (modified) (14 diffs)
• UIConsoleEventHandler.h (modified) (4 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2020 Oracle Corporation
+ * Copyright (C) 2010-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
 
 /* GUI includes: */
+#include "UICommon.h"
 #include "UIConsoleEventHandler.h"
+#include "UIExtraDataManager.h"
 #include "UIMainEventListener.h"
 #include "UIMousePointerShapeData.h"
-#include "UIExtraDataManager.h"
-#include "UICommon.h"
 #include "UISession.h"
 #ifdef VBOX_WS_MAC
@@ -29 +29 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CConsole.h"
 #include "CEventListener.h"
 #include "CEventSource.h"
-#include "CConsole.h"
 
 
@@ -93 +93 @@
     UIConsoleEventHandlerProxy(QObject *pParent, UISession *pSession);
     /** Destructs event proxy object. */
-    ~UIConsoleEventHandlerProxy();
-
-protected:
-
-    /** @name Prepare/Cleanup cascade.
-      * @{ */
-        /** Prepares all. */
-        void prepare();
-        /** Prepares listener. */
-        void prepareListener();
-        /** Prepares connections. */
-        void prepareConnections();
-
-        /** Cleanups connections. */
-        void cleanupConnections();
-        /** Cleanups listener. */
-        void cleanupListener();
-        /** Cleanups all. */
-        void cleanup();
-    /** @} */
+    virtual ~UIConsoleEventHandlerProxy() /* override */;
 
 private slots:
 
-    /** @name Slots for waitable signals.
-      * @{ */
-        /** Returns whether VM window can be shown. */
-        void sltCanShowWindow(bool &fVeto, QString &strReason);
-        /** Shows VM window if possible. */
-        void sltShowWindow(qint64 &winId);
-    /** @} */
+    /** Returns whether VM window can be shown. */
+    void sltCanShowWindow(bool &fVeto, QString &strReason);
+    /** Shows VM window if possible. */
+    void sltShowWindow(qint64 &winId);
 
 private:
+
+    /** Prepares all. */
+    void prepare();
+    /** Prepares listener. */
+    void prepareListener();
+    /** Prepares connections. */
+    void prepareConnections();
+
+    /** Cleanups connections. */
+    void cleanupConnections();
+    /** Cleanups listener. */
+    void cleanupListener();
+    /** Cleanups all. */
+    void cleanup();
 
     /** Holds the UI session reference. */
@@ -144 +136 @@
     , m_pSession(pSession)
 {
-    /* Prepare: */
     prepare();
 }
@@ -150 +141 @@
 UIConsoleEventHandlerProxy::~UIConsoleEventHandlerProxy()
 {
-    /* Cleanup: */
     cleanup();
 }
 
+void UIConsoleEventHandlerProxy::sltCanShowWindow(bool & /* fVeto */, QString & /* strReason */)
+{
+    /* Nothing for now. */
+}
+
+void UIConsoleEventHandlerProxy::sltShowWindow(qint64 &winId)
+{
+#ifdef VBOX_WS_MAC
+    /* First of all, just ask the GUI thread to show the machine-window: */
+    winId = 0;
+    if (::darwinSetFrontMostProcess())
+        emit sigShowWindow();
+    else
+    {
+        /* If it's failed for some reason, send the other process our PSN so it can try: */
+        winId = ::darwinGetCurrentProcessId();
+    }
+#else /* !VBOX_WS_MAC */
+    /* Return the ID of the top-level machine-window. */
+    winId = (ULONG64)m_pSession->mainMachineWindowId();
+#endif /* !VBOX_WS_MAC */
+}
+
 void UIConsoleEventHandlerProxy::prepare()
 {
-    /* Prepare: */
     prepareListener();
     prepareConnections();
@@ -203 +215 @@
         << KVBoxEventType_OnAudioAdapterChanged
         << KVBoxEventType_OnClipboardModeChanged
-        << KVBoxEventType_OnDnDModeChanged;
+        << KVBoxEventType_OnDnDModeChanged
+    ;
 
     /* Register event listener for console event source: */
@@ -311 +324 @@
 void UIConsoleEventHandlerProxy::cleanup()
 {
-    /* Cleanup: */
     cleanupConnections();
     cleanupListener();
-}
-
-void UIConsoleEventHandlerProxy::sltCanShowWindow(bool & /* fVeto */, QString & /* strReason */)
-{
-    /* Nothing for now. */
-}
-
-void UIConsoleEventHandlerProxy::sltShowWindow(qint64 &winId)
-{
-#ifdef VBOX_WS_MAC
-    /* First of all, just ask the GUI thread to show the machine-window: */
-    winId = 0;
-    if (::darwinSetFrontMostProcess())
-        emit sigShowWindow();
-    else
-    {
-        /* If it's failed for some reason, send the other process our PSN so it can try: */
-        winId = ::darwinGetCurrentProcessId();
-    }
-#else /* !VBOX_WS_MAC */
-    /* Return the ID of the top-level machine-window. */
-    winId = (ULONG64)m_pSession->mainMachineWindowId();
-#endif /* !VBOX_WS_MAC */
 }
 
@@ -345 +334 @@
 
 /* static */
-UIConsoleEventHandler *UIConsoleEventHandler::m_spInstance = 0;
+UIConsoleEventHandler *UIConsoleEventHandler::s_pInstance = 0;
 
 /* static */
 void UIConsoleEventHandler::create(UISession *pSession)
 {
-    if (!m_spInstance)
-        m_spInstance = new UIConsoleEventHandler(pSession);
+    if (!s_pInstance)
+        s_pInstance = new UIConsoleEventHandler(pSession);
 }
 
@@ -357 +346 @@
 void UIConsoleEventHandler::destroy()
 {
-    if (m_spInstance)
+    if (s_pInstance)
     {
-        delete m_spInstance;
-        m_spInstance = 0;
+        delete s_pInstance;
+        s_pInstance = 0;
     }
 }
@@ -367 +356 @@
     : m_pProxy(new UIConsoleEventHandlerProxy(this, pSession))
 {
-    /* Prepare: */
     prepare();
 }
@@ -373 +361 @@
 void UIConsoleEventHandler::prepare()
 {
-    /* Prepare: */
     prepareConnections();
 }
@@ -393 +380 @@
             Qt::QueuedConnection);
     connect(m_pProxy, &UIConsoleEventHandlerProxy::sigStateChange,
-        this, &UIConsoleEventHandler::sigStateChange,
+            this, &UIConsoleEventHandler::sigStateChange,
             Qt::QueuedConnection);
     connect(m_pProxy, &UIConsoleEventHandlerProxy::sigAdditionsChange,
@@ -402 +389 @@
             Qt::QueuedConnection);
     connect(m_pProxy, &UIConsoleEventHandlerProxy::sigStorageDeviceChange,
-        this, &UIConsoleEventHandler::sigStorageDeviceChange,
+            this, &UIConsoleEventHandler::sigStorageDeviceChange,
             Qt::QueuedConnection);
     connect(m_pProxy, &UIConsoleEventHandlerProxy::sigMediumChange,

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2020 Oracle Corporation
+ * Copyright (C) 2010-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 /* COM includes: */
 #include "COMEnums.h"
-#include "CVirtualBoxErrorInfo.h"
 #include "CMediumAttachment.h"
 #include "CNetworkAdapter.h"
 #include "CUSBDevice.h"
+#include "CVirtualBoxErrorInfo.h"
 
 /* Forward declarations: */
@@ -96 +96 @@
 
     /** Returns singleton instance created by the factory. */
-    static UIConsoleEventHandler* instance() { return m_spInstance; }
+    static UIConsoleEventHandler *instance() { return s_pInstance; }
     /** Creates singleton instance created by the factory. */
     static void create(UISession *pSession);
@@ -107 +107 @@
     UIConsoleEventHandler(UISession *pSession);
 
-    /** @name Prepare cascade.
-      * @{ */
-        /** Prepares all. */
-        void prepare();
-        /** Prepares connections. */
-        void prepareConnections();
-    /** @} */
+    /** Prepares all. */
+    void prepare();
+    /** Prepares connections. */
+    void prepareConnections();
 
 private:
 
     /** Holds the singleton static console event handler instance. */
-    static UIConsoleEventHandler *m_spInstance;
+    static UIConsoleEventHandler *s_pInstance;
 
     /** Holds the console event proxy instance. */