X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=e401f463b4866a87e43833fa406b5903cadce86c;hp=57c49093e9043d0b8c75d2a62b4ff0f947ea13a4;hb=86bd6b1ffb870e65af6d830a2ea16471c348ed5a;hpb=08adbf35b56f8ce8cf3a8edf614aa0c67061e60f

diff --git a/src/client/client.h b/src/client/client.h
index 57c49093..e401f463 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -21,12 +21,12 @@
 #ifndef CLIENT_H_
 #define CLIENT_H_
 
-#include <QAbstractSocket>
-#include <QTcpSocket>
 #include <QList>
 #include <QPointer>
 
 #include "bufferinfo.h"
+#include "coreconnection.h"
+#include "quassel.h"
 #include "types.h"
 
 class Message;
@@ -46,9 +46,11 @@ 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;
@@ -112,16 +114,20 @@ public:
   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 inline Quassel::Features coreFeatures() { return _coreFeatures; }
 
   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 setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
+  static void setBufferMarkerLine(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
   static void renameBuffer(BufferId bufferId, const QString &newName);
   static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
@@ -130,8 +136,6 @@ 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 requestNetworkStates();
 
@@ -165,8 +169,6 @@ signals:
   void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   void requestRemoveNetwork(NetworkId);
 
-  void newClientSyncer(ClientSyncer *);
-
   void logUpdated(const QString &msg);
 
 public slots:
@@ -177,7 +179,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);
@@ -188,8 +192,6 @@ private slots:
   void coreNetworkCreated(NetworkId);
   void coreNetworkRemoved(NetworkId);
 
-  void setConnectedToCore(AccountId id, QIODevice *socket = 0);
-  void setSyncedToCore();
   void requestInitialBacklog();
   void createDefaultBufferView();
 
@@ -201,7 +203,7 @@ private:
   void init();
 
   static void addNetwork(Network *);
-  static void setCurrentCoreAccount(AccountId);
+  static void setCoreFeatures(Quassel::Features);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
   static QPointer<Client> instanceptr;
@@ -218,26 +220,28 @@ private:
   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;
+  static Quassel::Features _coreFeatures;
 
   QString _debugLogBuffer;
   QTextStream _debugLog;
 
   QList<QPair<BufferInfo, QString> > _userInputBuffer;
 
-  friend class ClientSyncer;
+  friend class CoreConnection;
 };
 
 #endif