Index: /trunk/src/VBox/Main/include/EventImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/EventImpl.h	(revision 50543)
+++ /trunk/src/VBox/Main/include/EventImpl.h	(revision 50544)
@@ -145,5 +145,5 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(IUnknown *aParent);
+    HRESULT init();
     void uninit();
 
Index: /trunk/src/VBox/Main/src-all/EventImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-all/EventImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-all/EventImpl.cpp	(revision 50544)
@@ -929,5 +929,5 @@
 }
 
-HRESULT EventSource::init(IUnknown *)
+HRESULT EventSource::init()
 {
     HRESULT rc = S_OK;
@@ -1410,5 +1410,5 @@
     ComAssertMsgRet(SUCCEEDED(rc), ("Could not create source (%Rhrc)", rc),
                     E_FAIL);
-    rc = mSource->init((IEventSource *)this);
+    rc = mSource->init();
     ComAssertMsgRet(SUCCEEDED(rc), ("Could not init source (%Rhrc)", rc),
                     E_FAIL);
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 50544)
@@ -490,5 +490,5 @@
     // Event source may be needed by other children
     unconst(mEventSource).createObject();
-    rc = mEventSource->init(static_cast<IConsole*>(this));
+    rc = mEventSource->init();
     AssertComRCReturnRC(rc);
 
Index: /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp	(revision 50544)
@@ -161,5 +161,5 @@
 
         unconst(mEventSource).createObject();
-        HRESULT hr = mEventSource->init(static_cast<IGuestFile*>(this));
+        HRESULT hr = mEventSource->init();
         if (FAILED(hr))
             vrc = VERR_COM_UNEXPECTED;
Index: /trunk/src/VBox/Main/src-client/GuestImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-client/GuestImpl.cpp	(revision 50544)
@@ -112,5 +112,5 @@
     hr = unconst(mEventSource).createObject();
     if (SUCCEEDED(hr))
-        hr = mEventSource->init(static_cast<IGuest*>(this));
+        hr = mEventSource->init();
 #else
     hr = S_OK;
Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 50544)
@@ -189,5 +189,5 @@
         else
         {
-            hr = mEventSource->init(static_cast<IGuestProcess*>(this));
+            hr = mEventSource->init();
             if (FAILED(hr))
                 vrc = VERR_COM_UNEXPECTED;
Index: /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp	(revision 50544)
@@ -212,5 +212,5 @@
         else
         {
-            hr = mEventSource->init(static_cast<IGuestSession*>(this));
+            hr = mEventSource->init();
             if (FAILED(hr))
                 rc = VERR_COM_UNEXPECTED;
Index: /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp	(revision 50544)
@@ -113,5 +113,5 @@
 
     unconst(mEventSource).createObject();
-    HRESULT rc = mEventSource->init(static_cast<IKeyboard*>(this));
+    HRESULT rc = mEventSource->init();
     AssertComRCReturnRC(rc);
 
Index: /trunk/src/VBox/Main/src-client/MouseImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/MouseImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-client/MouseImpl.cpp	(revision 50544)
@@ -113,5 +113,5 @@
 
     unconst(mEventSource).createObject();
-    HRESULT rc = mEventSource->init(static_cast<IMouse*>(this));
+    HRESULT rc = mEventSource->init();
     AssertComRCReturnRC(rc);
     mMouseEvent.init(mEventSource, VBoxEventType_OnGuestMouse,
Index: /trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp	(revision 50544)
@@ -82,5 +82,5 @@
     rc = unconst(mData.m_pEventSource).createObject();
     AssertComRCReturnRC(rc);
-    rc = mData.m_pEventSource->init(static_cast<IVirtualBoxClient *>(this));
+    rc = mData.m_pEventSource->init();
     AssertComRCReturnRC(rc);
 
Index: /trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp	(revision 50544)
@@ -152,5 +152,5 @@
     if (FAILED(hrc)) throw hrc;
 
-    hrc = m->pEventSource->init(static_cast<INATNetwork *>(this));
+    hrc = m->pEventSource->init();
     if (FAILED(hrc)) throw hrc;
 
@@ -207,5 +207,5 @@
     if (FAILED(hrc)) throw hrc;
 
-    hrc = m->pEventSource->init(static_cast<INATNetwork *>(this));
+    hrc = m->pEventSource->init();
     if (FAILED(hrc)) throw hrc;
 
Index: /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 50543)
+++ /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 50544)
@@ -505,5 +505,5 @@
         /* events */
         if (SUCCEEDED(rc = unconst(m->pEventSource).createObject()))
-            rc = m->pEventSource->init(static_cast<IVirtualBox*>(this));
+            rc = m->pEventSource->init();
         if (FAILED(rc)) throw rc;