const QList<int> &argTypes = proxy->argTypes(caller, _id);
QVariantList params;
int n = argTypes.size();
- for(int i=0; i<n; i++)
- params.append(QVariant(argTypes[i], _a[i+1]));
+ for(int i=0; i<n; 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());
+ qWarning() << " - make sure all your data types are known by the Qt MetaSystem";
+ return _id;
+ }
+ params.append(QVariant(argTypes[i], _a[i+1]));
+ }
QMultiHash<int, QByteArray>::const_iterator funcIter = sigNames.constFind(_id);
while(funcIter != sigNames.constEnd() && funcIter.key() == _id) {
proxy->dispatchSignal(funcIter.value(), params);
proxy->dispatchSignal((int)SignalProxy::Sync, params);
}
}
- _id -= 1;
+ _id -= QObject::staticMetaObject.methodCount();
}
return _id;
}
return _classInfo[obj->metaObject()]->argTypes[methodId];
}
+void SignalProxy::setMinArgCount(QObject *obj, int methodId) {
+ const QMetaObject *meta = obj->metaObject();
+ QString signature(meta->method(methodId).signature());
+ int minCount = meta->method(methodId).parameterTypes().count() - signature.count("=");
+ Q_ASSERT(!_classInfo[meta]->minArgCount.contains(methodId));
+ _classInfo[meta]->minArgCount[methodId] = minCount;
+}
+
+const int &SignalProxy::minArgCount(QObject *obj, int methodId) {
+ Q_ASSERT(_classInfo.contains(obj->metaObject()));
+ if(!_classInfo[obj->metaObject()]->minArgCount.contains(methodId))
+ setMinArgCount(obj, methodId);
+ return _classInfo[obj->metaObject()]->minArgCount[methodId];
+}
+
void SignalProxy::setMethodName(QObject *obj, int methodId) {
const QMetaObject *meta = obj->metaObject();
QByteArray method(::methodName(meta->method(methodId)));
// gladly the objectName() is still valid. So we have only to iterate over the classes not each instance! *sigh*
QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
while(classIter != _syncSlave.end()) {
- if(classIter->contains(obj->objectName())) {
+ if(classIter->contains(obj->objectName()) && classIter.value()[obj->objectName()] == obj) {
classIter->remove(obj->objectName());
break;
}
QByteArray signal = params.takeFirst().toByteArray();
if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) {
- qWarning() << QString("no registered receiver for sync call: %s::%s (objectName=\"%s\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
+ qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
<< params;
return;
}
SyncableObject *receiver = _syncSlave[className][objectName];
if(!syncMap(receiver).contains(signal)) {
- qWarning() << QString("no matching slot for sync call: %s::%s (objectName=\"%s\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
+ qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
<< params;
return;
}
void SignalProxy::handleInitData(QIODevice *sender, const QVariantList ¶ms) {
Q_UNUSED(sender)
if(params.count() != 3) {
- qWarning() << "SignalProxy::handleInitRequest() received initRequest with invalid param Count:"
+ qWarning() << "SignalProxy::handleInitData() received initData with invalid param Count:"
<< params;
return;
}
QVariantMap propertyMap(params[2].toMap());
if(!_syncSlave.contains(className)) {
- qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:"
+ qWarning() << "SignalProxy::handleInitData() received initData for unregistered Class:"
<< className;
return;
}
if(!_syncSlave[className].contains(objectName)) {
- qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Object:"
+ qWarning() << "SignalProxy::handleInitData() received initData for unregistered Object:"
<< className << objectName;
return;
}
bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms) {
const QList<int> args = argTypes(receiver, methodId);
- const int numArgs = args.count();
+ const int numArgs = params.count() < args.count()
+ ? params.count()
+ : args.count();
- if(numArgs < params.count()) {
+ if(minArgCount(receiver, methodId) > params.count()) {
qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << methodName(receiver, methodId);
return false;
}
-
- void *_a[numArgs+1];
- _a[0] = 0;
+
+ void *_a[] = {0, // return type
+ 0, 0, 0, 0 , 0, // and 10 args - that's the max size qt can handle with signals and slots
+ 0, 0, 0, 0 , 0};
// check for argument compatibility and build params array
for(int i = 0; i < numArgs; i++) {
+ if(!params[i].isValid()) {
+ 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());
+ qWarning() << " - make sure all your data types are known by the Qt MetaSystem";
+ return false;
+ }
if(args[i] != QMetaType::type(params[i].typeName())) {
qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << methodName(receiver, methodId);
return false;
return;
obj->fromVariantMap(properties);
setInitialized(obj);
+ invokeSlot(obj, updatedRemotelyId(obj));
}
void SignalProxy::dumpProxyStats() {