summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@openbossa.org>2011-01-20 17:27:53 -0300
committerRenato Araujo Oliveira Filho <renato.filho@openbossa.org>2011-01-21 13:44:47 -0300
commit92847038553383dac2c41d5b02968fdd01603ced (patch)
tree1dd9f0ac5caef3b36f3c0eb7ea1f0ee012ce1021
parentbcba2a3b329cc04236f4e38433b002f13ff55179 (diff)
downloadpyside-92847038553383dac2c41d5b02968fdd01603ced.tar.gz
pyside-92847038553383dac2c41d5b02968fdd01603ced.tar.xz
pyside-92847038553383dac2c41d5b02968fdd01603ced.zip
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 2581d71..04ddb8e 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;