X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=f4d61668084ccea16c97c652af27e3d4eaa239c2;hb=f66bc9ecb5ebde376da256035db425d7dc0c74d0;hp=04ff7a5ed0c6dab53500facb76137c698554d23a;hpb=a0754f069472a0ef611c191801d9f52b6357ef50;p=quassel.git

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 04ff7a5e..f4d61668 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -28,6 +28,7 @@
 #include <QPair>
 #include <QString>
 #include <QByteArray>
+#include <QTimer>
 
 class SignalRelay;
 class SyncableObject;
@@ -43,9 +44,11 @@ public:
   };
 
   enum RequestType {
-    Sync = 0,
+    Sync = 1,
+    RpcCall,
     InitRequest,
-    InitData
+    InitData,
+    HeartBeat
   };
 
   SignalProxy(QObject *parent);
@@ -110,8 +113,9 @@ private slots:
   void dataAvailable();
   void detachSender();
   void removePeerBySender();
-  void objectRenamed(QString oldname, QString newname);
-  void objectRenamed(QByteArray classname, QString oldname, QString newname);
+  void objectRenamed(const QString &newname, const QString &oldname);
+  void objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname);
+  void sendHeartBeat();
 
 signals:
   void peerRemoved(QIODevice *obj);
@@ -132,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);
@@ -170,6 +174,7 @@ private:
 
 
   ProxyMode _proxyMode;
+  QTimer _heartBeatTimer;
   
   friend class SignalRelay;
 };