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

Fixed qt_metacall, now everything works as it should.

Browse source 
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Lauro Moura <lauro.neto@openbossa.org>
This commit is contained in:
Hugo Parente Lima 2010-12-01 18:09:09 -02:00
commit 59b4f2b59d
4 changed files with 59 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libpyside/pysidemetafunction.cpp
View file

@ -98,29 +98,26 @@ void functionFree(void *self)
PyObject* functionCall(PyObject* self, PyObject* args, PyObject* kw)
{
QGenericArgument gArgs[10];
PySideMetaFunction* function = reinterpret_cast<PySideMetaFunction*>(self);
QList<QVariant*> vArgs;
QMetaMethod method = function->d->method;
QList<QByteArray> pTypes = method.parameterTypes();
int numArgs = pTypes.size();
Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get("QVariant");
static Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get("QVariant");
Q_ASSERT(typeResolver);
for(int i=0; i < numArgs; i++) {
QVariant *vArg;
QGenericArgument gArgs[10];
QVariant vArgs[10];
PySideMetaFunction* function = reinterpret_cast<PySideMetaFunction*>(self);
QMetaMethod method = function->d->method;
int argsGiven = method.parameterTypes().size();
for (int i = 0; i < argsGiven; ++i) {
Shiboken::AutoDecRef pyArg(PySequence_GetItem(args, i));
typeResolver->toCpp(pyArg, (void**)&vArg, true);
vArgs.append(vArg);
gArgs[i] = Q_ARG(QVariant, *vArg);
gArgs[i] = Q_ARG(QVariant, vArgs[i]);
void* v[1] = { &vArgs[i] };
typeResolver->toCpp(pyArg, v);
}
QVariant retVariant;
QGenericReturnArgument returnValue = Q_RETURN_ARG(QVariant, retVariant);
method.invoke(function->d->qobject, returnValue, gArgs[0], gArgs[1], gArgs[2], gArgs[3], gArgs[4], gArgs[5], gArgs[6], gArgs[7], gArgs[8], gArgs[9]);
while(!vArgs.isEmpty())
delete vArgs.takeFirst();
if (retVariant.isValid())
return typeResolver->toPython(&retVariant);

30
libpyside/signalmanager.cpp
View file

@ -70,9 +70,17 @@ PyObjectWrapper::PyObjectWrapper(const PyObjectWrapper &other)
PyObjectWrapper::~PyObjectWrapper()
{
Shiboken::GilState gil;
Py_DECREF(m_me);
}
PyObjectWrapper& PyObjectWrapper::operator=(const PySide::PyObjectWrapper& other)
{
Py_INCREF(other.m_me);
Py_DECREF(m_me);
m_me = other.m_me;
return *this;
}
PyObjectWrapper::operator PyObject*() const
{
@ -179,24 +187,26 @@ static bool emitNormalSignal(QObject* source, int signalIndex, const char* signa
{
Shiboken::AutoDecRef sequence(PySequence_Fast(args, 0));
int argsGiven = PySequence_Fast_GET_SIZE(sequence.object());
if (argsGiven > argTypes.count()) {
PyErr_Format(PyExc_TypeError, "%s only accepts %d arguments, %d given!", signal, argTypes.count(), argsGiven);
return false;
}
void** signalArgs = new void*[argsGiven+1];
void** signalValues = new void*[argsGiven];
QVariant* signalValues = new QVariant[argsGiven];
void** signalArgs = new void*[argsGiven + 1];
signalArgs[0] = 0;
int i;
for (i = 0; i < argsGiven; ++i) {
Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get(qPrintable(argTypes[i]));
const char* typeName = argTypes[i].toAscii().constData();
Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get(typeName);
if (typeResolver) {
typeResolver->toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i), &signalValues[i], true);
if (Shiboken::TypeResolver::getType(qPrintable(argTypes[i])) == Shiboken::TypeResolver::ObjectType)
signalArgs[i+1] = &signalValues[i];
else
signalArgs[i+1] = signalValues[i];
int typeId = QMetaType::type(typeName);
if (Shiboken::TypeResolver::getType(typeName) == Shiboken::TypeResolver::ValueType)
signalValues[i] = QVariant(typeId, (void*) 0);
signalArgs[i+1] = signalValues[i].data();
typeResolver->toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i), &signalArgs[i+1]);
} else {
PyErr_Format(PyExc_TypeError, "Unknown type used to emit a signal: %s", qPrintable(argTypes[i]));
break;
@ -207,10 +217,6 @@ static bool emitNormalSignal(QObject* source, int signalIndex, const char* signa
if (ok)
QMetaObject::activate(source, signalIndex, signalArgs);
//cleanup memory
for (int j = 0; j < i; ++j)
Shiboken::TypeResolver::get(qPrintable(argTypes[j]))->deleteObject(signalArgs[j+1]);
delete[] signalArgs;
delete[] signalValues;

1
libpyside/signalmanager.h
View file

@ -43,6 +43,7 @@ public:
PyObjectWrapper(const PyObjectWrapper &other);
~PyObjectWrapper();
operator PyObject*() const;
PyObjectWrapper& operator=(const PyObjectWrapper &other);
private:
PyObject* m_me;
void* m_data; //future