Fixed Qt application cleanup.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>

1 files changed, 21 insertions, 11 deletions

diff --git a/PySide/QtGui/glue/qapplication_init.cpp b/PySide/QtGui/glue/qapplication_init.cpp
index da9e2dc76..afbd3046f 100644
--- a/PySide/QtGui/glue/qapplication_init.cpp
+++ b/PySide/QtGui/glue/qapplication_init.cpp
@@ -3,18 +3,25 @@ extern PyObject* moduleQtGui;
 
 static int QApplicationArgCount;
 static char** QApplicationArgValues;
+static const char QAPP_MACRO[] = "qApp";
 
 void DeleteQApplicationAtExit() {
-    if (QApplication::instance()) {
-        BindingManager::instance().invalidateWrapper(QApplication::instance());
-        QApplication::instance()->deleteLater();
-        for (int i = 0; i < QApplicationArgCount; ++i)
-            delete[] QApplicationArgValues[i];
+    PySide::SignalManager::instance().clear();
+    QCoreApplication* cpp = QApplication::instance();
+    if (cpp) {
+        Shiboken::BindingManager &bmngr = Shiboken::BindingManager::instance();
+        PyObject* pySelf = bmngr.retrieveWrapper(cpp);
+        if (pySelf)
+            bmngr.invalidateWrapper(pySelf);
+        cpp->deleteLater();
     }
 }
 
 int SbkQApplication_Init(PyObject* self, PyObject* args, PyObject*)
 {
+    if (Shiboken::isUserType(self) && !Shiboken::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication >()))
+        return -1;
+
     if (QApplication::instance()) {
         PyErr_SetString(PyExc_RuntimeError, "A QApplication instance already exists.");
         return -1;
@@ -31,25 +38,28 @@ int SbkQApplication_Init(PyObject* self, PyObject* args, PyObject*)
         return -1;
     }
 
-    void* cptr = new QApplication(QApplicationArgCount, QApplicationArgValues);
+    QApplicationWrapper* cptr = new QApplicationWrapper(QApplicationArgCount, QApplicationArgValues);
     Shiboken::setCppPointer(reinterpret_cast<SbkBaseWrapper*>(self),
                             Shiboken::SbkType<QApplication>(),
                             cptr);
     SbkBaseWrapper_setValidCppObject(self, 1);
-    Shiboken::BindingManager::instance().registerWrapper(reinterpret_cast<SbkBaseWrapper*>(self), cptr);
+    SbkBaseWrapper *sbkSelf = reinterpret_cast<SbkBaseWrapper*>(self);
+    sbkSelf->containsCppWrapper = 1;
+    sbkSelf->hasOwnership = 0;
+    Shiboken::BindingManager::instance().registerWrapper(sbkSelf, cptr);
+    PySide::signalUpdateSource(self);
+    cptr->metaObject();
 
     // Verify if qApp is in main module
-    const char QAPP_MACRO[] = "qApp";
     PyObject* globalsDict = PyEval_GetGlobals();
     if (globalsDict) {
         PyObject* qAppObj = PyDict_GetItemString(globalsDict, QAPP_MACRO);
         if (qAppObj)
             PyDict_SetItemString(globalsDict, QAPP_MACRO, self);
     }
-    PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self);
 
-    Py_INCREF(self);
+    PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self);
     Py_AtExit(DeleteQApplicationAtExit);
-
+    Py_INCREF(self);
     return 1;
 }