Merging r780:786 from trunk to branches/0.3. Plus some work-in-progress.

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

diff --git a/src/client/client.h b/src/client/client.h
index 509b447..099d59b 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -30,11 +30,11 @@
 
 class BufferInfo;
 class Message;
+class MessageModel;
 
 class Identity;
 class Network;
 
-
 class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
@@ -49,7 +49,6 @@ struct NetworkInfo;
 
 class QTimer;
 
-
 class Client : public QObject {
   Q_OBJECT
 
@@ -126,6 +125,7 @@ signals:
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
+  void securedConnection();
   void disconnected();
   void coreConnectionStateChanged(bool);
 
@@ -189,6 +189,8 @@ private slots:
 
   void setConnectedToCore(QIODevice *socket, AccountId id);
   void setSyncedToCore();
+  void setSecuredConnection();
+
 
 private:
   Client(QObject *parent = 0);
@@ -213,6 +215,8 @@ private:
   ClientBacklogManager *_backlogManager;
   BufferViewManager *_bufferViewManager;
 
+  MessageModel *_messageModel;
+
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;