Changeset 51035 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 10, 2014 12:33:01 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93251

Message:

FE/Qt: 6660: Advanced extra-data management framework: Rename UIExtraDataEventHandler to UIExtraDataManager.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/extradata/UIExtraDataManager.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataEventHandler.cpp ) (8 diffs)
• src/extradata/UIExtraDataManager.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataEventHandler.h ) (4 diffs)
• src/globals/UIShortcutPool.cpp (modified) (2 diffs)
• src/globals/VBoxGlobal.cpp (modified) (3 diffs)
• src/runtime/UIMachineLogic.cpp (modified) (3 diffs)
• src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -278 +278 @@
         src/extensions/QIAdvancedToolBar.h \
         src/extensions/graphics/QIGraphicsWidget.h \
-        src/extradata/UIExtraDataEventHandler.h \
+        src/extradata/UIExtraDataManager.h \
         src/globals/UIActionPool.h \
         src/globals/UIAnimationFramework.h \
@@ -471 +471 @@
         src/extensions/QISplitter.cpp \
         src/extensions/QIAdvancedToolBar.cpp \
-        src/extradata/UIExtraDataEventHandler.cpp \
+        src/extradata/UIExtraDataManager.cpp \
         src/globals/UIActionPool.cpp \
         src/globals/UIThreadPool.cpp \
@@ -544 +544 @@
         src/extensions/QIAdvancedToolBar.cpp \
         src/extensions/graphics/QIGraphicsWidget.cpp \
-        src/extradata/UIExtraDataEventHandler.cpp \
+        src/extradata/UIExtraDataManager.cpp \
         src/globals/UIDefs.cpp \
         src/globals/COMDefs.cpp \

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

@@ -3 +3 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * UIExtraDataEventHandler class implementation
+ * UIExtraDataManager class implementation
  */
 
@@ -22 +22 @@
 
 /* GUI includes: */
-#include "UIExtraDataEventHandler.h"
+#include "UIExtraDataManager.h"
 #include "UIMainEventListener.h"
 #include "VBoxGlobal.h"
@@ -32 +32 @@
 #include "CEventSource.h"
 
-class UIExtraDataEventHandlerPrivate: public QObject
+class UIExtraDataEventHandler: public QObject
 {
     Q_OBJECT;
@@ -38 +38 @@
 public:
 
-    UIExtraDataEventHandlerPrivate(QObject *pParent = 0)
+    UIExtraDataEventHandler(QObject *pParent = 0)
         : QObject(pParent)
     {}
@@ -140 +140 @@
 
 /* static */
-UIExtraDataEventHandler *UIExtraDataEventHandler::m_pInstance = 0;
+UIExtraDataManager *UIExtraDataManager::m_pInstance = 0;
 
 /* static */
-UIExtraDataEventHandler* UIExtraDataEventHandler::instance()
+UIExtraDataManager* UIExtraDataManager::instance()
 {
     if (!m_pInstance)
-        m_pInstance = new UIExtraDataEventHandler();
+        m_pInstance = new UIExtraDataManager();
     return m_pInstance;
 }
 
 /* static */
-void UIExtraDataEventHandler::destroy()
+void UIExtraDataManager::destroy()
 {
     if (m_pInstance)
@@ -160 +160 @@
 }
 
-UIExtraDataEventHandler::UIExtraDataEventHandler()
-  : m_pHandler(new UIExtraDataEventHandlerPrivate(this))
+UIExtraDataManager::UIExtraDataManager()
+  : m_pHandler(new UIExtraDataEventHandler(this))
 {
 //    RTPrintf("Self add: %RTthrd\n", RTThreadSelf());
@@ -216 +216 @@
 }
 
-UIExtraDataEventHandler::~UIExtraDataEventHandler()
+UIExtraDataManager::~UIExtraDataManager()
 {
     const CVirtualBox &vbox = vboxGlobal().virtualBox();
@@ -222 +222 @@
 }
 
-#include "UIExtraDataEventHandler.moc"
+#include "UIExtraDataManager.moc"

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

@@ -1 +1 @@
 /** @file
- *
- * VBox frontends: Qt GUI ("VirtualBox"):
- * UIExtraDataEventHandler class declaration
+ * VBox Qt GUI - UIExtraDataManager class declaration.
  */
 
@@ -17 +15 @@
  */
 
-#ifndef __UIExtraDataEventHandler_h__
-#define __UIExtraDataEventHandler_h__
+#ifndef ___UIExtraDataManager_h___
+#define ___UIExtraDataManager_h___
+
+/* Qt includes: */
+#include <QObject>
 
 /* COM includes: */
@@ -24 +25 @@
 
 /* Forward declarations: */
-class UIExtraDataEventHandlerPrivate;
+class UIExtraDataEventHandler;
 
-class UIExtraDataEventHandler: public QObject
+class UIExtraDataManager: public QObject
 {
     Q_OBJECT;
 
 public:
-    static UIExtraDataEventHandler* instance();
+    static UIExtraDataManager* instance();
     static void destroy();
 
@@ -46 +47 @@
 
 private:
-    UIExtraDataEventHandler();
-    ~UIExtraDataEventHandler();
+    UIExtraDataManager();
+    ~UIExtraDataManager();
 
     /* Private member vars */
-    static UIExtraDataEventHandler *m_pInstance;
+    static UIExtraDataManager *m_pInstance;
     CEventListener m_mainEventListener;
-    UIExtraDataEventHandlerPrivate *m_pHandler;
+    UIExtraDataEventHandler *m_pHandler;
 };
 
-#define gEDataEvents UIExtraDataEventHandler::instance()
+#define gEDataManager UIExtraDataManager::instance()
 
-#endif /* !__UIExtraDataEventHandler_h__ */
-
+#endif /* !___UIExtraDataManager_h___ */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp

@@ -21 +21 @@
 #include "UIShortcutPool.h"
 #include "UIActionPool.h"
-#include "UIExtraDataEventHandler.h"
+#include "UIExtraDataManager.h"
 
 void UIShortcut::setDescription(const QString &strDescription)
@@ -223 +223 @@
 {
     /* Connect to extra-data signals: */
-    connect(gEDataEvents, SIGNAL(sigSelectorShortcutsChanged()), this, SLOT(sltReloadSelectorShortcuts()));
-    connect(gEDataEvents, SIGNAL(sigMachineShortcutsChanged()), this, SLOT(sltReloadMachineShortcuts()));
+    connect(gEDataManager, SIGNAL(sigSelectorShortcutsChanged()), this, SLOT(sltReloadSelectorShortcuts()));
+    connect(gEDataManager, SIGNAL(sigMachineShortcutsChanged()), this, SLOT(sltReloadMachineShortcuts()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -66 +66 @@
 #include "UIActionPoolSelector.h"
 #include "UIActionPoolRuntime.h"
-#include "UIExtraDataEventHandler.h"
+#include "UIExtraDataManager.h"
 #include "QIFileDialog.h"
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -4413 +4413 @@
     retranslateUi();
 
-    connect(gEDataEvents, SIGNAL(sigGUILanguageChange(QString)),
+    connect(gEDataManager, SIGNAL(sigGUILanguageChange(QString)),
             this, SLOT(sltGUILanguageChange(QString)));
 
@@ -4786 +4786 @@
 
     /* Destroy our event handlers */
-    UIExtraDataEventHandler::destroy();
+    UIExtraDataManager::destroy();
 
     /* Destroy the GUI root windows _BEFORE_ the media-mess, because there is

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

@@ -56 +56 @@
 #include "UIModalWindowManager.h"
 #include "UIMedium.h"
-#include "UIExtraDataEventHandler.h"
+#include "UIExtraDataManager.h"
 #ifdef Q_WS_MAC
 # include "DockIconPreview.h"
-# include "UIExtraDataEventHandler.h"
+# include "UIExtraDataManager.h"
 #endif /* Q_WS_MAC */
 
@@ -657 +657 @@
     /* Subscribe to GUI_HidLedsSync extradata changes in order to
      * be able to enable or disable feature dynamically. */
-    connect(gEDataEvents, SIGNAL(sigHidLedsSyncStateChanged(bool)), this, SLOT(sltHidLedsSyncStateChanged(bool)));
+    connect(gEDataManager, SIGNAL(sigHidLedsSyncStateChanged(bool)), this, SLOT(sltHidLedsSyncStateChanged(bool)));
 #else
     m_isHidLedsSyncEnabled = false;
@@ -1006 +1006 @@
     connect(pDockPreviewModeGroup, SIGNAL(triggered(QAction*)),
             this, SLOT(sltDockPreviewModeChanged(QAction*)));
-    connect(gEDataEvents, SIGNAL(sigDockIconAppearanceChange(bool)),
+    connect(gEDataManager, SIGNAL(sigDockIconAppearanceChange(bool)),
             this, SLOT(sltChangeDockIconUpdate(bool)));
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -28 +28 @@
 #include "UIMultiScreenLayout.h"
 #ifdef Q_WS_MAC
-# include "UIExtraDataEventHandler.h"
+# include "UIExtraDataManager.h"
 # include "VBoxUtils.h"
 # include "UIFrameBuffer.h"
@@ -386 +386 @@
      * is updated at runtime for Lion and previous: */
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
-        connect(gEDataEvents, SIGNAL(sigPresentationModeChange(bool)),
+        connect(gEDataManager, SIGNAL(sigPresentationModeChange(bool)),
                 this, SLOT(sltChangePresentationMode(bool)));
 }