Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 86541) @@ -109,5 +109,4 @@ template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); -template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); @@ -232,5 +231,4 @@ template<> SHARED_LIBRARY_STUFF int toInternalInteger(const PreviewUpdateIntervalType &previewUpdateIntervalType); template<> SHARED_LIBRARY_STUFF PreviewUpdateIntervalType fromInternalInteger(const int &iPreviewUpdateIntervalType); -template<> SHARED_LIBRARY_STUFF EventHandlingType fromInternalString(const QString &strEventHandlingType); template<> SHARED_LIBRARY_STUFF QString toInternalString(const GUIFeatureType &guiFeatureType); template<> SHARED_LIBRARY_STUFF GUIFeatureType fromInternalString(const QString &strGuiFeatureType); Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 86541) @@ -63,5 +63,4 @@ template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } -template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } @@ -1813,19 +1812,4 @@ } -/* EventHandlingType <= QString: */ -template<> EventHandlingType fromInternalString(const QString &strEventHandlingType) -{ - /* Here we have some fancy stuff allowing us - * to search through the keys using 'case-insensitive' rule: */ - QStringList keys; QList values; - keys << "Active"; values << EventHandlingType_Active; - keys << "Passive"; values << EventHandlingType_Passive; - /* Passive type for unknown words: */ - if (!keys.contains(strEventHandlingType, Qt::CaseInsensitive)) - return EventHandlingType_Passive; - /* Corresponding type for known words: */ - return values.at(keys.indexOf(QRegExp(strEventHandlingType, Qt::CaseInsensitive))); -} - /* QString <= GUIFeatureType: */ template<> QString toInternalString(const GUIFeatureType &guiFeatureType) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 86541) @@ -21,5 +21,4 @@ /* General: */ -const char *UIExtraDataDefs::GUI_EventHandlingType = "GUI/EventHandlingType"; const char *UIExtraDataDefs::GUI_RestrictedDialogs = "GUI/RestrictedDialogs"; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 86541) @@ -44,7 +44,4 @@ /** @name General * @{ */ - /** Holds event handling type. */ - SHARED_LIBRARY_STUFF extern const char *GUI_EventHandlingType; - /** Holds restricted dialogs. */ SHARED_LIBRARY_STUFF extern const char *GUI_RestrictedDialogs; @@ -794,12 +791,4 @@ -/** Common UI: Event handling types. */ -enum EventHandlingType -{ - EventHandlingType_Active, - EventHandlingType_Passive -}; - - /** Common UI: GUI feature types. */ enum GUIFeatureType Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 86541) @@ -177,14 +177,9 @@ /* Register event listener for VirtualBox event source: */ - comEventSourceVBox.RegisterListener(m_comEventListener, eventTypes, - gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE); + comEventSourceVBox.RegisterListener(m_comEventListener, eventTypes, FALSE /* active? */); AssertWrapperOk(comEventSourceVBox); - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Register event sources in their listeners as well: */ - m_pQtListener->getWrapped()->registerSource(comEventSourceVBox, m_comEventListener); - } + /* Register event sources in their listeners as well: */ + m_pQtListener->getWrapped()->registerSource(comEventSourceVBox, m_comEventListener); } @@ -207,10 +202,6 @@ void UIExtraDataEventHandler::cleanupListener() { - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Unregister everything: */ - m_pQtListener->getWrapped()->unregisterSources(); - } + /* Unregister everything: */ + m_pQtListener->getWrapped()->unregisterSources(); /* Make sure VBoxSVC is available: */ @@ -1903,5 +1894,4 @@ return QStringList() << QString() - << GUI_EventHandlingType << GUI_RestrictedDialogs << GUI_SuppressMessages << GUI_InvertMessageOption @@ -2272,9 +2262,4 @@ } -EventHandlingType UIExtraDataManager::eventHandlingType() -{ - return gpConverter->fromInternalString(extraDataString(GUI_EventHandlingType)); -} - UIExtraDataMetaDefs::DialogType UIExtraDataManager::restrictedDialogTypes(const QUuid &uID) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 86541) @@ -158,7 +158,4 @@ /** @name General * @{ */ - /** Returns event handling type. */ - EventHandlingType eventHandlingType(); - /** Returns a list of restricted dialogs. */ UIExtraDataMetaDefs::DialogType restrictedDialogTypes(const QUuid &uID); Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressEventHandler.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressEventHandler.cpp (revision 86541) @@ -64,16 +64,11 @@ /* Register event listener for CProgress event source: */ - comEventSourceProgress.RegisterListener(m_comEventListener, eventTypes, - gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE); + comEventSourceProgress.RegisterListener(m_comEventListener, eventTypes, FALSE /* active? */); AssertWrapperOk(comEventSourceProgress); - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Register event sources in their listeners as well: */ - m_pQtListener->getWrapped()->registerSource(comEventSourceProgress, - m_comEventListener, - QSet() << KVBoxEventType_OnProgressTaskCompleted); - } + /* Register event sources in their listeners as well: */ + m_pQtListener->getWrapped()->registerSource(comEventSourceProgress, + m_comEventListener, + QSet() << KVBoxEventType_OnProgressTaskCompleted); } @@ -99,10 +94,6 @@ void UIProgressEventHandler::cleanupListener() { - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Unregister everything: */ - m_pQtListener->getWrapped()->unregisterSources(); - } + /* Unregister everything: */ + m_pQtListener->getWrapped()->unregisterSources(); /* Make sure VBoxSVC is available: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxClientEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxClientEventHandler.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxClientEventHandler.cpp (revision 86541) @@ -120,14 +120,9 @@ /* Register event listener for event source aggregator: */ - m_comEventSource.RegisterListener(m_comEventListener, eventTypes, - gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE); + m_comEventSource.RegisterListener(m_comEventListener, eventTypes, FALSE /* active? */); AssertWrapperOk(m_comEventSource); - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Register event sources in their listeners as well: */ - m_pQtListener->getWrapped()->registerSource(m_comEventSource, m_comEventListener); - } + /* Register event sources in their listeners as well: */ + m_pQtListener->getWrapped()->registerSource(m_comEventSource, m_comEventListener); } @@ -148,10 +143,6 @@ void UIVirtualBoxClientEventHandlerProxy::cleanupListener() { - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Unregister everything: */ - m_pQtListener->getWrapped()->unregisterSources(); - } + /* Unregister everything: */ + m_pQtListener->getWrapped()->unregisterSources(); /* Unregister event listener for event source aggregator: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp (revision 86541) @@ -171,14 +171,9 @@ /* Register event listener for event source aggregator: */ - m_comEventSource.RegisterListener(m_comEventListener, eventTypes, - gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE); + m_comEventSource.RegisterListener(m_comEventListener, eventTypes, FALSE /* active? */); AssertWrapperOk(m_comEventSource); - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Register event sources in their listeners as well: */ - m_pQtListener->getWrapped()->registerSource(m_comEventSource, m_comEventListener); - } + /* Register event sources in their listeners as well: */ + m_pQtListener->getWrapped()->registerSource(m_comEventSource, m_comEventListener); } @@ -241,10 +236,6 @@ void UIVirtualBoxEventHandlerProxy::cleanupListener() { - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Unregister everything: */ - m_pQtListener->getWrapped()->unregisterSources(); - } + /* Unregister everything: */ + m_pQtListener->getWrapped()->unregisterSources(); /* Unregister event listener for event source aggregator: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp (revision 86541) @@ -639,13 +639,8 @@ /* Register event listener for CProgress event source: */ - comEventSource.RegisterListener(comEventListener, eventTypes, - gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE); - - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Register event sources in their listeners as well: */ - QtListener->getWrapped()->registerSource(comEventSource, comEventListener); - } + comEventSource.RegisterListener(comEventListener, eventTypes, FALSE /* active? */); + + /* Register event sources in their listeners as well: */ + QtListener->getWrapped()->registerSource(comEventSource, comEventListener); } @@ -656,10 +651,6 @@ if (!comEventSource.isOk()) return; - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Unregister everything: */ - QtListener->getWrapped()->unregisterSources(); - } + /* Unregister everything: */ + QtListener->getWrapped()->unregisterSources(); /* Make sure VBoxSVC is available: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlTreeItem.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlTreeItem.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlTreeItem.cpp (revision 86541) @@ -67,13 +67,8 @@ /* Register event listener for CProgress event source: */ - comEventSource.RegisterListener(m_comEventListener, eventTypes, - gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE); - - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Register event sources in their listeners as well: */ - m_pQtListener->getWrapped()->registerSource(comEventSource, m_comEventListener); - } + comEventSource.RegisterListener(m_comEventListener, eventTypes, FALSE /* active? */); + + /* Register event sources in their listeners as well: */ + m_pQtListener->getWrapped()->registerSource(comEventSource, m_comEventListener); } @@ -82,10 +77,6 @@ if (!comEventSource.isOk()) return; - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Unregister everything: */ - m_pQtListener->getWrapped()->unregisterSources(); - } + /* Unregister everything: */ + m_pQtListener->getWrapped()->unregisterSources(); /* Make sure VBoxSVC is available: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp (revision 86541) @@ -466,14 +466,9 @@ /* Register event listener for CProgress event source: */ - comEventSource.RegisterListener(m_comEventListener, eventTypes, - gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE); + comEventSource.RegisterListener(m_comEventListener, eventTypes, FALSE /* active? */); AssertWrapperOk(comEventSource); - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Register event sources in their listeners as well: */ - m_pQtListener->getWrapped()->registerSource(comEventSource, m_comEventListener); - } + /* Register event sources in their listeners as well: */ + m_pQtListener->getWrapped()->registerSource(comEventSource, m_comEventListener); } @@ -521,10 +516,6 @@ void UIGuestProcessControlWidget::cleanupListener() { - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Unregister everything: */ - m_pQtListener->getWrapped()->unregisterSources(); - } + /* Unregister everything: */ + m_pQtListener->getWrapped()->unregisterSources(); /* Make sure VBoxSVC is available: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (revision 86540) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (revision 86541) @@ -206,14 +206,9 @@ /* Register event listener for console event source: */ - comEventSourceConsole.RegisterListener(m_comEventListener, eventTypes, - gEDataManager->eventHandlingType() == EventHandlingType_Active ? TRUE : FALSE); + comEventSourceConsole.RegisterListener(m_comEventListener, eventTypes, FALSE /* active? */); AssertWrapperOk(comEventSourceConsole); - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Register event sources in their listeners as well: */ - m_pQtListener->getWrapped()->registerSource(comEventSourceConsole, m_comEventListener); - } + /* Register event sources in their listeners as well: */ + m_pQtListener->getWrapped()->registerSource(comEventSourceConsole, m_comEventListener); } @@ -299,10 +294,6 @@ AssertPtrReturnVoid(m_pSession); - /* If event listener registered as passive one: */ - if (gEDataManager->eventHandlingType() == EventHandlingType_Passive) - { - /* Unregister everything: */ - m_pQtListener->getWrapped()->unregisterSources(); - } + /* Unregister everything: */ + m_pQtListener->getWrapped()->unregisterSources(); /* Get console: */