X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=e5bd0f6c13326a1b6707abd1f876628529efd264;hp=04ff7a5ed0c6dab53500facb76137c698554d23a;hb=287674ebe59cf8129645722693391f4b4ad8d240;hpb=a0754f069472a0ef611c191801d9f52b6357ef50 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 04ff7a5e..e5bd0f6c 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -28,6 +28,7 @@ #include #include #include +#include class SignalRelay; class SyncableObject; @@ -43,9 +44,11 @@ public: }; enum RequestType { - Sync = 0, + Sync = 1, + RpcCall, InitRequest, - InitData + InitData, + HeartBeat }; SignalProxy(QObject *parent); @@ -112,6 +115,7 @@ private slots: void removePeerBySender(); void objectRenamed(QString oldname, QString newname); void objectRenamed(QByteArray classname, QString oldname, QString newname); + 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 ¶ms); - void dispatchSignal(const QVariant &identifier, const QVariantList ¶ms); + void dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList ¶ms); + void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); void receivePeerSignal(QIODevice *sender, const QVariant &packedFunc); void handleSync(QVariantList params); @@ -170,6 +174,7 @@ private: ProxyMode _proxyMode; + QTimer _heartBeatTimer; friend class SignalRelay; };