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

Use original name in type discovery during signal/slot.

Browse source 
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>,
          Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
Renato Filho 2010-07-05 18:08:25 -03:00
commit 83db573031
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libpyside/qsignal.cpp
View file

@ -243,14 +243,20 @@ void signalUpdateSource(PyObject* source)
char* signal_get_type_name(PyObject* type) char* signal_get_type_name(PyObject* type)
{ {
if (PyType_Check(type)) { if (PyType_Check(type)) {
//tp_name return the full name char *typeName = NULL;
Shiboken::AutoDecRef typeName(PyObject_GetAttrString(type, "__name__")); if (type->ob_type == &Shiboken::SbkBaseWrapperType_Type) {
char *aux = strdup(PyString_AS_STRING(typeName.object())); Shiboken::SbkBaseWrapperType *objType = reinterpret_cast<Shiboken::SbkBaseWrapperType*>(type);
if (Shiboken::TypeResolver::getType(aux) == Shiboken::TypeResolver::ObjectType) { typeName = strdup(objType->original_name);
aux = reinterpret_cast<char*>(realloc(aux, strlen(aux) + 1)); } else {
aux = strcat(aux, "*"); //tp_name return the full name
Shiboken::AutoDecRef otypeName(PyObject_GetAttrString(type, "__name__"));
typeName = strdup(PyString_AS_STRING(otypeName.object()));
} }
return aux; if (Shiboken::TypeResolver::getType(typeName) == Shiboken::TypeResolver::ObjectType) {
typeName = reinterpret_cast<char*>(realloc(typeName, strlen(typeName) + 1));
typeName = strcat(typeName, "*");
}
return typeName;
} else if (PyString_Check(type)) { } else if (PyString_Check(type)) {
return strdup(PyString_AS_STRING(type)); return strdup(PyString_AS_STRING(type));
} }