Introduce CoreAccount and CoreAccountModel

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

diff --git a/src/client/client.h b/src/client/client.h
index 4787731..ff6b4d8 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -21,8 +21,6 @@
 #ifndef CLIENT_H_
 #define CLIENT_H_
 
-#include <QAbstractSocket>
-#include <QTcpSocket>
 #include <QList>
 #include <QPointer>
 
@@ -46,11 +44,14 @@ class BufferViewOverlay;
 class ClientAliasManager;
 class ClientBacklogManager;
 class ClientBufferViewManager;
+class ClientIgnoreListManager;
 class ClientIrcListHelper;
 class ClientSyncer;
 class ClientUserInputHandler;
+class CoreAccountModel;
 class IrcUser;
 class IrcChannel;
+class NetworkConfig;
 class SignalProxy;
 struct NetworkInfo;
 
@@ -110,7 +111,10 @@ 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 inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; }
   static AccountId currentCoreAccount();
 
   static bool isConnected();
@@ -199,7 +203,7 @@ private:
   void init();
 
   static void addNetwork(Network *);
-  static void setCurrentCoreAccount(AccountId);
+  static void setCurrentCoreAccount(const AccountId &);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
   static QPointer<Client> instanceptr;
@@ -215,10 +219,14 @@ private:
   BufferViewOverlay *_bufferViewOverlay;
   ClientIrcListHelper *_ircListHelper;
   ClientUserInputHandler *_inputHandler;
+  NetworkConfig *_networkConfig;
+  ClientIgnoreListManager *_ignoreListManager;
 
   MessageModel *_messageModel;
   AbstractMessageProcessor *_messageProcessor;
 
+  CoreAccountModel *_coreAccountModel;
+
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;