From: esainane Date: Sat, 12 Dec 2015 05:56:17 +0000 (+1300) Subject: signalproxy: Correct signal method name warnings X-Git-Tag: travis-deploy-test~535^2 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ac302112a1a41d5beebd7129b29b34f9476db0ca;hp=8832d69af719e187e398fa6cc86665c2cb9c211c signalproxy: Correct signal method name warnings _id was used to index SignalProxy::SignalRelay::_slots. signal.signalId is used to index caller->metaObject()->method. This can be verified by changing eg. displayMsg to use a type that is compatible with Message but won't work with QMetaType::type, like Message& --- diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 754e9dbb..78ad1378 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -146,9 +146,9 @@ int SignalProxy::SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void ** for (int i = 0; i < argTypes.size(); i++) { if (argTypes[i] == 0) { #if QT_VERSION >= 0x050000 - qWarning() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(_id).methodSignature().constData()); + qWarning() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(signal.signalId).methodSignature().constData()); #else - qWarning() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(_id).signature()); + qWarning() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(signal.signalId).signature()); #endif qWarning() << " - make sure all your data types are known by the Qt MetaSystem"; return _id;