diff options
Diffstat (limited to 'PySide/QtCore')
| -rw-r--r-- | PySide/QtCore/glue/qcoreapplication_init.cpp | 33 | ||||
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 15 |
2 files changed, 37 insertions, 11 deletions
diff --git a/PySide/QtCore/glue/qcoreapplication_init.cpp b/PySide/QtCore/glue/qcoreapplication_init.cpp index 5fcd79a3..7601dbd1 100644 --- a/PySide/QtCore/glue/qcoreapplication_init.cpp +++ b/PySide/QtCore/glue/qcoreapplication_init.cpp @@ -1,21 +1,30 @@ // Global variables used to store argc and argv values static int QCoreApplicationArgCount; static char** QCoreApplicationArgValues; +static bool leavingPython = false; /** * Called at QtCore module exit */ -void DeleteQCoreApplicationAtExit() { - if (QCoreApplication::instance()) { - BindingManager::instance().invalidateWrapper(QCoreApplication::instance()); - QCoreApplication::instance()->deleteLater(); - for (int i = 0; i < QCoreApplicationArgCount; ++i) - delete[] QCoreApplicationArgValues[i]; +void DeleteQCoreApplicationAtExit() +{ + leavingPython = true; + QCoreApplication *cpp = QCoreApplication::instance(); + if (cpp) { + Shiboken::BindingManager &bmngr = Shiboken::BindingManager::instance(); + PyObject* pySelf = bmngr.retrieveWrapper(cpp); + if (pySelf) + bmngr.invalidateWrapper(pySelf); + cpp->deleteLater(); } } int SbkQCoreApplication_Init(PyObject* self, PyObject* args, PyObject*) { + if (Shiboken::isUserType(self) && !Shiboken::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication >())) + return -1; + + if (QCoreApplication::instance()) { PyErr_SetString(PyExc_RuntimeError, "A QCoreApplication instance already exists."); return -1; @@ -32,14 +41,20 @@ int SbkQCoreApplication_Init(PyObject* self, PyObject* args, PyObject*) return -1; } - void* cptr = new QCoreApplication(QCoreApplicationArgCount, QCoreApplicationArgValues); + QCoreApplicationWrapper* cptr = new QCoreApplicationWrapper(QCoreApplicationArgCount, QCoreApplicationArgValues); Shiboken::setCppPointer(reinterpret_cast<SbkBaseWrapper*>(self), Shiboken::SbkType<QCoreApplication>(), 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(); - Py_INCREF(self); Py_AtExit(DeleteQCoreApplicationAtExit); + Py_INCREF(self); return 1; } diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 5355bf88..26991286 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -1762,6 +1762,7 @@ </modify-function> </object-type> <object-type name="QSignalMapper" /> + <object-type name="QCoreApplication"> <extra-includes> <include file-name="QStringList" location="global"/> @@ -1786,16 +1787,26 @@ <modify-function signature="sendEvent(QObject*, QEvent*)" allow-thread="yes"/> <modify-function signature="sendPostedEvents(QObject*, int)" allow-thread="yes"/> <modify-function signature="sendPostedEvents()" allow-thread="yes"/> + <modify-function signature="instance()"> + <modify-argument index="return"> + <define-ownership owner="c++"/> + </modify-argument> + </modify-function> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> <modify-function signature="argv()" remove="all"/> <!-- Obsolete --> <modify-function signature="argc()" remove="all"/> <!-- Obsolete --> - <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes"> + <modify-function signature="notify(QObject*,QEvent*)"> + <inject-code class="shell" position="beginning"> + Shiboken::ThreadStateSaver threadStateSaver; + if (!leavingPython) + threadStateSaver.save(); + </inject-code> <modify-argument index="2" invalidate-after-use="yes"/> </modify-function> - <modify-function signature="QCoreApplication(int &, char **)" remove="all"/> + <modify-function signature="QCoreApplication(int &, char **)" access="private"/> <inject-code class="native" file="glue/qcoreapplication_init.cpp" position="beginning" /> <modify-function signature="postEvent(QObject*,QEvent*)"> <modify-argument index="2"> |