X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=c30fe4f16028eb1b80cb4d3ac999b24f12976e32;hp=904768d5843b7d88a611d9731b454085c976f705;hb=45d9ea6ed5d64eec3ca351fdcf7610c7cff3529d;hpb=924e2c01204da172a071d34485936b379372e497

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 904768d5..c30fe4f1 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -5,7 +5,7 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -327,7 +327,6 @@ const QByteArray &SignalProxy::methodName(QObject *obj, int methodId) {
 
 void SignalProxy::setSyncMap(QObject *obj) {
   const QMetaObject *meta = obj->metaObject();
-
   QHash<int, int> syncMap;
   
   QList<int> slotIndexes;
@@ -567,8 +566,17 @@ void SignalProxy::handleSync(QVariantList params) {
 
   QObject *receiver = _syncSlave[className][objectName];
   if(!syncMap(receiver).contains(signalId)) {
-    qWarning() << "received Sync Call with invalid SignalId" << className << objectName << signalId;
-  }
+    const QMetaObject *meta = receiver->metaObject();
+    QString signalName;
+    if(signalId < meta->methodCount())
+      signalName = QString(meta->method(signalId).signature());
+    else
+      signalName = QString::number(signalId);
+    
+    qWarning() << "received Sync Call for Object" << receiver
+	       << "- no matching Slot for Signal:" << signalName;
+    return;
+   }
   int slotId = syncMap(receiver)[signalId];
   if(!invokeSlot(receiver, slotId, params))
     qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());
@@ -583,7 +591,7 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &param
   
   QByteArray className(params[0].toByteArray());
   QString objectName(params[1].toString());
-
+  
   if(!_syncSlave.contains(className)) {
     qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:"
 	       << className;
@@ -595,7 +603,7 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &param
 	       << className << objectName;
     return;
   }
-
+  
   QObject *obj = _syncSlave[className][objectName];
 
   QVariantList params_;
@@ -811,4 +819,14 @@ void SignalProxy::dumpProxyStats() {
   qDebug() << "number of Classes cached:" << _classInfo.count();
 }
 
+void SignalProxy::dumpSyncMap(QObject *object) {
+  const QMetaObject *meta = object->metaObject();
+  qDebug() << "SignalProxy: SyncMap for Class" << meta->className();
 
+  QHash<int, int> syncMap_ = syncMap(object);
+  QHash<int, int>::const_iterator iter = syncMap_.constBegin();
+  while(iter != syncMap_.constEnd()) {
+    qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();    
+    iter++;
+  }
+}