Post-merge cleanups, remove the old message handling

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

diff --git a/src/client/client.h b/src/client/client.h
index f7e0dc0..7c42784 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -30,25 +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
 
@@ -93,14 +92,15 @@ 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 bool isConnected();
   static bool isSynced();
 
@@ -123,6 +123,7 @@ signals:
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
+  void securedConnection();
   void disconnected();
   void coreConnectionStateChanged(bool);
 
@@ -175,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 &);
@@ -186,6 +185,8 @@ private slots:
 
   void setConnectedToCore(QIODevice *socket, AccountId id);
   void setSyncedToCore();
+  void setSecuredConnection();
+
 
 private:
   Client(QObject *parent = 0);
@@ -208,6 +209,10 @@ private:
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
   ClientBacklogManager *_backlogManager;
+  BufferViewManager *_bufferViewManager;
+  ClientIrcListHelper *_ircListHelper;
+
+  MessageModel *_messageModel;
 
   ClientMode clientMode;
 
@@ -220,9 +225,6 @@ private:
 
   Buffer *_monitorBuffer;
 
-  QTimer *layoutTimer;
-  QList<Buffer *> layoutQueue;
-
   static AccountId _currentCoreAccount;
 
   friend class ClientSyncer;