summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@openbossa.org>2011-01-20 17:27:53 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:51:47 -0300
commit6a87db2791fd5b9313379e75a2a3551c8697be9c (patch)
tree6c7747b5ee57ff949d1b0ffd2e6c561f1c60e4c0
parentda8c292b69c53f0a16bc405ed590ce5d4ecacf9b (diff)
Replace use of QMetaObject::activate to QObject::qt_metacall.
This is necessary to support signals with default values. Fix bug #624 Reviewer: Luciano Wolf <luciano.wolf@openbossa.org> Lauro Moura <lauro.neto@openbossa.org>
-rw-r--r--libpyside/signalmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp
index 2581d718..04ddb8e6 100644
--- a/libpyside/signalmanager.cpp
+++ b/libpyside/signalmanager.cpp
@@ -179,7 +179,7 @@ void SignalManager::addGlobalSlot(const char* slot, PyObject* callback)
static bool emitShortCircuitSignal(QObject* source, int signalIndex, PyObject* args)
{
void* signalArgs[2] = {0, args};
- QMetaObject::activate(source, signalIndex, signalArgs);
+ source->qt_metacall(QMetaObject::InvokeMetaMethod, signalIndex, signalArgs);
return true;
}
@@ -215,7 +215,7 @@ static bool emitNormalSignal(QObject* source, int signalIndex, const char* signa
bool ok = i == argsGiven;
if (ok)
- QMetaObject::activate(source, signalIndex, signalArgs);
+ source->qt_metacall(QMetaObject::InvokeMetaMethod, signalIndex, signalArgs);
delete[] signalArgs;
delete[] signalValues;