diff options
| author | renatofilho <renato.filho@openbossa.org> | 2010-10-29 16:21:50 -0300 |
|---|---|---|
| committer | renatofilho <renato.filho@openbossa.org> | 2010-11-03 10:28:15 -0300 |
| commit | c7945787c556d2e3e40a1b9ef93147c640ee8ff6 (patch) | |
| tree | 96ac95001401d2c300f4833b3dfd2b9855578260 /PySide/QtCore | |
| parent | 62fd909705a4bf99590346712b040f7b40c9bb74 (diff) | |
Created Singal/Slot/Property namespace for pure C structures.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Lauro Neto <lauro.neto@openbossa.org>
Diffstat (limited to 'PySide/QtCore')
| -rw-r--r-- | PySide/QtCore/glue/qcoreapplication_init.cpp | 2 | ||||
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 16 |
2 files changed, 9 insertions, 9 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> |