Merging r732:766 from trunk to branches/0.3.

[quassel.git] / src / client / client.h

diff --git a/src/client/client.h b/src/client/client.h
index 21e6102..b7e079e 100644 (file)
--- 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,10 +121,12 @@ signals:
   void backlogReceived(Buffer *, QList<Message>);
   void requestBacklog(BufferInfo, QVariant, QVariant);
   void requestNetworkStates();
+  void messageReceived(const Message &msg);
 
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
+  void securedConnection();
   void disconnected();
   void coreConnectionStateChanged(bool);
 
@@ -168,9 +175,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();
 
@@ -183,6 +190,8 @@ private slots:
 
   void setConnectedToCore(QIODevice *socket, AccountId id);
   void setSyncedToCore();
+  void setSecuredConnection();
+
 
 private:
   Client(QObject *parent = 0);
@@ -193,6 +202,8 @@ private:
   static void setCurrentCoreAccount(AccountId);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
+  Buffer *statusBuffer(const NetworkId &networkid) const;
+
   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;
@@ -202,12 +213,15 @@ private:
   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
+  ClientBacklogManager *_backlogManager;
+  BufferViewManager *_bufferViewManager;
 
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;
 
   QHash<BufferId, Buffer *> _buffers;
+  QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;