Changeset 51056 in vbox

Timestamp:

Apr 11, 2014 5:09:24 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Small cleanup.

Location:

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

Files:

• UIExtraDataManager.cpp (modified) (3 diffs)
• UIExtraDataManager.h (modified) (2 diffs)

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

@@ -197 +197 @@
 }
 
+UIExtraDataManager::UIExtraDataManager()
+    : m_pHandler(new UIExtraDataEventHandler(this))
+{
+    /* Connect to static instance: */
+    m_pInstance = this;
+}
+
+UIExtraDataManager::~UIExtraDataManager()
+{
+    /* Disconnect from static instance: */
+    m_pInstance = 0;
+}
+
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 bool UIExtraDataManager::shouldWeAllowApplicationUpdate() const
@@ -434 +447 @@
 {
     return gpConverter->fromInternalString<GuruMeditationHandlerType>(extraDataString(GUI_GuruMeditationHandler, strID));
-}
-
-UIExtraDataManager::UIExtraDataManager()
-    : m_pHandler(new UIExtraDataEventHandler(this))
-{
-    /* Connect to static instance: */
-    m_pInstance = this;
-}
-
-UIExtraDataManager::~UIExtraDataManager()
-{
-    /* Disconnect from static instance: */
-    m_pInstance = 0;
 }
 
@@ -522 +522 @@
     CVirtualBox vbox = vboxGlobal().virtualBox();
 
+    /* Make sure at least empty map is created: */
+    m_data[QString()] = ExtraDataMap();
+
     /* Load global extra-data map: */
     foreach (const QString &strKey, vbox.GetExtraDataKeys())

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

@@ -40 +40 @@
 {
     Q_OBJECT;
+
+    /** Extra-data Manager constructor. */
+    UIExtraDataManager();
+    /** Extra-data Manager destructor. */
+    ~UIExtraDataManager();
 
 signals:
@@ -131 +136 @@
 private:
 
-    /** Extra-data Manager constructor. */
-    UIExtraDataManager();
-    /** Extra-data Manager destructor. */
-    ~UIExtraDataManager();
-
     /** Prepare Extra-data Manager. */
     void prepare();