X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=59d6d51c3220beba812591e7f9a307b3c58eadba;hp=fdb952f73d581ec0937dd36fd87746fe94226496;hb=24acf1efa9e91c58d9e64d76e03e7683ac0ac889;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a diff --git a/src/core/coresession.h b/src/core/coresession.h index fdb952f7..59d6d51c 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -27,8 +27,8 @@ #include "corecoreinfo.h" #include "corealiasmanager.h" #include "coreignorelistmanager.h" +#include "protocol.h" #include "message.h" -#include "signalproxy.h" #include "storage.h" class CoreBacklogManager; @@ -44,9 +44,11 @@ class EventManager; class EventStringifier; class InternalPeer; class IrcParser; +class Peer; class MessageEvent; class NetworkConnection; class RemotePeer; +class SignalProxy; struct NetworkInfo; @@ -67,7 +69,7 @@ public: inline CoreNetworkConfig *networkConfig() const { return _networkConfig; } NetworkConnection *networkConnection(NetworkId) const; - QVariant sessionState(); + Protocol::SessionState sessionState() const; inline SignalProxy *signalProxy() const { return _signalProxy; } @@ -129,7 +131,7 @@ public slots: signals: void initialized(); - void sessionState(const QVariant &); + void sessionState(const Protocol::SessionState &sessionState); //void msgFromGui(uint netid, QString buf, QString message); void displayMsg(Message message); @@ -157,7 +159,7 @@ protected: virtual void customEvent(QEvent *event); private slots: - void removeClient(SignalProxy::AbstractPeer *peer); + void removeClient(Peer *peer); void recvStatusMsgFromServer(QString msg); void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None);