X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=83f10e3e59ca830291342ac8d33122a6abcb6f95;hp=f6f75d65ca1f3d76ee5079d4aba6b4eb1cb2ba27;hb=c7fd86ed385a38210b9dc7356a7e2ac40efe5951;hpb=72d25daa2c6cc00c17e79f756ad70bc00b41f9a8

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index f6f75d65..83f10e3e 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -80,8 +80,14 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
       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);
@@ -103,7 +109,7 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
 	proxy->dispatchSignal((int)SignalProxy::Sync, params);
       }
     }
-    _id -= 1;
+    _id -= QObject::staticMetaObject.methodCount();
   }
   return _id;
 }
@@ -549,7 +555,7 @@ void SignalProxy::stopSync(SyncableObject* obj) {
   // 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;
     }
@@ -604,14 +610,14 @@ void SignalProxy::handleSync(QVariantList params) {
   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;
   }
@@ -703,7 +709,7 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
     ? params.count()
     : args.count();
 
-  if(minArgCount(receiver, methodId) < params.count()) {
+  if(minArgCount(receiver, methodId) > params.count()) {
       qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << methodName(receiver, methodId);
       return false;
   }
@@ -713,6 +719,11 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
 		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;