X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=e0ad4eced9ae38a8298a426bf43d726100afbcca;hp=c1463e59902acb4a771f7cfff26027dca2df6296;hb=16c2a9940b223cf5538efdcb8a6eb011b8258150;hpb=3fc04ffe0543821e7d1ef3397288d423a7b589b8

diff --git a/src/client/client.h b/src/client/client.h
index c1463e59..e0ad4ece 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -27,8 +27,10 @@
 #include <QPointer>
 
 #include "buffer.h" // needed for activity lvl
+
 class BufferInfo;
 class Message;
+class MessageModel;
 
 class Identity;
 class Network;
@@ -38,6 +40,9 @@ class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
+class BufferSyncer;
+class ClientBacklogManager;
+class BufferViewManager;
 class IrcUser;
 class IrcChannel;
 class SignalProxy;
@@ -45,7 +50,6 @@ struct NetworkInfo;
 
 class QTimer;
 
-
 class Client : public QObject {
   Q_OBJECT
 
@@ -58,7 +62,7 @@ public:
   static QList<Buffer *> buffers();
   static Buffer *buffer(BufferId bufferUid);
   static Buffer *buffer(BufferInfo);
-  static Buffer *monitorBuffer();
+  static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
@@ -88,10 +92,13 @@ public:
   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 
-  static NetworkModel *networkModel();
-  static BufferModel *bufferModel();
-  static SignalProxy *signalProxy();
+  static inline NetworkModel *networkModel() { return instance()->_networkModel; }
+  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 &);
@@ -103,8 +110,10 @@ public:
 
   enum ClientMode { LocalCore, RemoteCore };
 
-  void checkForHighlight(Message &msg) const;
-  
+  static void checkForHighlight(Message &msg);
+  static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
+  static void removeBuffer(BufferId id);
+
 signals:
   void sendInput(BufferInfo, QString message);
   void showBuffer(Buffer *);
@@ -112,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);
 
@@ -153,6 +164,9 @@ public slots:
 
   void setCoreConfiguration(const QVariantMap &settings);
 
+  void bufferRemoved(BufferId bufferId);
+  void bufferRenamed(BufferId bufferId, const QString &newName);
+
 private slots:
   //void coreSocketError(QAbstractSocket::SocketError);
 
@@ -161,8 +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 updateLastSeenMsg(BufferId id, const MsgId &msgId);
 
   void layoutMsg();
 
@@ -175,6 +190,8 @@ private slots:
 
   void setConnectedToCore(QIODevice *socket, AccountId id);
   void setSyncedToCore();
+  void setSecuredConnection();
+
 
 private:
   Client(QObject *parent = 0);
@@ -182,22 +199,31 @@ private:
   void init();
 
   static void addNetwork(Network *);
-
   static void setCurrentCoreAccount(AccountId);
+  static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
+
+  Buffer *statusBuffer(const NetworkId &networkid) const;
 
   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;
-  QPointer<SignalProxy> _signalProxy;
-  QPointer<AbstractUi> mainUi;
-  QPointer<NetworkModel> _networkModel;
-  QPointer<BufferModel> _bufferModel;
+
+  SignalProxy * _signalProxy;
+  AbstractUi * mainUi;
+  NetworkModel * _networkModel;
+  BufferModel * _bufferModel;
+  BufferSyncer * _bufferSyncer;
+  ClientBacklogManager *_backlogManager;
+  BufferViewManager *_bufferViewManager;
+
+  MessageModel *_messageModel;
 
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;
 
   QHash<BufferId, Buffer *> _buffers;
+  QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;