Switch over to CoreConnection

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

diff --git a/src/client/client.h b/src/client/client.h
index ff6b4d8..a516e25 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -25,6 +25,7 @@
 #include <QPointer>
 
 #include "bufferinfo.h"
 #include <QPointer>
 
 #include "bufferinfo.h"

+#include "coreconnection.h"

 #include "types.h"
 
 class Message;
 #include "types.h"
 
 class Message;


@@ -46,9 +47,9 @@ class ClientBacklogManager;
 class ClientBufferViewManager;
 class ClientIgnoreListManager;
 class ClientIrcListHelper;
 class ClientBufferViewManager;
 class ClientIgnoreListManager;
 class ClientIrcListHelper;

-class ClientSyncer;

 class ClientUserInputHandler;
 class CoreAccountModel;
 class ClientUserInputHandler;
 class CoreAccountModel;

+class CoreConnection;

 class IrcUser;
 class IrcChannel;
 class NetworkConfig;
 class IrcUser;
 class IrcChannel;
 class NetworkConfig;


@@ -115,11 +116,12 @@ public:
   static inline ClientIgnoreListManager *ignoreListManager() { return instance()->_ignoreListManager; }
 
   static inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; }
   static inline ClientIgnoreListManager *ignoreListManager() { return instance()->_ignoreListManager; }
 
   static inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; }

-  static AccountId currentCoreAccount();
+  static inline CoreConnection *coreConnection() { return instance()->_coreConnection; }
+  static inline CoreAccount currentCoreAccount() { return coreConnection()->currentAccount(); }

 
   static bool isConnected();
   static bool isSynced();
 
   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);
 
 
   static void userInput(const BufferInfo &bufferInfo, const QString &message);
 


@@ -132,8 +134,6 @@ public:
   static void logMessage(QtMsgType type, const char *msg);
   static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
 
   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 requestNetworkStates();
 
 signals:
   void requestNetworkStates();
 


@@ -167,8 +167,6 @@ signals:
   void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   void requestRemoveNetwork(NetworkId);
 
   void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   void requestRemoveNetwork(NetworkId);
 

-  void newClientSyncer(ClientSyncer *);
-

   void logUpdated(const QString &msg);
 
 public slots:
   void logUpdated(const QString &msg);
 
 public slots:


@@ -179,7 +177,9 @@ public slots:
   void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
 
 private 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);
 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);


@@ -190,8 +190,6 @@ private slots:
   void coreNetworkCreated(NetworkId);
   void coreNetworkRemoved(NetworkId);
 
   void coreNetworkCreated(NetworkId);
   void coreNetworkRemoved(NetworkId);
 

-  void setConnectedToCore(AccountId id, QIODevice *socket = 0);
-  void setSyncedToCore();

   void requestInitialBacklog();
   void createDefaultBufferView();
 
   void requestInitialBacklog();
   void createDefaultBufferView();
 


@@ -203,7 +201,6 @@ private:
   void init();
 
   static void addNetwork(Network *);
   void init();
 
   static void addNetwork(Network *);

-  static void setCurrentCoreAccount(const AccountId &);

   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
   static QPointer<Client> instanceptr;
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
   static QPointer<Client> instanceptr;


@@ -226,23 +223,19 @@ private:
   AbstractMessageProcessor *_messageProcessor;
 
   CoreAccountModel *_coreAccountModel;
   AbstractMessageProcessor *_messageProcessor;
 
   CoreAccountModel *_coreAccountModel;

+  CoreConnection *_coreConnection;

 
   ClientMode clientMode;
 
 
   ClientMode clientMode;
 

-  bool _connectedToCore, _syncedToCore;
-  bool _internalCore;
-

   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 

-  static AccountId _currentCoreAccount;
-

   QString _debugLogBuffer;
   QTextStream _debugLog;
 
   QList<QPair<BufferInfo, QString> > _userInputBuffer;
 
   QString _debugLogBuffer;
   QTextStream _debugLog;
 
   QList<QPair<BufferInfo, QString> > _userInputBuffer;
 

-  friend class ClientSyncer;
+  friend class CoreConnection;

 };
 
 #endif
 };
 
 #endif