Changeset 51047 in vbox

Timestamp:

Apr 11, 2014 11:21:25 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Prepare/cleanup routines encapsulation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extradata

Files:

• UIExtraDataManager.cpp (modified) (6 diffs)
• UIExtraDataManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -49 +49 @@
     /** Notifies about HID LED sync state change. */
     void sigHIDLedsSyncStateChange(bool fEnabled);
+
 #ifdef RT_OS_DARWIN
     /** Mac OS X: Notifies about 'presentation mode' status change. */
@@ -172 +173 @@
 UIExtraDataManager* UIExtraDataManager::instance()
 {
-    /* Create instance if not yet exists: */
+    /* Create/prepare instance if not yet exists: */
     if (!m_pInstance)
-        m_pInstance = new UIExtraDataManager();
+    {
+        new UIExtraDataManager;
+        m_pInstance->prepare();
+    }
     /* Return instance: */
     return m_pInstance;
@@ -182 +186 @@
 void UIExtraDataManager::destroy()
 {
-    /* Destroy instance if still exists: */
+    /* Destroy/cleanup instance if still exists: */
     if (m_pInstance)
     {
+        m_pInstance->cleanup();
         delete m_pInstance;
-        m_pInstance = 0;
     }
 }
@@ -192 +196 @@
 UIExtraDataManager::UIExtraDataManager()
     : m_pHandler(new UIExtraDataEventHandler(this))
+{
+    /* Connect to static instance: */
+    m_pInstance = this;
+}
+
+UIExtraDataManager::~UIExtraDataManager()
+{
+    /* Disconnect from static instance: */
+    m_pInstance = 0;
+}
+
+void UIExtraDataManager::prepare()
+{
+    /* Prepare Main event-listener: */
+    prepareMainEventListener();
+    /* Prepare extra-data event-handler: */
+    prepareExtraDataEventHandler();
+}
+
+void UIExtraDataManager::prepareMainEventListener()
 {
     /* Register Main event-listener:  */
@@ -214 +238 @@
             m_pHandler, SLOT(sltExtraDataChange(QString, QString, QString)),
             Qt::DirectConnection);
-
+}
+
+void UIExtraDataManager::prepareExtraDataEventHandler()
+{
     /* Language change signal: */
     connect(m_pHandler, SIGNAL(sigLanguageChange(QString)),
@@ -246 +273 @@
 }
 
-UIExtraDataManager::~UIExtraDataManager()
+void UIExtraDataManager::cleanup()
+{
+    /* Cleanup Main event-listener: */
+    cleanupMainEventListener();
+}
+
+void UIExtraDataManager::cleanupMainEventListener()
 {
     /* Unregister Main event-listener:  */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -68 +68 @@
     ~UIExtraDataManager();
 
+    /** Prepare Extra-data Manager. */
+    void prepare();
+    /** Prepare Main event-listener. */
+    void prepareMainEventListener();
+    /** Prepare extra-data event-handler. */
+    void prepareExtraDataEventHandler();
+
+    /** Cleanup Extra-data Manager. */
+    void cleanup();
+    /** Cleanup Main event-listener. */
+    void cleanupMainEventListener();
+    // /** Cleanup extra-data event-handler. */
+    // void cleanupExtraDataEventHandler() {}
+
     /** Singleton Extra-data Manager instance. */
     static UIExtraDataManager *m_pInstance;