X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=4e7eb0e203bbb80304c57a32c3f9fb47d9a30285;hb=fd8d472f11d024b2df59027f719fbf3387315ec5;hp=509b447b9445752a0e710b68a144c5d568065edf;hpb=4e0445e459c690cfa6013c5ad574e94f9214827b;p=quassel.git diff --git a/src/client/client.h b/src/client/client.h index 509b447b..4e7eb0e2 100644 --- 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 @@ -94,6 +93,7 @@ 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; } @@ -126,6 +126,7 @@ signals: void showConfigWizard(const QVariantMap &coredata); void connected(); + void securedConnection(); void disconnected(); void coreConnectionStateChanged(bool); @@ -189,6 +190,8 @@ private slots: void setConnectedToCore(QIODevice *socket, AccountId id); void setSyncedToCore(); + void setSecuredConnection(); + private: Client(QObject *parent = 0); @@ -213,6 +216,8 @@ private: ClientBacklogManager *_backlogManager; BufferViewManager *_bufferViewManager; + MessageModel *_messageModel; + ClientMode clientMode; bool _connectedToCore, _syncedToCore; @@ -225,7 +230,7 @@ private: Buffer *_monitorBuffer; QTimer *layoutTimer; - QList layoutQueue; + QLinkedList layoutQueue; static AccountId _currentCoreAccount;