X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=7fefdadd352449e96e217d856b538e0ca3591cf4;hp=a40a1b6b3892ed22e02069b3bc69810c2b4994ba;hb=e50ae7a06fc4e5d3a911c361d30953410deab609;hpb=5b69d94edcbc2f985243b1f19744f7b03f6e283b diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index a40a1b6b..7fefdadd 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -26,7 +26,8 @@ #include "protocol.h" -class QMetaObject; +struct QMetaObject; +class QIODevice; class Peer; class SyncableObject; @@ -118,6 +119,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); @@ -125,10 +128,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;