Index: /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (revision 30870) +++ /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (revision 30871) @@ -153,5 +153,5 @@ switch (aType) { - case VBoxEventType_OnGuestPropertyChange: + case VBoxEventType_OnGuestPropertyChanged: { ComPtr gpcev = aEvent; @@ -286,5 +286,5 @@ switch (aType) { - case VBoxEventType_OnMouseCapabilityChange: + case VBoxEventType_OnMouseCapabilityChanged: { @@ -311,5 +311,5 @@ break; } - case VBoxEventType_OnStateChange: + case VBoxEventType_OnStateChanged: { ComPtr scev = aEvent; @@ -322,5 +322,5 @@ break; } - case VBoxEventType_OnRemoteDisplayInfoChange: + case VBoxEventType_OnRemoteDisplayInfoChanged: { ComPtr rdicev = aEvent; @@ -996,7 +996,7 @@ consoleListener->AddRef(); com::SafeArray eventTypes; - eventTypes.push_back(VBoxEventType_OnMouseCapabilityChange); - eventTypes.push_back(VBoxEventType_OnStateChange); - eventTypes.push_back(VBoxEventType_OnRemoteDisplayInfoChange); + eventTypes.push_back(VBoxEventType_OnMouseCapabilityChanged); + eventTypes.push_back(VBoxEventType_OnStateChanged); + eventTypes.push_back(VBoxEventType_OnRemoteDisplayInfoChanged); eventTypes.push_back(VBoxEventType_OnCanShowWindow); eventTypes.push_back(VBoxEventType_OnShowWindow); @@ -1091,5 +1091,5 @@ vboxListener->AddRef(); com::SafeArray eventTypes; - eventTypes.push_back(VBoxEventType_OnGuestPropertyChange); + eventTypes.push_back(VBoxEventType_OnGuestPropertyChanged); CHECK_ERROR(es, RegisterListener(vboxListener, ComSafeArrayAsInParam(eventTypes), true)); } Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp (revision 30870) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp (revision 30871) @@ -310,5 +310,5 @@ CHECK_ERROR(es, CreateListener(listener.asOutParam())); com::SafeArray eventTypes(1); - eventTypes.push_back(VBoxEventType_OnGuestPropertyChange); + eventTypes.push_back(VBoxEventType_OnGuestPropertyChanged); CHECK_ERROR(es, RegisterListener(listener, ComSafeArrayAsInParam(eventTypes), false)); @@ -336,5 +336,5 @@ switch (aType) { - case VBoxEventType_OnGuestPropertyChange: + case VBoxEventType_OnGuestPropertyChanged: { ComPtr gpcev = ev; Index: /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (revision 30870) +++ /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (revision 30871) @@ -273,5 +273,5 @@ switch (aType) { - case VBoxEventType_OnExtraDataChange: + case VBoxEventType_OnExtraDataChanged: { #ifdef VBOX_SECURELABEL @@ -364,5 +364,5 @@ switch (aType) { - case VBoxEventType_OnMousePointerShapeChange: + case VBoxEventType_OnMousePointerShapeChanged: { ComPtr mpscev = aEvent; @@ -397,5 +397,5 @@ break; } - case VBoxEventType_OnMouseCapabilityChange: + case VBoxEventType_OnMouseCapabilityChanged: { ComPtr mccev = aEvent; @@ -411,5 +411,5 @@ break; } - case VBoxEventType_OnKeyboardLedsChange: + case VBoxEventType_OnKeyboardLedsChanged: { ComPtr klcev = aEvent; @@ -430,5 +430,5 @@ } - case VBoxEventType_OnStateChange: + case VBoxEventType_OnStateChanged: { ComPtr scev = aEvent; @@ -1842,5 +1842,5 @@ vboxListener->AddRef(); com::SafeArray eventTypes; - eventTypes.push_back(VBoxEventType_OnExtraDataChange); + eventTypes.push_back(VBoxEventType_OnExtraDataChanged); CHECK_ERROR(es, RegisterListener(vboxListener, ComSafeArrayAsInParam(eventTypes), true)); } @@ -1853,8 +1853,8 @@ consoleListener->AddRef(); com::SafeArray eventTypes; - eventTypes.push_back(VBoxEventType_OnMousePointerShapeChange); - eventTypes.push_back(VBoxEventType_OnMouseCapabilityChange); - eventTypes.push_back(VBoxEventType_OnKeyboardLedsChange); - eventTypes.push_back(VBoxEventType_OnStateChange); + eventTypes.push_back(VBoxEventType_OnMousePointerShapeChanged); + eventTypes.push_back(VBoxEventType_OnMouseCapabilityChanged); + eventTypes.push_back(VBoxEventType_OnKeyboardLedsChanged); + eventTypes.push_back(VBoxEventType_OnStateChanged); eventTypes.push_back(VBoxEventType_OnRuntimeError); eventTypes.push_back(VBoxEventType_OnCanShowWindow); Index: /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py =================================================================== --- /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (revision 30870) +++ /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (revision 30871) @@ -299,13 +299,13 @@ type = ev.type print "got event: %s %s" %(str(type), asEnumElem(ctx, 'VBoxEventType', type)) - if type == ctx['global'].constants.VBoxEventType_OnMachineStateChange: + if type == ctx['global'].constants.VBoxEventType_OnMachineStateChanged: scev = ctx['global'].queryInterface(ev, 'IMachineStateChangedEvent') if scev: print "machine state event: mach=%s state=%s" %(scev.machineId, scev.state) - elif type == ctx['global'].constants.VBoxEventType_OnGuestPropertyChange: + elif type == ctx['global'].constants.VBoxEventType_OnGuestPropertyChanged: gpcev = ctx['global'].queryInterface(ev, 'IGuestPropertyChangedEvent') if gpcev: print "guest property change: name=%s value=%s" %(gpcev.name, gpcev.value) - elif type == ctx['global'].constants.VBoxEventType_OnMousePointerShapeChange: + elif type == ctx['global'].constants.VBoxEventType_OnMousePointerShapeChanged: psev = ctx['global'].queryInterface(ev, 'IMousePointerShapeChangedEvent') if psev: Index: /trunk/src/VBox/Frontends/VirtualBox/src/UIVirtualBoxEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/UIVirtualBoxEventHandler.cpp (revision 30871) +++ /trunk/src/VBox/Frontends/VirtualBox/src/UIVirtualBoxEventHandler.cpp (revision 30871) @@ -0,0 +1,92 @@ +/* $Id$ */ +/** @file + * + * VBox frontends: Qt GUI ("VirtualBox"): + * UIVirtualBoxEventHandler class implementation + */ + +/* + * Copyright (C) 2010 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +/* Local includes */ +#include "UIVirtualBoxEventHandler.h" +#include "UIMainEventListener.h" +#include "VBoxGlobal.h" + +/* Global includes */ +//#include +//#include + +/* static */ +UIVirtualBoxEventHandler *UIVirtualBoxEventHandler::m_pInstance = 0; + +/* static */ +UIVirtualBoxEventHandler* UIVirtualBoxEventHandler::instance() +{ + if (!m_pInstance) + m_pInstance = new UIVirtualBoxEventHandler(); + return m_pInstance; +} + +/* static */ +void UIVirtualBoxEventHandler::destroy() +{ + if (m_pInstance) + { + delete m_pInstance; + m_pInstance = 0; + } +} + +UIVirtualBoxEventHandler::UIVirtualBoxEventHandler() +{ +// RTPrintf("Self add: %RTthrd\n", RTThreadSelf()); + const CVirtualBox &vbox = vboxGlobal().virtualBox(); + UIMainEventListener *pListener = new UIMainEventListener(this); + m_mainEventListener = CEventListener(pListener); + QVector events; + events + << KVBoxEventType_OnMachineStateChanged + << KVBoxEventType_OnMachineDataChanged + << KVBoxEventType_OnMachineRegistered + << KVBoxEventType_OnSessionStateChanged + << KVBoxEventType_OnSnapshotChanged; + + vbox.GetEventSource().RegisterListener(m_mainEventListener, events, TRUE); + AssertWrapperOk(vbox); + + connect(pListener, SIGNAL(sigMachineStateChanged(QString, KMachineState)), + this, SIGNAL(sigMachineStateChange(QString, KMachineState)), + Qt::QueuedConnection); + + connect(pListener, SIGNAL(sigMachineDataChanged(QString)), + this, SIGNAL(sigMachineDataChange(QString)), + Qt::QueuedConnection); + + connect(pListener, SIGNAL(sigMachineRegistered(QString, bool)), + this, SIGNAL(sigMachineRegistered(QString, bool)), + Qt::QueuedConnection); + + connect(pListener, SIGNAL(sigSessionStateChanged(QString, KSessionState)), + this, SIGNAL(sigSessionStateChange(QString, KSessionState)), + Qt::QueuedConnection); + + connect(pListener, SIGNAL(sigSnapshotChanged(QString, QString)), + this, SIGNAL(sigSnapshotChange(QString, QString)), + Qt::QueuedConnection); +} + +UIVirtualBoxEventHandler::~UIVirtualBoxEventHandler() +{ + const CVirtualBox &vbox = vboxGlobal().virtualBox(); + vbox.GetEventSource().UnregisterListener(m_mainEventListener); +} Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp (revision 30870) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp (revision 30871) @@ -257,5 +257,5 @@ events << KVBoxEventType_OnExtraDataCanChange - << KVBoxEventType_OnExtraDataChange; + << KVBoxEventType_OnExtraDataChanged; vbox.GetEventSource().RegisterListener(m_mainEventListener, events, TRUE); @@ -318,3 +318,2 @@ #include "UIExtraDataEventHandler.moc" - Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp (revision 30870) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp (revision 30871) @@ -64,5 +64,5 @@ * All VirtualBox Events */ - case KVBoxEventType_OnMachineStateChange: + case KVBoxEventType_OnMachineStateChanged: { CMachineStateChangedEvent es(event); @@ -70,5 +70,5 @@ break; } - case KVBoxEventType_OnMachineDataChange: + case KVBoxEventType_OnMachineDataChanged: { CMachineDataChangedEvent es(event); @@ -87,5 +87,5 @@ break; } - case KVBoxEventType_OnExtraDataChange: + case KVBoxEventType_OnExtraDataChanged: { CExtraDataChangedEvent es(event); @@ -102,5 +102,5 @@ break; } - case KVBoxEventType_OnSessionStateChange: + case KVBoxEventType_OnSessionStateChanged: { CSessionStateChangedEvent es(event); @@ -112,5 +112,5 @@ case KVBoxEventType_OnSnapshotDeleted: */ - case KVBoxEventType_OnSnapshotChange: + case KVBoxEventType_OnSnapshotChanged: { CSnapshotChangedEvent es(event); @@ -124,5 +124,5 @@ * All Console Events */ - case KVBoxEventType_OnMousePointerShapeChange: + case KVBoxEventType_OnMousePointerShapeChanged: { CMousePointerShapeChangedEvent es(event); @@ -130,5 +130,5 @@ break; } - case KVBoxEventType_OnMouseCapabilityChange: + case KVBoxEventType_OnMouseCapabilityChanged: { CMouseCapabilityChangedEvent es(event); @@ -136,5 +136,5 @@ break; } - case KVBoxEventType_OnKeyboardLedsChange: + case KVBoxEventType_OnKeyboardLedsChanged: { CKeyboardLedsChangedEvent es(event); @@ -142,5 +142,5 @@ break; } - case KVBoxEventType_OnStateChange: + case KVBoxEventType_OnStateChanged: { CStateChangedEvent es(event); @@ -148,10 +148,10 @@ break; } - case KVBoxEventType_OnAdditionsStateChange: + case KVBoxEventType_OnAdditionsStateChanged: { emit sigAdditionsChange(); break; } - case KVBoxEventType_OnNetworkAdapterChange: + case KVBoxEventType_OnNetworkAdapterChanged: { CNetworkAdapterChangedEvent es(event); @@ -160,9 +160,9 @@ } /* Not used * - case KVBoxEventType_OnSerialPortChange: - case KVBoxEventType_OnParallelPortChange: - case KVBoxEventType_OnStorageControllerChange: - */ - case KVBoxEventType_OnMediumChange: + case KVBoxEventType_OnSerialPortChanged: + case KVBoxEventType_OnParallelPortChanged: + case KVBoxEventType_OnStorageControllerChanged: + */ + case KVBoxEventType_OnMediumChanged: { CMediumChangedEvent es(event); @@ -175,10 +175,10 @@ case KVBoxEventType_OnRemoteDisplayInfoChange: */ - case KVBoxEventType_OnUSBControllerChange: + case KVBoxEventType_OnUSBControllerChanged: { emit sigUSBControllerChange(); break; } - case KVBoxEventType_OnUSBDeviceStateChange: + case KVBoxEventType_OnUSBDeviceStateChanged: { CUSBDeviceStateChangedEvent es(event); @@ -186,5 +186,5 @@ break; } - case KVBoxEventType_OnSharedFolderChange: + case KVBoxEventType_OnSharedFolderChanged: { CSharedFolderChangedEvent es(event); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (revision 30870) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (revision 30871) @@ -63,14 +63,14 @@ QVector events; events - << KVBoxEventType_OnMousePointerShapeChange - << KVBoxEventType_OnMouseCapabilityChange - << KVBoxEventType_OnKeyboardLedsChange - << KVBoxEventType_OnStateChange - << KVBoxEventType_OnAdditionsStateChange - << KVBoxEventType_OnNetworkAdapterChange - << KVBoxEventType_OnMediumChange - << KVBoxEventType_OnUSBControllerChange - << KVBoxEventType_OnUSBDeviceStateChange - << KVBoxEventType_OnSharedFolderChange + << KVBoxEventType_OnMousePointerShapeChanged + << KVBoxEventType_OnMouseCapabilityChanged + << KVBoxEventType_OnKeyboardLedsChanged + << KVBoxEventType_OnStateChanged + << KVBoxEventType_OnAdditionsStateChanged + << KVBoxEventType_OnNetworkAdapterChanged + << KVBoxEventType_OnMediumChanged + << KVBoxEventType_OnUSBControllerChanged + << KVBoxEventType_OnUSBDeviceStateChanged + << KVBoxEventType_OnSharedFolderChanged << KVBoxEventType_OnRuntimeError << KVBoxEventType_OnCanShowWindow Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp (revision 30870) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp (revision 30871) @@ -56,18 +56,18 @@ QVector events; events - << KVBoxEventType_OnMachineStateChange - << KVBoxEventType_OnMachineDataChange + << KVBoxEventType_OnMachineStateChanged + << KVBoxEventType_OnMachineDataChanged << KVBoxEventType_OnMachineRegistered - << KVBoxEventType_OnSessionStateChange - << KVBoxEventType_OnSnapshotChange; + << KVBoxEventType_OnSessionStateChanged + << KVBoxEventType_OnSnapshotChanged; vbox.GetEventSource().RegisterListener(m_mainEventListener, events, TRUE); AssertWrapperOk(vbox); - connect(pListener, SIGNAL(sigMachineStateChange(QString, KMachineState)), + connect(pListener, SIGNAL(sigMachineStateChanged(QString, KMachineState)), this, SIGNAL(sigMachineStateChange(QString, KMachineState)), Qt::QueuedConnection); - connect(pListener, SIGNAL(sigMachineDataChange(QString)), + connect(pListener, SIGNAL(sigMachineDataChanged(QString)), this, SIGNAL(sigMachineDataChange(QString)), Qt::QueuedConnection); @@ -77,9 +77,9 @@ Qt::QueuedConnection); - connect(pListener, SIGNAL(sigSessionStateChange(QString, KSessionState)), + connect(pListener, SIGNAL(sigSessionStateChanged(QString, KSessionState)), this, SIGNAL(sigSessionStateChange(QString, KSessionState)), Qt::QueuedConnection); - connect(pListener, SIGNAL(sigSnapshotChange(QString, QString)), + connect(pListener, SIGNAL(sigSnapshotChanged(QString, QString)), this, SIGNAL(sigSnapshotChange(QString, QString)), Qt::QueuedConnection); @@ -91,3 +91,2 @@ vbox.GetEventSource().UnregisterListener(m_mainEventListener); } - Index: /trunk/src/VBox/Main/ConsoleImpl.cpp =================================================================== --- /trunk/src/VBox/Main/ConsoleImpl.cpp (revision 30870) +++ /trunk/src/VBox/Main/ConsoleImpl.cpp (revision 30871) @@ -258,20 +258,20 @@ typedef enum { - kOnMousePointerShapeChange = 0, - kOnMouseCapabilityChange, - kOnKeyboardLedsChange, - kOnStateChange, - kOnAdditionsStateChange, - kOnNetworkAdapterChange, - kOnSerialPortChange, - kOnParallelPortChange, - kOnStorageControllerChange, - kOnMediumChange, - kOnCPUChange, - kOnVRDPServerChange, - kOnRemoteDisplayInfoChange, - kOnUSBControllerChange, - kOnUSBDeviceStateChange, - kOnSharedFolderChange, + kOnMousePointerShapeChanged = 0, + kOnMouseCapabilityChanged, + kOnKeyboardLedsChanged, + kOnStateChanged, + kOnAdditionsStateChanged, + kOnNetworkAdapterChanged, + kOnSerialPortChanged, + kOnParallelPortChanged, + kOnStorageControllerChanged, + kOnMediumChanged, + kOnCPUChanged, + kOnVRDPServerChanged, + kOnRemoteDisplayInfoChanged, + kOnUSBControllerChanged, + kOnUSBDeviceStateChanged, + kOnSharedFolderChanged, kOnRuntimeError, kOnCanShowWindow, @@ -304,14 +304,14 @@ * Macro for firing appropriate event. * - * @param CallbackMethod The callback method, like OnKeyboardLedsChange. + * @param Event Event, like OnKeyboardLedsChanged. * @param InvokeCb Callbacks invocation code * @param PreprEvent Event preparation code * @param Args Number of callback arguments */ -#define CONSOLE_DO_CALLBACKS_GEN(CallbackMethod, Args, MaybeComma) \ +#define CONSOLE_DO_CALLBACKS_GEN(Event, Args, MaybeComma) \ do \ { \ VBoxEventDesc evDesc; \ - evDesc.init(mEventSource, VBoxEventType_##CallbackMethod MaybeComma Args); \ + evDesc.init(mEventSource, VBoxEventType_##Event MaybeComma Args); \ evDesc.fire(/* don't wait for delivery */ 0); \ } while (0) @@ -2712,5 +2712,5 @@ /* notify console callbacks after the folder is added to the list */ - CONSOLE_DO_CALLBACKS1(OnSharedFolderChange, Scope_Session); + CONSOLE_DO_CALLBACKS1(OnSharedFolderChanged, Scope_Session); return rc; @@ -2769,5 +2769,5 @@ /* notify console callbacks after the folder is removed to the list */ - CONSOLE_DO_CALLBACKS1(OnSharedFolderChange, Scope_Session); + CONSOLE_DO_CALLBACKS1(OnSharedFolderChanged, Scope_Session); return rc; @@ -3442,5 +3442,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - CONSOLE_DO_CALLBACKS1(OnNetworkAdapterChange, aNetworkAdapter); + CONSOLE_DO_CALLBACKS1(OnNetworkAdapterChanged, aNetworkAdapter); LogFlowThisFunc(("Leaving rc=%#x\n", rc)); @@ -3658,5 +3658,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - CONSOLE_DO_CALLBACKS1(OnSerialPortChange, aSerialPort); + CONSOLE_DO_CALLBACKS1(OnSerialPortChanged, aSerialPort); LogFlowThisFunc(("Leaving rc=%#x\n", rc)); @@ -3692,5 +3692,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - CONSOLE_DO_CALLBACKS1(OnParallelPortChange, aParallelPort); + CONSOLE_DO_CALLBACKS1(OnParallelPortChanged, aParallelPort); LogFlowThisFunc(("Leaving rc=%#x\n", rc)); @@ -3726,5 +3726,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - CONSOLE_DO_CALLBACKS0(OnStorageControllerChange); + CONSOLE_DO_CALLBACKS0(OnStorageControllerChanged); LogFlowThisFunc(("Leaving rc=%#x\n", rc)); @@ -3760,5 +3760,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - CONSOLE_DO_CALLBACKS1(OnMediumChange, aMediumAttachment); + CONSOLE_DO_CALLBACKS1(OnMediumChanged, aMediumAttachment); LogFlowThisFunc(("Leaving rc=%#x\n", rc)); @@ -3797,5 +3797,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - CONSOLE_DO_CALLBACKS2(OnCPUChange, aCPU, aRemove); + CONSOLE_DO_CALLBACKS2(OnCPUChanged, aCPU, aRemove); LogFlowThisFunc(("Leaving rc=%#x\n", rc)); @@ -3861,5 +3861,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - CONSOLE_DO_CALLBACKS0(OnVRDPServerChange); + CONSOLE_DO_CALLBACKS0(OnVRDPServerChanged); return rc; @@ -3876,5 +3876,5 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - CONSOLE_DO_CALLBACKS0(OnRemoteDisplayInfoChange); + CONSOLE_DO_CALLBACKS0(OnRemoteDisplayInfoChanged); } @@ -3916,5 +3916,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - CONSOLE_DO_CALLBACKS0(OnUSBControllerChange); + CONSOLE_DO_CALLBACKS0(OnUSBControllerChanged); return rc; @@ -3941,7 +3941,7 @@ { if (aGlobal) - CONSOLE_DO_CALLBACKS1(OnSharedFolderChange, Scope_Global); + CONSOLE_DO_CALLBACKS1(OnSharedFolderChanged, Scope_Global); else - CONSOLE_DO_CALLBACKS1(OnSharedFolderChange, Scope_Machine); + CONSOLE_DO_CALLBACKS1(OnSharedFolderChanged, Scope_Machine); } @@ -4601,7 +4601,7 @@ */ #ifdef RT_OS_WINDOWS - CONSOLE_DO_CALLBACKS7(OnMousePointerShapeChange, fVisible, fAlpha, xHot, yHot, width, height, pShape); + CONSOLE_DO_CALLBACKS7(OnMousePointerShapeChanged, fVisible, fAlpha, xHot, yHot, width, height, pShape); #else - CONSOLE_DO_CALLBACKS8(OnMousePointerShapeChange, fVisible, fAlpha, xHot, yHot, width, height, pShapeSize, pShape); + CONSOLE_DO_CALLBACKS8(OnMousePointerShapeChanged, fVisible, fAlpha, xHot, yHot, width, height, pShapeSize, pShape); #endif @@ -4631,5 +4631,5 @@ mCallbackData.mcc.valid = true; - CONSOLE_DO_CALLBACKS3(OnMouseCapabilityChange, supportsAbsolute, supportsRelative, needsHostCursor); + CONSOLE_DO_CALLBACKS3(OnMouseCapabilityChanged, supportsAbsolute, supportsRelative, needsHostCursor); } @@ -4643,5 +4643,5 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - CONSOLE_DO_CALLBACKS1(OnStateChange, machineState); + CONSOLE_DO_CALLBACKS1(OnStateChanged, machineState); } @@ -4655,5 +4655,5 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - CONSOLE_DO_CALLBACKS0(OnAdditionsStateChange); + CONSOLE_DO_CALLBACKS0(OnAdditionsStateChanged); } @@ -4692,5 +4692,5 @@ mCallbackData.klc.valid = true; - CONSOLE_DO_CALLBACKS3(OnKeyboardLedsChange, fNumLock, fCapsLock, fScrollLock); + CONSOLE_DO_CALLBACKS3(OnKeyboardLedsChanged, fNumLock, fCapsLock, fScrollLock); } @@ -4705,5 +4705,5 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - CONSOLE_DO_CALLBACKS3(OnUSBDeviceStateChange, aDevice, aAttached, aError); + CONSOLE_DO_CALLBACKS3(OnUSBDeviceStateChanged, aDevice, aAttached, aError); } Index: /trunk/src/VBox/Main/ConsoleVRDPServer.cpp =================================================================== --- /trunk/src/VBox/Main/ConsoleVRDPServer.cpp (revision 30870) +++ /trunk/src/VBox/Main/ConsoleVRDPServer.cpp (revision 30871) @@ -89,5 +89,5 @@ switch (aType) { - case VBoxEventType_OnMousePointerShapeChange: + case VBoxEventType_OnMousePointerShapeChanged: { ComPtr mpscev = aEvent; @@ -108,5 +108,5 @@ break; } - case VBoxEventType_OnMouseCapabilityChange: + case VBoxEventType_OnMouseCapabilityChanged: { ComPtr mccev = aEvent; @@ -120,5 +120,5 @@ break; } - case VBoxEventType_OnKeyboardLedsChange: + case VBoxEventType_OnKeyboardLedsChanged: { ComPtr klcev = aEvent; @@ -1161,7 +1161,7 @@ mConsoleListener->AddRef(); com::SafeArray eventTypes; - eventTypes.push_back(VBoxEventType_OnMousePointerShapeChange); - eventTypes.push_back(VBoxEventType_OnMouseCapabilityChange); - eventTypes.push_back(VBoxEventType_OnKeyboardLedsChange); + eventTypes.push_back(VBoxEventType_OnMousePointerShapeChanged); + eventTypes.push_back(VBoxEventType_OnMouseCapabilityChanged); + eventTypes.push_back(VBoxEventType_OnKeyboardLedsChanged); es->RegisterListener(mConsoleListener, ComSafeArrayAsInParam(eventTypes), true); } Index: /trunk/src/VBox/Main/DisplayImpl.cpp =================================================================== --- /trunk/src/VBox/Main/DisplayImpl.cpp (revision 30870) +++ /trunk/src/VBox/Main/DisplayImpl.cpp (revision 30871) @@ -653,5 +653,5 @@ mParent->COMGETTER(EventSource)(es.asOutParam()); com::SafeArray eventTypes; - eventTypes.push_back(VBoxEventType_OnStateChange); + eventTypes.push_back(VBoxEventType_OnStateChanged); es->RegisterListener(this, ComSafeArrayAsInParam(eventTypes), true); } @@ -745,5 +745,5 @@ switch (aType) { - case VBoxEventType_OnStateChange: + case VBoxEventType_OnStateChanged: { ComPtr scev = aEvent; Index: /trunk/src/VBox/Main/EventImpl.cpp =================================================================== --- /trunk/src/VBox/Main/EventImpl.cpp (revision 30870) +++ /trunk/src/VBox/Main/EventImpl.cpp (revision 30871) @@ -682,18 +682,24 @@ return TRUE; case VBoxEventType_MachineEvent: - return (what == VBoxEventType_OnMachineStateChange) - || (what == VBoxEventType_OnMachineDataChange) + return (what == VBoxEventType_OnMachineStateChanged) + || (what == VBoxEventType_OnMachineDataChanged) || (what == VBoxEventType_OnMachineRegistered) - || (what == VBoxEventType_OnSessionStateChange) - || (what == VBoxEventType_OnGuestPropertyChange); + || (what == VBoxEventType_OnSessionStateChanged) + || (what == VBoxEventType_OnGuestPropertyChanged); case VBoxEventType_SnapshotEvent: return (what == VBoxEventType_OnSnapshotTaken) || (what == VBoxEventType_OnSnapshotDeleted) - || (what == VBoxEventType_OnSnapshotChange) + || (what == VBoxEventType_OnSnapshotChanged) + ; + case VBoxEventType_InputEvent: + return (what == VBoxEventType_OnKeyboardLedsChanged) + || (what == VBoxEventType_OnMousePointerShapeChanged) + || (what == VBoxEventType_OnMouseCapabilityChanged) ; case VBoxEventType_Invalid: return FALSE; - } - return who == what; + default: + return who == what; + } } @@ -923,5 +929,5 @@ VBoxEventDesc evDesc; - evDesc.init(this, VBoxEventType_OnEventSourceChange, aListener, TRUE); + evDesc.init(this, VBoxEventType_OnEventSourceChanged, aListener, TRUE); evDesc.fire(0); @@ -958,5 +964,5 @@ { VBoxEventDesc evDesc; - evDesc.init(this, VBoxEventType_OnEventSourceChange, aListener, FALSE); + evDesc.init(this, VBoxEventType_OnEventSourceChanged, aListener, FALSE); evDesc.fire(0); } Index: /trunk/src/VBox/Main/VirtualBoxImpl.cpp =================================================================== --- /trunk/src/VBox/Main/VirtualBoxImpl.cpp (revision 30870) +++ /trunk/src/VBox/Main/VirtualBoxImpl.cpp (revision 30871) @@ -121,15 +121,15 @@ typedef enum { - kOnMachineStateChange = 0, - kOnMachineDataChange, + kOnMachineStateChanged = 0, + kOnMachineDataChanged, kOnExtraDataCanChange, - kOnExtraDataChange, + kOnExtraDataChanged, kOnMediumRegistered, kOnMachineRegistered, - kOnSessionStateChange, + kOnSessionStateChanged, kOnSnapshotTaken, kOnSnapshotDeleted, - kOnSnapshotChange, - kOnGuestPropertyChange + kOnSnapshotChanged, + kOnGuestPropertyChanged } CallbackBit; @@ -2469,9 +2469,9 @@ { MachineEvent(VirtualBox *aVB, const Guid &aId) - : CallbackEvent(aVB, VirtualBoxCallbackRegistration::kOnMachineDataChange), id(aId.toUtf16()) + : CallbackEvent(aVB, VirtualBoxCallbackRegistration::kOnMachineDataChanged), id(aId.toUtf16()) {} MachineEvent(VirtualBox *aVB, const Guid &aId, MachineState_T aState) - : CallbackEvent(aVB, VirtualBoxCallbackRegistration::kOnMachineStateChange), id(aId.toUtf16()) + : CallbackEvent(aVB, VirtualBoxCallbackRegistration::kOnMachineStateChanged), id(aId.toUtf16()) , state(aState) {} @@ -2486,10 +2486,10 @@ switch (mWhat) { - case VirtualBoxCallbackRegistration::kOnMachineDataChange: - aEvDesc.init(aSource, VBoxEventType_OnMachineDataChange, id.raw()); + case VirtualBoxCallbackRegistration::kOnMachineDataChanged: + aEvDesc.init(aSource, VBoxEventType_OnMachineDataChanged, id.raw()); break; - case VirtualBoxCallbackRegistration::kOnMachineStateChange: - aEvDesc.init(aSource, VBoxEventType_OnMachineStateChange, id.raw(), state); + case VirtualBoxCallbackRegistration::kOnMachineStateChanged: + aEvDesc.init(aSource, VBoxEventType_OnMachineStateChanged, id.raw(), state); break; @@ -2574,5 +2574,5 @@ ExtraDataEvent(VirtualBox *aVB, const Guid &aMachineId, IN_BSTR aKey, IN_BSTR aVal) - : CallbackEvent(aVB, VirtualBoxCallbackRegistration::kOnExtraDataChange) + : CallbackEvent(aVB, VirtualBoxCallbackRegistration::kOnExtraDataChanged) , machineId(aMachineId.toUtf16()), key(aKey), val(aVal) {} @@ -2580,5 +2580,5 @@ virtual HRESULT prepareEventDesc(IEventSource* aSource, VBoxEventDesc& aEvDesc) { - return aEvDesc.init(aSource, VBoxEventType_OnExtraDataChange, machineId.raw(), key.raw(), val.raw()); + return aEvDesc.init(aSource, VBoxEventType_OnExtraDataChanged, machineId.raw(), key.raw(), val.raw()); } @@ -2606,5 +2606,5 @@ { SessionEvent(VirtualBox *aVB, const Guid &aMachineId, SessionState_T aState) - : CallbackEvent(aVB, VirtualBoxCallbackRegistration::kOnSessionStateChange) + : CallbackEvent(aVB, VirtualBoxCallbackRegistration::kOnSessionStateChanged) , machineId(aMachineId.toUtf16()), sessionState(aState) {} @@ -2612,5 +2612,5 @@ virtual HRESULT prepareEventDesc(IEventSource* aSource, VBoxEventDesc& aEvDesc) { - return aEvDesc.init(aSource, VBoxEventType_OnSessionStateChange, machineId.raw(), sessionState); + return aEvDesc.init(aSource, VBoxEventType_OnSessionStateChanged, machineId.raw(), sessionState); } Bstr machineId; @@ -2669,5 +2669,5 @@ { postEvent(new SnapshotEvent(this, aMachineId, aSnapshotId, - VirtualBoxCallbackRegistration::kOnSnapshotChange)); + VirtualBoxCallbackRegistration::kOnSnapshotChanged)); } @@ -2677,5 +2677,5 @@ GuestPropertyEvent(VirtualBox *aVBox, const Guid &aMachineId, IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags) - : CallbackEvent(aVBox, VirtualBoxCallbackRegistration::kOnGuestPropertyChange), + : CallbackEvent(aVBox, VirtualBoxCallbackRegistration::kOnGuestPropertyChanged), machineId(aMachineId), name(aName), @@ -2686,5 +2686,5 @@ virtual HRESULT prepareEventDesc(IEventSource* aSource, VBoxEventDesc& aEvDesc) { - return aEvDesc.init(aSource, VBoxEventType_OnGuestPropertyChange, + return aEvDesc.init(aSource, VBoxEventType_OnGuestPropertyChanged, machineId.toUtf16().raw(), name.raw(), value.raw(), flags.raw()); } Index: /trunk/src/VBox/Main/glue/tests/TestVBox.java =================================================================== --- /trunk/src/VBox/Main/glue/tests/TestVBox.java (revision 30870) +++ /trunk/src/VBox/Main/glue/tests/TestVBox.java (revision 30871) @@ -27,5 +27,5 @@ switch (type) { - case OnMachineStateChange: + case OnMachineStateChanged: IMachineStateChangedEvent mcse = IMachineStateChangedEvent.queryInterface(ev); if (mcse == null) Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 30870) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 30871) @@ -13742,5 +13742,5 @@ + uuid="7d695029-32b8-4855-86d3-75de9082923b"> @@ -13789,15 +13789,15 @@ - + IMachineStateChangedEvent - + IMachineDataChangedEvent - + IExtraDataChangedEvent @@ -13819,5 +13819,5 @@ - + ISessionStateChangedEvent @@ -13834,10 +13834,10 @@ - + ISnapshotChangedEvent - + IGuestPropertyChangedEvent @@ -13845,70 +13845,70 @@ - + IMousePointerShapeChangedEvent - + IMouseCapabilityChangedEvent - + IKeyboardLedsChangedEvent - + IStateChangedEvent - + IAdditionsStateChangedEvent - + INetworkAdapterChangedEvent - + ISerialPortChangedEvent - + IParallelPortChangedEvent - + IStorageControllerChangedEvent - + IMediumChangedEvent - + IVRDPServerChangedEvent - + IUSBControllerChangedEvent - + IUSBDeviceStateChangedEvent - + ISharedFolderChangedEvent @@ -13930,15 +13930,15 @@ - + ICPUChangedEvent - + IRemoteDisplayInfoChangedEvent - + IEventSourceChangedEvent @@ -14152,5 +14152,5 @@ name="IMachineStateChangedEvent" extends="IMachineEvent" uuid="5748F794-48DF-438D-85EB-98FFD70D18C9" - wsmap="managed" autogen="VBoxEvent" id="OnMachineStateChange" + wsmap="managed" autogen="VBoxEvent" id="OnMachineStateChanged" > Machine state change event. @@ -14164,5 +14164,5 @@ name="IMachineDataChangedEvent" extends="IMachineEvent" uuid="6AA70A6C-0DCA-4810-8C5C-457B278E3D49" - wsmap="managed" autogen="VBoxEvent" id="OnMachineDataChange" + wsmap="managed" autogen="VBoxEvent" id="OnMachineDataChanged" > @@ -14192,5 +14192,5 @@ name="ISessionStateChangedEvent" extends="IMachineEvent" uuid="714a3eef-799a-4489-86cd-fe8e45b2ff8e" - wsmap="managed" autogen="VBoxEvent" id="OnSessionStateChange" + wsmap="managed" autogen="VBoxEvent" id="OnSessionStateChanged" > @@ -14209,5 +14209,5 @@ name="IGuestPropertyChangedEvent" extends="IMachineEvent" uuid="3f63597a-26f1-4edb-8dd2-6bddd0912368" - wsmap="managed" autogen="VBoxEvent" id="OnGuestPropertyChange" + wsmap="managed" autogen="VBoxEvent" id="OnGuestPropertyChanged" > @@ -14280,5 +14280,5 @@ name="ISnapshotChangedEvent" extends="ISnapshotEvent" uuid="07541941-8079-447a-a33e-47a69c7980db" - wsmap="managed" autogen="VBoxEvent" id="OnSnapshotChange" + wsmap="managed" autogen="VBoxEvent" id="OnSnapshotChanged" > @@ -14291,5 +14291,5 @@ name="IMousePointerShapeChangedEvent" extends="IEvent" uuid="a6dcf6e8-416b-4181-8c4a-45ec95177aef" - wsmap="managed" autogen="VBoxEvent" id="OnMousePointerShapeChange" + wsmap="managed" autogen="VBoxEvent" id="OnMousePointerShapeChanged" > @@ -14364,5 +14364,5 @@ name="IMouseCapabilityChangedEvent" extends="IEvent" uuid="d633ad48-820c-4207-b46c-6bd3596640d5" - wsmap="managed" autogen="VBoxEvent" id="OnMouseCapabilityChange" + wsmap="managed" autogen="VBoxEvent" id="OnMouseCapabilityChanged" > @@ -14390,5 +14390,5 @@ name="IKeyboardLedsChangedEvent" extends="IEvent" uuid="6DDEF35E-4737-457B-99FC-BC52C851A44F" - wsmap="managed" autogen="VBoxEvent" id="OnKeyboardLedsChange" + wsmap="managed" autogen="VBoxEvent" id="OnKeyboardLedsChanged" > @@ -14416,5 +14416,5 @@ name="IStateChangedEvent" extends="IEvent" uuid="4376693C-CF37-453B-9289-3B0F521CAF27" - wsmap="managed" autogen="VBoxEvent" id="OnStateChange" + wsmap="managed" autogen="VBoxEvent" id="OnStateChanged" > @@ -14432,5 +14432,5 @@ name="IAdditionsStateChangedEvent" extends="IEvent" uuid="D70F7915-DA7C-44C8-A7AC-9F173490446A" - wsmap="managed" autogen="VBoxEvent" id="OnAdditionsStateChange" + wsmap="managed" autogen="VBoxEvent" id="OnAdditionsStateChanged" > @@ -14444,5 +14444,5 @@ name="INetworkAdapterChangedEvent" extends="IEvent" uuid="08889892-1EC6-4883-801D-77F56CFD0103" - wsmap="managed" autogen="VBoxEvent" id="OnNetworkAdapterChange" + wsmap="managed" autogen="VBoxEvent" id="OnNetworkAdapterChanged" > @@ -14462,5 +14462,5 @@ name="ISerialPortChangedEvent" extends="IEvent" uuid="3BA329DC-659C-488B-835C-4ECA7AE71C6C" - wsmap="managed" autogen="VBoxEvent" id="OnSerialPortChange" + wsmap="managed" autogen="VBoxEvent" id="OnSerialPortChanged" > @@ -14480,5 +14480,5 @@ name="IParallelPortChangedEvent" extends="IEvent" uuid="813C99FC-9849-4F47-813E-24A75DC85615" - wsmap="managed" autogen="VBoxEvent" id="OnParallelPortChange" + wsmap="managed" autogen="VBoxEvent" id="OnParallelPortChanged" > @@ -14498,5 +14498,5 @@ name="IStorageControllerChangedEvent" extends="IEvent" uuid="715212BF-DA59-426E-8230-3831FAA52C56" - wsmap="managed" autogen="VBoxEvent" id="OnStorageControllerChange" + wsmap="managed" autogen="VBoxEvent" id="OnStorageControllerChanged" > @@ -14510,5 +14510,5 @@ name="IMediumChangedEvent" extends="IEvent" uuid="0FE2DA40-5637-472A-9736-72019EABD7DE" - wsmap="managed" autogen="VBoxEvent" id="OnMediumChange" + wsmap="managed" autogen="VBoxEvent" id="OnMediumChanged" > @@ -14527,5 +14527,5 @@ name="ICPUChangedEvent" extends="IEvent" uuid="D0F0BECC-EE17-4D17-A8CC-383B0EB55E9D" - wsmap="managed" autogen="VBoxEvent" id="OnCPUChange" + wsmap="managed" autogen="VBoxEvent" id="OnCPUChanged" > @@ -14547,5 +14547,5 @@ name="IVRDPServerChangedEvent" extends="IEvent" uuid="726038B6-6279-4A7A-8037-D041693D1915" - wsmap="managed" autogen="VBoxEvent" id="OnVRDPServerChange" + wsmap="managed" autogen="VBoxEvent" id="OnVRDPServerChanged" > @@ -14560,5 +14560,5 @@ name="IRemoteDisplayInfoChangedEvent" extends="IEvent" uuid="65B556C5-2A99-47D8-B311-FC177F0914CD" - wsmap="managed" autogen="VBoxEvent" id="OnRemoteDisplayInfoChange" + wsmap="managed" autogen="VBoxEvent" id="OnRemoteDisplayInfoChanged" > @@ -14572,5 +14572,5 @@ name="IUSBControllerChangedEvent" extends="IEvent" uuid="93BADC0C-61D9-4940-A084-E6BB29AF3D83" - wsmap="managed" autogen="VBoxEvent" id="OnUSBControllerChange" + wsmap="managed" autogen="VBoxEvent" id="OnUSBControllerChanged" > @@ -14585,5 +14585,5 @@ name="IUSBDeviceStateChangedEvent" extends="IEvent" uuid="806da61b-6679-422a-b629-51b06b0c6d93" - wsmap="managed" autogen="VBoxEvent" id="OnUSBDeviceStateChange" + wsmap="managed" autogen="VBoxEvent" id="OnUSBDeviceStateChanged" > @@ -14626,5 +14626,5 @@ name="ISharedFolderChangedEvent" extends="IEvent" uuid="B66349B5-3534-4239-B2DE-8E1535D94C0B" - wsmap="managed" autogen="VBoxEvent" id="OnSharedFolderChange" + wsmap="managed" autogen="VBoxEvent" id="OnSharedFolderChanged" > @@ -14724,5 +14724,5 @@ uuid="e7932cb8-f6d4-4ab6-9cbf-558eb8959a6a" waitable="yes" - wsmap="managed" autogen="VBoxEvent" id="OnEventSourceChange" + wsmap="managed" autogen="VBoxEvent" id="OnEventSourceChanged" > @@ -14746,5 +14746,5 @@ name="IExtraDataChangedEvent" extends="IEvent" uuid="024F00CE-6E0B-492A-A8D0-968472A94DC7" - wsmap="managed" autogen="VBoxEvent" id="OnExtraDataChange" + wsmap="managed" autogen="VBoxEvent" id="OnExtraDataChanged" >