X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=9297ae8127d1505733249e953fdc7875547430f1;hp=a1f9e714b4e66d1d2b8b1c0c2a9e5701f7d214c8;hb=2a89d1b0c473f92c5cf9fb803d99e8b51b2c68e7;hpb=fd25e92f19d6afd4eb02844bcbf20ba132868303 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index a1f9e714..9297ae81 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -21,21 +21,12 @@ #ifndef SIGNALPROXY_H #define SIGNALPROXY_H -#include #include -#include -#include -#include -#include -#include #include -#include -#include -#include #include "protocol.h" -class QMetaObject; +struct QMetaObject; class Peer; class SyncableObject; @@ -127,6 +118,8 @@ private: template void dispatch(const T &protoMessage); + template + void dispatch(Peer *peer, const T &protoMessage); void handle(Peer *peer, const Protocol::SyncMessage &syncMessage); void handle(Peer *peer, const Protocol::RpcCall &rpcCall); @@ -134,10 +127,10 @@ private: void handle(Peer *peer, const Protocol::InitData &initData); template - void handle(Peer *peer, T) { Q_ASSERT(0); } + void handle(Peer *, T) { Q_ASSERT(0); } - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue); - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList()); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue, Peer *peer = 0); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList(), Peer *peer = 0); void requestInit(SyncableObject *obj); QVariantMap initData(SyncableObject *obj) const;