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

Timestamp:

Jan 26, 2011 4:37:16 PM (14 years ago)

Author:

vboxsync

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

69665

Message:

Main: reworked listener objects creation, fixes Win problems with events, few cleanups

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIExtraDataEventHandler.cpp (modified) (1 diff)
• globals/UIMainEventListener.cpp (modified) (3 diffs)
• globals/UIMainEventListener.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UIConsoleEventHandler.cpp (modified) (1 diff)
• selector/UIVirtualBoxEventHandler.cpp (modified) (1 diff)

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

@@ -252 +252 @@
 //    RTPrintf("Self add: %RTthrd\n", RTThreadSelf());
     const CVirtualBox &vbox = vboxGlobal().virtualBox();
-    UIMainEventListenerImpl *pListener = new UIMainEventListenerImpl(this);
+    ComObjPtr<UIMainEventListenerImpl> pListener;
+    pListener.createObject();
+    pListener->init(new UIMainEventListener(), this);
     m_mainEventListener = CEventListener(pListener);
     QVector<KVBoxEventType> events;

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

@@ -25 +25 @@
 //#include <iprt/stream.h>
 
-UIMainEventListener::UIMainEventListener(QObject * /* pParent */)
-//  : QObject(pParent) /* Todo: Not sure if pParent should delete this. Especially on Win there is ref counting implemented. */
+UIMainEventListener::UIMainEventListener()
   : QObject()
 {
@@ -42 +41 @@
 }
 
+HRESULT UIMainEventListener::init(QObject * /* pParent */)
+{
+    return S_OK;
+}
+
+void    UIMainEventListener::uninit()
+{
+}
 
 /**
@@ -50 +57 @@
 {
     CEvent event(pEvent);
-//    RTPrintf("Event received: %d (%RTthrd)\n", event.GetType(), RTThreadSelf());
+    // printf("Event received: %d\n", event.GetType());
     switch(event.GetType())
     {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h

@@ -43 +43 @@
 
 public:
-    UIMainEventListener(QObject *pParent);
+    UIMainEventListener();
+
+
+    HRESULT init(QObject *pParent);
+    void    uninit();
 
     STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent *pEvent);

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

@@ -5249 +5249 @@
     QApplication::removePostedEvents (this);
 
-#ifdef Q_WS_WIN
-    /* COM for the main thread is shutdown in main() */
-#else
     COMBase::CleanupCOM();
-#endif
 
     mValid = false;

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

@@ -59 +59 @@
 
 //    RTPrintf("Self add: %RTthrd\n", RTThreadSelf());
-    UIMainEventListenerImpl *pListener = new UIMainEventListenerImpl(this);
+    ComObjPtr<UIMainEventListenerImpl> pListener;
+    pListener.createObject();
+    pListener->init(new UIMainEventListener(), this);
     m_mainEventListener = CEventListener(pListener);
     QVector<KVBoxEventType> events;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp

@@ -52 +52 @@
 //    RTPrintf("Self add: %RTthrd\n", RTThreadSelf());
     const CVirtualBox &vbox = vboxGlobal().virtualBox();
-    UIMainEventListenerImpl *pListener = new UIMainEventListenerImpl(this);
+    ComObjPtr<UIMainEventListenerImpl> pListener;
+    pListener.createObject();
+    pListener->init(new UIMainEventListener(), this);
     m_mainEventListener = CEventListener(pListener);
     QVector<KVBoxEventType> events;