X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=509b447b9445752a0e710b68a144c5d568065edf;hb=d43df4abb53a5ea90fa8e7bc939bdcfb6fc141c3;hp=4d1bad6c1342f252464d29fa65995afbc92692a8;hpb=e9189ebd5af607385629d3aa74dc9fc15bb642f4;p=quassel.git diff --git a/src/client/client.h b/src/client/client.h index 4d1bad6c..509b447b 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -40,6 +40,8 @@ class AbstractUiMsg; class NetworkModel; class BufferModel; class BufferSyncer; +class ClientBacklogManager; +class BufferViewManager; class IrcUser; class IrcChannel; class SignalProxy; @@ -94,6 +96,9 @@ public: static inline BufferModel *bufferModel() { return instance()->_bufferModel; } static inline SignalProxy *signalProxy() { return instance()->_signalProxy; } + static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } + static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } + static AccountId currentCoreAccount(); static AbstractUiMsg *layoutMsg(const Message &); @@ -106,7 +111,7 @@ public: enum ClientMode { LocalCore, RemoteCore }; static void checkForHighlight(Message &msg); - static void setBufferLastSeen(BufferId id, const QDateTime &seen); // this is synced to core and other clients + static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients static void removeBuffer(BufferId id); signals: @@ -116,6 +121,7 @@ signals: void backlogReceived(Buffer *, QList); void requestBacklog(BufferInfo, QVariant, QVariant); void requestNetworkStates(); + void messageReceived(const Message &msg); void showConfigWizard(const QVariantMap &coredata); @@ -168,9 +174,9 @@ private slots: void recvMessage(const Message &message); void recvStatusMsg(QString network, QString message); - void recvBacklogData(BufferInfo, QVariantList, bool); + void receiveBacklog(BufferId bufferId, const QVariantList &msgs); void updateBufferInfo(BufferInfo); - void updateLastSeen(BufferId id, const QDateTime &lastSeen); + void updateLastSeenMsg(BufferId id, const MsgId &msgId); void layoutMsg(); @@ -204,6 +210,8 @@ private: NetworkModel * _networkModel; BufferModel * _bufferModel; BufferSyncer * _bufferSyncer; + ClientBacklogManager *_backlogManager; + BufferViewManager *_bufferViewManager; ClientMode clientMode;