jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implemented signal to signal connection.

Browse source 
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>,
          Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
Renato Filho 2010-05-17 19:11:56 -03:00
commit 40d67b2892
2 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libpyside/qsignal.cpp
View file

@ -361,18 +361,26 @@ PyObject* signal_instance_connect(PyObject* self, PyObject* args, PyObject* kwds
bool match = false;
if (slot->ob_type == &SignalInstance_Type) {
//TODO: find best match
SignalInstanceData *target = reinterpret_cast<SignalInstanceData*>(slot);
SignalInstanceData *sourceWalk = source;
SignalInstanceData *targetWalk;
if (QMetaObject::checkConnectArgs(source->signature, target->signature)) {
PyList_Append(pyArgs, source->source);
Shiboken::AutoDecRef source_signature(PyString_FromString(source->signature));
PyList_Append(pyArgs, source_signature);
//find best match
while(sourceWalk && !match) {
targetWalk = reinterpret_cast<SignalInstanceData*>(slot);
while(targetWalk && !match) {
if (QMetaObject::checkConnectArgs(sourceWalk->signature, targetWalk->signature)) {
PyList_Append(pyArgs, sourceWalk->source);
Shiboken::AutoDecRef sourceSignature(PyString_FromString(sourceWalk->signature));
PyList_Append(pyArgs, sourceSignature);
PyList_Append(pyArgs, target->source);
Shiboken::AutoDecRef target_signature(PyString_FromString(target->signature));
PyList_Append(pyArgs, target_signature);
match = true;
PyList_Append(pyArgs, targetWalk->source);
Shiboken::AutoDecRef targetSignature(PyString_FromString(targetWalk->signature));
PyList_Append(pyArgs, targetSignature);
match = true;
}
targetWalk = reinterpret_cast<SignalInstanceData*>(targetWalk->next);
}
sourceWalk = reinterpret_cast<SignalInstanceData*>(sourceWalk->next);
}
} else {
//try the first signature