diff options
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtCore/glue/qcoreapplication_init.cpp | 2 | ||||
-rw-r--r-- | PySide/QtCore/typesystem_core.xml | 16 | ||||
-rw-r--r-- | PySide/QtGui/glue/qapplication_init.cpp | 2 | ||||
-rw-r--r-- | PySide/phonon/typesystem_phonon.xml | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/PySide/QtCore/glue/qcoreapplication_init.cpp b/PySide/QtCore/glue/qcoreapplication_init.cpp index 66247bfc8..8ae53f341 100644 --- a/PySide/QtCore/glue/qcoreapplication_init.cpp +++ b/PySide/QtCore/glue/qcoreapplication_init.cpp @@ -34,7 +34,7 @@ int SbkQCoreApplication_Init(PyObject* self, PyObject* args, PyObject*) sbkSelf->containsCppWrapper = 1; sbkSelf->hasOwnership = 0; Shiboken::BindingManager::instance().registerWrapper(sbkSelf, cptr); - PySide::signalUpdateSource(self); + PySide::Signal::updateSourceObject(self); cptr->metaObject(); PySide::registerCleanupFunction(&PySide::destroyQCoreApplication); diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 4549c9d1c..366fd9c4a 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -1957,15 +1957,15 @@ timer->connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater())); if (PyObject_TypeCheck(%2, &PySideSignalInstanceType)) { - PySideSignalInstanceData* signalInstance = reinterpret_cast<PySideSignalInstanceData*>(%2); - Shiboken::AutoDecRef signalSignature(PyString_FromFormat("2%s", PySide::getSignalSignature(signalInstance))); + PySideSignalInstance* signalInstance = reinterpret_cast<PySideSignalInstance*>(%2); + Shiboken::AutoDecRef signalSignature(PyString_FromFormat("2%s", PySide::Signal::getSignature(signalInstance))); Shiboken::AutoDecRef result( PyObject_CallMethod(pyTimer, const_cast<char*>("connect"), const_cast<char*>("OsOO"), pyTimer, SIGNAL(timeout()), - PySide::getSignalSource(signalInstance), + PySide::Signal::getObject(signalInstance), signalSignature.object()) ); } else { @@ -2627,11 +2627,11 @@ </modify-argument> <inject-code> if (PyObject_TypeCheck(%1, &PySideSignalInstanceType)) { - PyObject* dataSource = PySide::getSignalSource((PySideSignalInstanceData*) %PYARG_1); + PyObject* dataSource = PySide::Signal::getObject((PySideSignalInstance*) %PYARG_1); Shiboken::AutoDecRef obType(PyObject_Type(dataSource)); QObject* sender = %CONVERTTOCPP[QObject*](dataSource); if (sender) { - const char* dataSignature = PySide::getSignalSignature((PySideSignalInstanceData*) %PYARG_1); + const char* dataSignature = PySide::Signal::getSignature((PySideSignalInstance*) %PYARG_1); QByteArray signature(dataSignature); // Append SIGNAL flag (2) %0 = new QSignalTransitionWrapper(sender, "2" + signature, %2); } @@ -2681,9 +2681,9 @@ // http://bugs.openbossa.org/show_bug.cgi?id=362 if (!PyObject_TypeCheck(%1, &PySideSignalInstanceType)) goto Sbk%TYPEFunc_%FUNCTION_NAME_TypeError; - PySideSignalInstanceData* signalInstance = reinterpret_cast<PySideSignalInstanceData*>(%1); - QObject* sender = %CONVERTTOCPP[QObject*](PySide::getSignalSource(signalInstance)); - %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%CPPSELF->%FUNCTION_NAME(sender, PySide::getSignalSignature(signalInstance), %2)); + PySideSignalInstance* signalInstance = reinterpret_cast<PySideSignalInstance*>(%1); + QObject* sender = %CONVERTTOCPP[QObject*](PySide::Signal::getObject(signalInstance)); + %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%CPPSELF->%FUNCTION_NAME(sender, PySide::Signal::getSignature(signalInstance), %2)); </inject-code> </add-function> diff --git a/PySide/QtGui/glue/qapplication_init.cpp b/PySide/QtGui/glue/qapplication_init.cpp index ba98f029a..fcacc02db 100644 --- a/PySide/QtGui/glue/qapplication_init.cpp +++ b/PySide/QtGui/glue/qapplication_init.cpp @@ -35,7 +35,7 @@ int SbkQApplication_Init(PyObject* self, PyObject* args, PyObject*) sbkSelf->containsCppWrapper = 1; sbkSelf->hasOwnership = 0; Shiboken::BindingManager::instance().registerWrapper(sbkSelf, cptr); - PySide::signalUpdateSource(self); + PySide::Signal::updateSourceObject(self); cptr->metaObject(); // Verify if qApp is in main module diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml index 3df71d69d..310ae9098 100644 --- a/PySide/phonon/typesystem_phonon.xml +++ b/PySide/phonon/typesystem_phonon.xml @@ -83,14 +83,14 @@ <access modifier="private"/> </modify-function> <inject-code class="target" position="end"> - PyObject* signal_item; + PySideSignal* signal_item; - signal_item = PySide::signalNew("capabilitiesChanged", "void", NULL); - PyDict_SetItemString(SbkPhonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "capabilitiesChanged", signal_item); + signal_item = PySide::Signal::newObject("capabilitiesChanged", "void", NULL); + PyDict_SetItemString(SbkPhonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "capabilitiesChanged", (PyObject*)signal_item); Py_DECREF(signal_item); - signal_item = PySide::signalNew("availableAudioOutputDevicesChanged", "void", NULL); - PyDict_SetItemString( SbkPhonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "availableAudioOutputDevicesChanged", signal_item); + signal_item = PySide::Signal::newObject("availableAudioOutputDevicesChanged", "void", NULL); + PyDict_SetItemString( SbkPhonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "availableAudioOutputDevicesChanged", (PyObject*)signal_item); Py_DECREF(signal_item); </inject-code> </object-type> |