diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-05-10 18:11:55 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:21 -0300 |
commit | c85ce954582eba5761e895641e4e5dbf6dd8f4cc (patch) | |
tree | 256c5c1e9a4724b9452b4e44b491006fb4634a8a /PySide/QtGui | |
parent | 5825092e76917eb9b23769fa7e7a635601534968 (diff) |
Use add-function on QCoreApplication and QApplication constructors.
This was needed after a fix in the shiboken generator regarding the
tp_init initialization.
Diffstat (limited to 'PySide/QtGui')
-rw-r--r-- | PySide/QtGui/glue/qapplication_init.cpp | 31 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 5 |
2 files changed, 12 insertions, 24 deletions
diff --git a/PySide/QtGui/glue/qapplication_init.cpp b/PySide/QtGui/glue/qapplication_init.cpp index 581e4dadf..16c7fef7a 100644 --- a/PySide/QtGui/glue/qapplication_init.cpp +++ b/PySide/QtGui/glue/qapplication_init.cpp @@ -5,38 +5,22 @@ static int QApplicationArgCount; static char** QApplicationArgValues; static const char QAPP_MACRO[] = "qApp"; -int Sbk_QApplication_Init(PyObject* self, PyObject* args, PyObject*) +void QApplication_constructor(PyObject* self, PyObject* args, QApplicationWrapper** cptr) { - if (Shiboken::Object::isUserType(self) && !Shiboken::ObjectType::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication>())) - return -1; - if (QApplication::instance()) { PyErr_SetString(PyExc_RuntimeError, "A QApplication instance already exists."); - return -1; + return; } int numArgs = PyTuple_GET_SIZE(args); - if (numArgs != 1) { - PyErr_BadArgument(); - return -1; - } - - if (!Shiboken::sequenceToArgcArgv(PyTuple_GET_ITEM(args, 0), &QApplicationArgCount, &QApplicationArgValues, "PySideApp")) { + if (numArgs != 1 + || !Shiboken::sequenceToArgcArgv(PyTuple_GET_ITEM(args, 0), &QApplicationArgCount, &QApplicationArgValues, "PySideApp")) { PyErr_BadArgument(); - return -1; + return; } - SbkObject* sbkSelf = reinterpret_cast<SbkObject*>(self); - QApplicationWrapper* cptr = new QApplicationWrapper(QApplicationArgCount, QApplicationArgValues); - Shiboken::Object::setCppPointer(sbkSelf, - Shiboken::SbkType<QApplication>(), - cptr); - Shiboken::Object::setValidCpp(sbkSelf, true); - Shiboken::Object::setHasCppWrapper(sbkSelf, true); - Shiboken::Object::releaseOwnership(sbkSelf); - Shiboken::BindingManager::instance().registerWrapper(sbkSelf, cptr); - PySide::Signal::updateSourceObject(self); - cptr->metaObject(); + *cptr = new QApplicationWrapper(QApplicationArgCount, QApplicationArgValues); + Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self)); // Verify if qApp is in main module PyObject* globalsDict = PyEval_GetGlobals(); @@ -49,5 +33,4 @@ int Sbk_QApplication_Init(PyObject* self, PyObject* args, PyObject*) PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self); PySide::registerCleanupFunction(&PySide::destroyQCoreApplication); Py_INCREF(self); - return 1; } diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 30c4add40..a0089a080 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -5286,6 +5286,11 @@ <include file-name="QStyle" location="global"/> </extra-includes> <modify-function signature="QApplication(int&,char**)" access="private" /> + <add-function signature="QApplication(PySequence)"> + <inject-code> + QApplication_constructor(%PYSELF, args, &%0); + </inject-code> + </add-function> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> <inject-code class="native" file="glue/qapplication_init.cpp" position="beginning" /> |