Merge branch 'seezer'

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

diff --git a/src/client/client.h b/src/client/client.h
index 509b447..ad5740c 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -30,17 +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 ClientIrcListHelper;
 class BufferViewManager;
 class IrcUser;
 class IrcChannel;
@@ -49,7 +50,6 @@ struct NetworkInfo;
 
 class QTimer;
 
-
 class Client : public QObject {
   Q_OBJECT
 
@@ -94,9 +94,11 @@ 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();
@@ -126,6 +128,7 @@ signals:
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
+  void securedConnection();
   void disconnected();
   void coreConnectionStateChanged(bool);
 
@@ -189,6 +192,8 @@ private slots:
 
   void setConnectedToCore(QIODevice *socket, AccountId id);
   void setSyncedToCore();
+  void setSecuredConnection();
+
 
 private:
   Client(QObject *parent = 0);
@@ -212,6 +217,9 @@ private:
   BufferSyncer * _bufferSyncer;
   ClientBacklogManager *_backlogManager;
   BufferViewManager *_bufferViewManager;
+  ClientIrcListHelper *_ircListHelper;
+
+  MessageModel *_messageModel;
 
   ClientMode clientMode;
 
@@ -225,7 +233,7 @@ private:
   Buffer *_monitorBuffer;
 
   QTimer *layoutTimer;
-  QList<Buffer *> layoutQueue;
+  QLinkedList<Buffer *> layoutQueue;
 
   static AccountId _currentCoreAccount;