X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=56083a96ba7fa120f72db1410ff398fd66d31f55;hb=b099603e2e1297ec41a354dc949729e4f77d7bbd;hp=0c9922a4a5f29ddb12d7a3b221dbd84aed92607f;hpb=ab16c77fe03b73a863d9b52b11919bcbac903f58;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index 0c9922a4..56083a96 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -21,12 +21,11 @@
 #ifndef CLIENT_H_
 #define CLIENT_H_
 
-#include <QAbstractSocket>
-#include <QTcpSocket>
 #include <QList>
 #include <QPointer>
 
 #include "bufferinfo.h"
+#include "coreconnection.h"
 #include "types.h"
 
 class Message;
@@ -46,11 +45,14 @@ class BufferViewOverlay;
 class ClientAliasManager;
 class ClientBacklogManager;
 class ClientBufferViewManager;
+class ClientIgnoreListManager;
 class ClientIrcListHelper;
-class ClientSyncer;
 class ClientUserInputHandler;
+class CoreAccountModel;
+class CoreConnection;
 class IrcUser;
 class IrcChannel;
+class NetworkConfig;
 class SignalProxy;
 struct NetworkInfo;
 
@@ -110,12 +112,15 @@ public:
   static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
   static inline BufferViewOverlay *bufferViewOverlay() { return instance()->_bufferViewOverlay; }
   static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; }
+  static inline NetworkConfig *networkConfig() { return instance()->_networkConfig; }
+  static inline ClientIgnoreListManager *ignoreListManager() { return instance()->_ignoreListManager; }
 
-  static AccountId currentCoreAccount();
+  static inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; }
+  static inline CoreConnection *coreConnection() { return instance()->_coreConnection; }
+  static inline CoreAccount currentCoreAccount() { return coreConnection()->currentAccount(); }
 
   static bool isConnected();
-  static bool isSynced();
-  static inline bool internalCore() { return instance()->_internalCore; }
+  static bool internalCore();
 
   static void userInput(const BufferInfo &bufferInfo, const QString &message);
 
@@ -128,10 +133,7 @@ public:
   static void logMessage(QtMsgType type, const char *msg);
   static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
 
-  static inline void registerClientSyncer(ClientSyncer *syncer) { emit instance()->newClientSyncer(syncer); }
-
 signals:
-  void requestInitialBacklog();
   void requestNetworkStates();
 
   void showConfigWizard(const QVariantMap &coredata);
@@ -164,8 +166,6 @@ signals:
   void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   void requestRemoveNetwork(NetworkId);
 
-  void newClientSyncer(ClientSyncer *);
-
   void logUpdated(const QString &msg);
 
 public slots:
@@ -176,7 +176,9 @@ public slots:
   void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
 
 private slots:
-  void disconnectedFromCore();
+  void setSyncedToCore();
+  void setDisconnectedFromCore();
+  void connectionStateChanged(CoreConnection::ConnectionState);
 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
@@ -187,9 +189,7 @@ private slots:
   void coreNetworkCreated(NetworkId);
   void coreNetworkRemoved(NetworkId);
 
-  void setConnectedToCore(AccountId id, QIODevice *socket = 0);
-  void setSyncedToCore();
-  void requestInitialBacklogBarrier();
+  void requestInitialBacklog();
   void createDefaultBufferView();
 
   void sendBufferedUserInput();
@@ -200,7 +200,6 @@ private:
   void init();
 
   static void addNetwork(Network *);
-  static void setCurrentCoreAccount(AccountId);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
   static QPointer<Client> instanceptr;
@@ -216,26 +215,28 @@ private:
   BufferViewOverlay *_bufferViewOverlay;
   ClientIrcListHelper *_ircListHelper;
   ClientUserInputHandler *_inputHandler;
+  NetworkConfig *_networkConfig;
+  ClientIgnoreListManager *_ignoreListManager;
 
   MessageModel *_messageModel;
   AbstractMessageProcessor *_messageProcessor;
 
-  ClientMode clientMode;
+  CoreAccountModel *_coreAccountModel;
+  CoreConnection *_coreConnection;
 
-  bool _connectedToCore, _syncedToCore;
-  bool _internalCore;
+  ClientMode clientMode;
 
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
-  static AccountId _currentCoreAccount;
+  bool _connected;
 
   QString _debugLogBuffer;
   QTextStream _debugLog;
 
   QList<QPair<BufferInfo, QString> > _userInputBuffer;
 
-  friend class ClientSyncer;
+  friend class CoreConnection;
 };
 
 #endif