Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp	(revision 71570)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp	(revision 71571)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21,8 +21,8 @@
 
 /* GUI includes: */
+# include "VBoxGlobal.h"
+# include "UIExtraDataManager.h"
+# include "UIMainEventListener.h"
 # include "UIVirtualBoxEventHandler.h"
-# include "UIMainEventListener.h"
-# include "UIExtraDataManager.h"
-# include "VBoxGlobal.h"
 
 /* COM includes: */
@@ -243,12 +243,12 @@
 
 /* static */
-UIVirtualBoxEventHandler *UIVirtualBoxEventHandler::m_spInstance = 0;
+UIVirtualBoxEventHandler *UIVirtualBoxEventHandler::s_pInstance = 0;
 
 /* static */
-UIVirtualBoxEventHandler* UIVirtualBoxEventHandler::instance()
-{
-    if (!m_spInstance)
-        m_spInstance = new UIVirtualBoxEventHandler;
-    return m_spInstance;
+UIVirtualBoxEventHandler *UIVirtualBoxEventHandler::instance()
+{
+    if (!s_pInstance)
+        s_pInstance = new UIVirtualBoxEventHandler;
+    return s_pInstance;
 }
 
@@ -256,8 +256,8 @@
 void UIVirtualBoxEventHandler::destroy()
 {
-    if (m_spInstance)
+    if (s_pInstance)
     {
-        delete m_spInstance;
-        m_spInstance = 0;
+        delete s_pInstance;
+        s_pInstance = 0;
     }
 }
@@ -272,5 +272,5 @@
 void UIVirtualBoxEventHandler::prepare()
 {
-    /* Prepare: */
+    /* Prepare connections: */
     prepareConnections();
 }
@@ -308,4 +308,5 @@
 }
 
+
 #include "UIVirtualBoxEventHandler.moc"
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h	(revision 71570)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h	(revision 71571)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27,5 +27,4 @@
 /* Forward declarations: */
 class UIVirtualBoxEventHandlerProxy;
-
 
 /** Singleton QObject extension
@@ -59,7 +58,7 @@
 public:
 
-    /** Returns singleton instance created by the factory. */
-    static UIVirtualBoxEventHandler* instance();
-    /** Destroys singleton instance created by the factory. */
+    /** Returns singleton instance. */
+    static UIVirtualBoxEventHandler *instance();
+    /** Destroys singleton instance. */
     static void destroy();
 
@@ -69,16 +68,13 @@
     UIVirtualBoxEventHandler();
 
-    /** @name Prepare cascade.
-      * @{ */
-        /** Prepares all. */
-        void prepare();
-        /** Prepares connections. */
-        void prepareConnections();
-    /** @} */
+    /** Prepares all. */
+    void prepare();
+    /** Prepares connections. */
+    void prepareConnections();
 
 private:
 
-    /** Holds the singleton static VirtualBox event handler instance. */
-    static UIVirtualBoxEventHandler *m_spInstance;
+    /** Holds the singleton instance. */
+    static UIVirtualBoxEventHandler *s_pInstance;
 
     /** Holds the VirtualBox event proxy instance. */
@@ -86,5 +82,5 @@
 };
 
-/** Defines the globally known name for the VirtualBox event handler instance. */
+/** Singleton VirtualBox Event Handler 'official' name. */
 #define gVBoxEvents UIVirtualBoxEventHandler::instance()