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

Stop signal/slot connection if is impossible to register that on object.

Browse source 
Created unit test for bug #442, #437.
Fixes bug #442.

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
renatofilho 2010-10-28 16:28:43 -03:00
commit bd8239b1cd
6 changed files with 66 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libpyside/qsignal.cpp
View file

@ -523,6 +523,8 @@ char* getTypeName(PyObject* type)
return typeName;
} else if (PyString_Check(type)) {
return strdup(PyString_AS_STRING(type));
} else if (type == Py_None) {
return strdup("void");
}
return 0;
}
@ -537,7 +539,7 @@ char* signalBuildSignature(const char *name, const char *signature)
char* signalParseSignature(PyObject *args)
{
char *signature = 0;
if (args && (PyString_Check(args) || (!PySequence_Check(args) && (args != Py_None))))
if (args && (PyString_Check(args) || !PySequence_Check(args)))
return getTypeName(args);
for(Py_ssize_t i = 0, i_max = PySequence_Size(args); i < i_max; i++) {
@ -623,12 +625,11 @@ PyObject* signalNewFromMethod(PyObject* source, const QList<QMetaMethod>& method
item->d = new PySideSignalInstanceDataPrivate;
PySideSignalInstanceDataPrivate* selfPvt = item->d;
selfPvt->source = source;
const char* cppSignature = m.signature();
QByteArray cppName(m.signature());
cppName = cppName.mid(0, cppName.indexOf('('));
// separe SignalName
selfPvt->signalName = strdup(cppSignature);
char* endName = strchr(selfPvt->signalName, '(');
endName = '\0';
selfPvt->signature = strdup(cppSignature);
selfPvt->signalName = strdup(cppName.data());
selfPvt->signature = strdup(m.signature());
selfPvt->homonymousMethod = 0;
selfPvt->next = 0;
}