From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 5 Feb 2008 15:04:34 +0000 (+0000)
Subject: tweaking the SignalProxy resulted in some casualties... fixed.\nUpdated and distclean... 
X-Git-Tag: 0.2.0-alpha1~116
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=287674ebe59cf8129645722693391f4b4ad8d240;ds=sidebyside

tweaking the SignalProxy resulted in some casualties... fixed.\nUpdated and distclean advised.
---

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 3718fdef..f0c7d0b5 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -90,7 +90,7 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
       }
       QMultiHash<int, QByteArray>::const_iterator funcIter = sigNames.constFind(_id);
       while(funcIter != sigNames.constEnd() && funcIter.key() == _id) {
-        proxy->dispatchSignal((int)SignalProxy::RpcCall, QVariantList() << funcIter.value() << params);
+        proxy->dispatchSignal(SignalProxy::RpcCall, QVariantList() << funcIter.value() << params);
         funcIter++;
       }
       
@@ -106,7 +106,7 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
 	params.prepend(signature);
 	params.prepend(caller->objectName());
 	params.prepend(caller->metaObject()->className());
-	proxy->dispatchSignal((int)SignalProxy::Sync, params);
+	proxy->dispatchSignal(SignalProxy::Sync, params);
       }
     }
     _id -= QObject::staticMetaObject.methodCount();
@@ -279,8 +279,8 @@ void SignalProxy::objectRenamed(QString oldname, QString newname) {
     return;
   
   QVariantList params;
-  params << className << oldname << newname;
-  dispatchSignal("__objectRenamed__", params);
+  params << "__objectRenamed__" << className << oldname << newname;
+  dispatchSignal(RpcCall, params);
 }
 
 void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
@@ -523,7 +523,7 @@ void SignalProxy::requestInit(SyncableObject *obj) {
   QVariantList params;
   params << obj->metaObject()->className()
 	 << obj->objectName();
-  dispatchSignal((int)InitRequest, params);
+  dispatchSignal(InitRequest, params);
 }
 
 void SignalProxy::detachSender() {
@@ -568,17 +568,17 @@ void SignalProxy::stopSync(SyncableObject* obj) {
   }
 }
 
-void SignalProxy::dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList &params) {
+void SignalProxy::dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList &params) {
   QVariantList packedFunc;
-  packedFunc << identifier;
+  packedFunc << (qint16)requestType;
   packedFunc << params;
   writeDataToDevice(receiver, QVariant(packedFunc));
 }
 
-void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList &params) {
+void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
   // yes I know we have a little code duplication here... it's for the sake of performance
   QVariantList packedFunc;
-  packedFunc << identifier;
+  packedFunc << (qint16)requestType;
   packedFunc << params;
   foreach(QIODevice* dev, _peerByteCount.keys())
     writeDataToDevice(dev, QVariant(packedFunc));
@@ -606,7 +606,7 @@ void SignalProxy::receivePeerSignal(QIODevice *sender, const QVariant &packedFun
   case HeartBeat:
     return;
   default:
-    qWarning() << "SignalProxy::receivePeerSignal(): received undefined CallType" << callType;
+    qWarning() << "SignalProxy::receivePeerSignal(): received undefined CallType" << callType << params;
     return;
   }
 }
@@ -671,7 +671,7 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &param
 	  << obj->objectName()
 	  << initData(obj);
 
-  dispatchSignal(sender, (int)InitData, params_);
+  dispatchSignal(sender, InitData, params_);
 }
 
 void SignalProxy::handleInitData(QIODevice *sender, const QVariantList &params) {
@@ -845,7 +845,7 @@ void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties
 }
 
 void SignalProxy::sendHeartBeat() {
-  dispatchSignal((int)SignalProxy::HeartBeat, QVariantList());
+  dispatchSignal(SignalProxy::HeartBeat, QVariantList());
 }
 
 void SignalProxy::dumpProxyStats() {
diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 1c991aeb..e5bd0f6c 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -136,8 +136,8 @@ private:
 
   bool methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) const;
 
-  void dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList &params);
-  void dispatchSignal(const QVariant &identifier, const QVariantList &params);
+  void dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList &params);
+  void dispatchSignal(const RequestType &requestType, const QVariantList &params);
   
   void receivePeerSignal(QIODevice *sender, const QVariant &packedFunc);
   void handleSync(QVariantList params);
diff --git a/version.inc b/version.inc
index b6978d9e..f71334ed 100644
--- a/version.inc
+++ b/version.inc
@@ -5,14 +5,14 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-02-05";
-  quasselBuild = 463;
+  quasselBuild = 464;
 
   //! Minimum client build number the core needs
-  clientBuildNeeded = 462;
+  clientBuildNeeded = 464;
   clientVersionNeeded = quasselVersion;
 
   //! Minimum core build number the client needs
-  coreBuildNeeded = 462;
+  coreBuildNeeded = 464;
   coreVersionNeeded = quasselVersion;
 
 }