/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2015 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
}
else {
fn = SIGNAL(fakeMethodSignature());
+#if QT_VERSION >= 0x050000
+ fn = fn.replace("fakeMethodSignature()", sender->metaObject()->method(signalId).methodSignature());
+#else
fn = fn.replace("fakeMethodSignature()", sender->metaObject()->method(signalId).signature());
+#endif
}
_slots[slotId] = Signal(sender, signalId, fn);
break;
}
else {
- slotIter++;
+ ++slotIter;
}
}
}
const QList<int> &argTypes = eMeta->argTypes(signal.signalId);
for (int i = 0; i < argTypes.size(); i++) {
if (argTypes[i] == 0) {
- 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());
+#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(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(signal.signalId).signature());
+#endif
qWarning() << " - make sure all your data types are known by the Qt MetaSystem";
return _id;
}
objIter = classIter->erase(objIter);
obj->stopSynchronize(this);
}
- classIter++;
+ ++classIter;
}
_syncSlave.clear();
slotIter = _attachedSlots.erase(slotIter);
}
else
- slotIter++;
+ ++slotIter;
}
}
classIter->remove(obj->objectName());
break;
}
- classIter++;
+ ++classIter;
}
obj->stopSynchronize(this);
}
return;
}
- QVariant returnValue((QVariant::Type)eMeta->returnType(slotId));
+ // We can no longer construct a QVariant from QMetaType::Void
+ QVariant returnValue;
+ int returnType = eMeta->returnType(slotId);
+ if (returnType != QMetaType::Void)
+ returnValue = QVariant(static_cast<QVariant::Type>(returnType));
+
if (!invokeSlot(receiver, slotId, syncMessage.params, returnValue, peer)) {
qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", eMeta->methodName(slotId).constData());
return;
// check for argument compatibility and build params array
for (int i = 0; i < numArgs; i++) {
if (!params[i].isValid()) {
+#if QT_VERSION >= 0x050000
+ qWarning() << "SignalProxy::invokeSlot(): received invalid data for argument number" << i << "of method" << QString("%1::%2()").arg(receiver->metaObject()->className()).arg(receiver->metaObject()->method(methodId).methodSignature().constData());
+#else
qWarning() << "SignalProxy::invokeSlot(): received invalid data for argument number" << i << "of method" << QString("%1::%2()").arg(receiver->metaObject()->className()).arg(receiver->metaObject()->method(methodId).signature());
+#endif
qWarning() << " - make sure all your data types are known by the Qt MetaSystem";
return false;
}
if (_meta->method(i).methodType() != QMetaMethod::Slot)
continue;
+#if QT_VERSION >= 0x050000
+ if (_meta->method(i).methodSignature().contains('*'))
+#else
if (QByteArray(_meta->method(i).signature()).contains('*'))
+#endif
continue; // skip methods with ptr params
QByteArray method = methodName(_meta->method(i));
}
if (checkConflicts) {
qWarning() << "class" << meta->className() << "contains overloaded methods which is currently not supported!";
+#if QT_VERSION >= 0x050000
+ qWarning() << " - " << _meta->method(i).methodSignature() << "conflicts with" << _meta->method(_methodIds[method]).methodSignature();
+#else
qWarning() << " - " << _meta->method(i).signature() << "conflicts with" << _meta->method(_methodIds[method]).signature();
+#endif
}
continue;
}
if (QMetaType::Void == (QMetaType::Type)returnType(i))
continue;
+#if QT_VERSION >= 0x050000
+ signature = requestSlot.methodSignature();
+#else
signature = QByteArray(requestSlot.signature());
+#endif
if (!signature.startsWith("request"))
continue;
QByteArray SignalProxy::ExtendedMetaObject::methodName(const QMetaMethod &method)
{
+#if QT_VERSION >= 0x050000
+ QByteArray sig(method.methodSignature());
+#else
QByteArray sig(method.signature());
+#endif
return sig.left(sig.indexOf("("));
}
QString SignalProxy::ExtendedMetaObject::methodBaseName(const QMetaMethod &method)
{
+#if QT_VERSION >= 0x050000
+ QString methodname = QString(method.methodSignature()).section("(", 0, 0);
+#else
QString methodname = QString(method.signature()).section("(", 0, 0);
+#endif
// determine where we have to chop:
int upperCharPos;
_argTypes = argTypes;
// determine minArgCount
+#if QT_VERSION >= 0x050000
+ QString signature(method.methodSignature());
+#else
QString signature(method.signature());
+#endif
_minArgCount = method.parameterTypes().count() - signature.count("=");
_receiverMode = (_methodName.startsWith("request"))