X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=4e7eb0e203bbb80304c57a32c3f9fb47d9a30285;hb=dbdca302fc349d0e3d46aa0d8091c08b2df28af5;hp=30a3d164ddc7847176d9ff66ed91cde7d07318b5;hpb=e0872cf3b3cdb8c52c5a52f32c3140143a29409d;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index 30a3d164..4e7eb0e2 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -30,16 +30,18 @@
 
 class BufferInfo;
 class Message;
+class MessageModel;
 
 class Identity;
 class Network;
 
-
 class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
 class BufferSyncer;
+class ClientBacklogManager;
+class BufferViewManager;
 class IrcUser;
 class IrcChannel;
 class SignalProxy;
@@ -47,7 +49,6 @@ struct NetworkInfo;
 
 class QTimer;
 
-
 class Client : public QObject {
   Q_OBJECT
 
@@ -62,8 +63,6 @@ public:
   static Buffer *buffer(BufferInfo);
   static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
 
-  Buffer *statusBuffer(const NetworkId &networkid) const;
-
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
 
@@ -94,8 +93,12 @@ public:
 
   static inline NetworkModel *networkModel() { return instance()->_networkModel; }
   static inline BufferModel *bufferModel() { return instance()->_bufferModel; }
+  static inline MessageModel *messageModel() { return instance()->_messageModel; }
   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 &);
@@ -108,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:
@@ -118,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);
 
@@ -170,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();
 
@@ -185,6 +190,8 @@ private slots:
 
   void setConnectedToCore(QIODevice *socket, AccountId id);
   void setSyncedToCore();
+  void setSecuredConnection();
+
 
 private:
   Client(QObject *parent = 0);
@@ -195,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;
@@ -204,6 +213,10 @@ private:
   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
+  ClientBacklogManager *_backlogManager;
+  BufferViewManager *_bufferViewManager;
+
+  MessageModel *_messageModel;
 
   ClientMode clientMode;
 
@@ -217,7 +230,7 @@ private:
   Buffer *_monitorBuffer;
 
   QTimer *layoutTimer;
-  QList<Buffer *> layoutQueue;
+  QLinkedList<Buffer *> layoutQueue;
 
   static AccountId _currentCoreAccount;