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

Fixed signal signature parser.

Browse source 
Fixes bug #311.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Filho 2010-08-26 12:02:59 -03:00
commit 268bf7735b
3 changed files with 56 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libpyside/qsignal.cpp
View file

@ -250,15 +250,21 @@ char* signal_get_type_name(PyObject* type)
char *typeName = NULL;
if (type->ob_type == &Shiboken::SbkBaseWrapperType_Type) {
Shiboken::SbkBaseWrapperType *objType = reinterpret_cast<Shiboken::SbkBaseWrapperType*>(type);
Q_ASSERT(objType->original_name);
typeName = strdup(objType->original_name);
} else {
//tp_name return the full name
Shiboken::AutoDecRef otypeName(PyObject_GetAttrString(type, "__name__"));
typeName = strdup(PyString_AS_STRING(otypeName.object()));
}
if (Shiboken::TypeResolver::getType(typeName) == Shiboken::TypeResolver::ObjectType) {
typeName = reinterpret_cast<char*>(realloc(typeName, strlen(typeName) + 1));
typeName = strcat(typeName, "*");
// Translate python types to Qt names
PyTypeObject *objType = reinterpret_cast<PyTypeObject*>(type);
if (objType == &PyString_Type)
typeName = strdup("QString");
else if (objType == &PyInt_Type)
typeName = strdup("int");
else if (objType == &PyLong_Type)
typeName = strdup("long");
else if (objType == &PyFloat_Type)
typeName = strdup("qreal");
else
typeName = strdup("object");
}
return typeName;
} else if (PyString_Check(type)) {
@ -277,7 +283,6 @@ char* signal_build_signature(const char *name, const char *signature)
char* signal_parse_signature(PyObject *args)
{
char *signature = 0;
if (args && (PyString_Check(args) || (!PySequence_Check(args) && (args != Py_None))))
return signal_get_type_name(args);