X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fclient.h;h=7c42784424de8d48890181e9c5f4b34292098d4c;hb=e1b6d538b7c4cc279f9218614e23adb5d8a81fe5;hp=bd31c32249c0c07a17346878aab6b8db4f338933;hpb=374ea2a5188930b880ad67584a9b0055022feecf;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index bd31c322..7c427844 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -30,26 +30,24 @@
 
 class BufferInfo;
 class Message;
+class MessageModel;
 
 class Identity;
 class Network;
 
-
 class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
 class BufferSyncer;
 class ClientBacklogManager;
+class ClientIrcListHelper;
 class BufferViewManager;
 class IrcUser;
 class IrcChannel;
 class SignalProxy;
 struct NetworkInfo;
 
-class QTimer;
-
-
 class Client : public QObject {
   Q_OBJECT
 
@@ -94,14 +92,14 @@ 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 ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
   static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
-  
-  static AccountId currentCoreAccount();
 
-  static AbstractUiMsg *layoutMsg(const Message &);
+  static AccountId currentCoreAccount();
 
   static bool isConnected();
   static bool isSynced();
@@ -121,7 +119,6 @@ signals:
   void backlogReceived(Buffer *, QList<Message>);
   void requestBacklog(BufferInfo, QVariant, QVariant);
   void requestNetworkStates();
-  void messageReceived(const Message &msg);
 
   void showConfigWizard(const QVariantMap &coredata);
 
@@ -179,8 +176,6 @@ private slots:
   void updateBufferInfo(BufferInfo);
   void updateLastSeenMsg(BufferId id, const MsgId &msgId);
 
-  void layoutMsg();
-
   void bufferDestroyed();
   void networkDestroyed();
   void coreIdentityCreated(const Identity &);
@@ -215,6 +210,9 @@ private:
   BufferSyncer * _bufferSyncer;
   ClientBacklogManager *_backlogManager;
   BufferViewManager *_bufferViewManager;
+  ClientIrcListHelper *_ircListHelper;
+
+  MessageModel *_messageModel;
 
   ClientMode clientMode;
 
@@ -227,9 +225,6 @@ private:
 
   Buffer *_monitorBuffer;
 
-  QTimer *layoutTimer;
-  QLinkedList<Buffer *> layoutQueue;
-
   static AccountId _currentCoreAccount;
 
   friend class ClientSyncer;