diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-19 18:13:22 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-19 18:51:18 -0200 |
| commit | cc7a2018b52c9191a37f4f1220b2e57b1fbe0d97 (patch) | |
| tree | 51e3163826ca9f0dd334b1226b333658bc515cff /PySide | |
| parent | e733c2b11bbe60036f4e10bff8f07ef328223cce (diff) | |
Added d-pointer to PySideSignalInstanceData struct.
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 9b95f6d7b..077859ec2 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -1964,14 +1964,14 @@ if (PyObject_TypeCheck(%2, &PySideSignalInstanceType)) { PySideSignalInstanceData* signalInstance = reinterpret_cast<PySideSignalInstanceData*>(%2); - Shiboken::AutoDecRef signalSignature(PyString_FromFormat("2%s", signalInstance->signature)); + Shiboken::AutoDecRef signalSignature(PyString_FromFormat("2%s", PySide::getSignalSignature(signalInstance))); Shiboken::AutoDecRef result( PyObject_CallMethod(pyTimer, const_cast<char*>("connect"), const_cast<char*>("OsOO"), pyTimer, SIGNAL(timeout()), - signalInstance->source, + PySide::getSignalSource(signalInstance), signalSignature.object()) ); } else { @@ -2632,12 +2632,13 @@ <replace-default-expression with="0" /> </modify-argument> <inject-code> - if (PyObject_TypeCheck(%1, &PySide::SignalInstance_Type)) { - PySide::SignalInstanceData* data = (PySide::SignalInstanceData*) %PYARG_1; - Shiboken::AutoDecRef obType(PyObject_Type(data->source)); - QObject* sender = %CONVERTTOCPP[QObject*](data->source); + if (PyObject_TypeCheck(%1, &PySideSignalInstanceType)) { + PyObject* dataSource = PySide::getSignalSource((PySideSignalInstanceData*) %PYARG_1); + Shiboken::AutoDecRef obType(PyObject_Type(dataSource)); + QObject* sender = %CONVERTTOCPP[QObject*](dataSource); if (sender) { - QByteArray signature(data->signature); // Append SIGNAL flag (2) + const char* dataSignature = PySide::getSignalSignature((PySideSignalInstanceData*) %PYARG_1); + QByteArray signature(dataSignature); // Append SIGNAL flag (2) %0 = new QSignalTransitionWrapper(sender, "2" + signature, %2); } } @@ -2687,8 +2688,8 @@ if (!PyObject_TypeCheck(%1, &PySideSignalInstanceType)) goto Sbk%TYPEFunc_%FUNCTION_NAME_TypeError; PySideSignalInstanceData* signalInstance = reinterpret_cast<PySideSignalInstanceData*>(%1); - QObject* sender = %CONVERTTOCPP[QObject*](signalInstance->source); - %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%CPPSELF->%FUNCTION_NAME(sender, signalInstance->signature, %2)); + QObject* sender = %CONVERTTOCPP[QObject*](PySide::getSignalSource(signalInstance)); + %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%CPPSELF->%FUNCTION_NAME(sender, PySide::getSignalSignature(signalInstance), %2)); </inject-code> </add-function> |