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

Fixed problems to emit signals with objects types.

Browse source 
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Lauro Moura <lauro.neto@openbossa.org>
This commit is contained in:
Renato Araujo Oliveira Filho 2011-02-04 19:06:34 -03:00 • committed by Hugo Parente Lima
commit 4ebad6745f
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libpyside/signalmanager.cpp
View file

@ -201,10 +201,15 @@ static bool emitNormalSignal(QObject* source, int signalIndex, const char* signa
for (i = 0; i < argsGiven; ++i) { for (i = 0; i < argsGiven; ++i) {
QByteArray typeName = argTypes[i].toAscii(); QByteArray typeName = argTypes[i].toAscii();
Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get(typeName); Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get(typeName);
int typeId = QMetaType::type(typeName); if (typeResolver) {
if (typeResolver && typeId) { if (Shiboken::TypeResolver::getType(typeName) == Shiboken::TypeResolver::ValueType) {
if (Shiboken::TypeResolver::getType(typeName) == Shiboken::TypeResolver::ValueType) int typeId = QMetaType::type(typeName);
if (!typeId) {
PyErr_Format(PyExc_TypeError, "Value type used on signal needs to be registered on meta type: %s", typeName.data());
break;
}
signalValues[i] = QVariant(typeId, (void*) 0); signalValues[i] = QVariant(typeId, (void*) 0);
}
signalArgs[i+1] = signalValues[i].data(); signalArgs[i+1] = signalValues[i].data();
typeResolver->toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i), &signalArgs[i+1]); typeResolver->toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i), &signalArgs[i+1]);
} else { } else {