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

Updated SignalManager to new TypeResolver api.

Browse source 
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
renatofilho 2010-10-27 17:25:50 -03:00
commit ff03bd56ff
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libpyside/signalmanager.cpp
View file

@ -301,18 +301,18 @@ static bool emitNormalSignal(QObject* source, int signalIndex, const char* signa
} }
void** signalArgs = new void*[argsGiven+1]; void** signalArgs = new void*[argsGiven+1];
void** signalValues = new void*[argsGiven];
signalArgs[0] = 0; signalArgs[0] = 0;
int i; int i;
for (i = 0; i < argsGiven; ++i) { for (i = 0; i < argsGiven; ++i) {
Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get(qPrintable(argTypes[i])); Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get(qPrintable(argTypes[i]));
if (typeResolver) { if (typeResolver) {
void *data = typeResolver->toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i)); typeResolver->toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i), &signalValues[i], true);
if (Shiboken::TypeResolver::getType(qPrintable(argTypes[i])) == Shiboken::TypeResolver::ObjectType) { if (Shiboken::TypeResolver::getType(qPrintable(argTypes[i])) == Shiboken::TypeResolver::ObjectType)
signalArgs[i+1] = &data; signalArgs[i+1] = &signalValues[i];
} else { else
signalArgs[i+1] = data; signalArgs[i+1] = signalValues[i];
}
} else { } else {
PyErr_Format(PyExc_TypeError, "Unknown type used to emit a signal: %s", qPrintable(argTypes[i])); PyErr_Format(PyExc_TypeError, "Unknown type used to emit a signal: %s", qPrintable(argTypes[i]));
break; break;
@ -323,11 +323,12 @@ static bool emitNormalSignal(QObject* source, int signalIndex, const char* signa
if (ok) if (ok)
QMetaObject::activate(source, signalIndex, signalArgs); QMetaObject::activate(source, signalIndex, signalArgs);
// FIXME: This will cause troubles with non-direct connections. //cleanup memory
for (int j = 0; j < i; ++j) for (int j = 0; j < i; ++j)
Shiboken::TypeResolver::get(qPrintable(argTypes[j]))->deleteObject(signalArgs[j+1]); Shiboken::TypeResolver::get(qPrintable(argTypes[j]))->deleteObject(signalArgs[j+1]);
delete[] signalArgs; delete[] signalArgs;
delete[] signalValues;
return ok; return ok;
} }
@ -374,6 +375,7 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id,
return id - metaObject->methodCount(); return id - metaObject->methodCount();
} }
typeResolver = Shiboken::TypeResolver::get(mp.typeName()); typeResolver = Shiboken::TypeResolver::get(mp.typeName());
Q_ASSERT(typeResolver);
} }
switch(call) { switch(call) {
@ -382,12 +384,7 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id,
{ {
PyObject* value = qpropertyGet(pp, pySelf); PyObject* value = qpropertyGet(pp, pySelf);
if (value) { if (value) {
void *data = typeResolver->toCpp(value); typeResolver->toCpp(value, &args[0]);
if (Shiboken::TypeResolver::getType(mp.typeName()) == Shiboken::TypeResolver::ObjectType)
args[0] = &data;
else
args[0] = data;
Py_DECREF(value); Py_DECREF(value);
} else if (PyErr_Occurred()) { } else if (PyErr_Occurred()) {
PyErr_Print(); // Clear any errors but print them to stderr PyErr_Print(); // Clear any errors but print them to stderr