- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -119,7+119,7 @@ void SignalProxy::SignalRelay::detachSignal(QObject *sender, int signalId)
break;
}
else {
break;
}
else {
- slotIter++;
+ ++slotIter;
}
}
}
}
}
}
@@ -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
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
#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;
#endif
qWarning() << " - make sure all your data types are known by the Qt MetaSystem";