X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=32ae3a9247f2cf7c37df4cafb6bbe1ea43db05ef;hp=333479202300ef874c2c11a6abee2eea58b2a304;hb=453731c6d3c5eac2df5e98c4f179afabed4451a1;hpb=50706d89d4d60e258ebb6873d3778383621898e4

diff --git a/src/client/client.h b/src/client/client.h
index 33347920..32ae3a92 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -38,6 +38,9 @@ class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
+class IrcUser;
+class IrcChannel;
+class NickModel;
 class SignalProxy;
 
 class QTimer;
@@ -51,14 +54,14 @@ public:
   static void destroy();
   static void init(AbstractUi *);
 
-  static QList<Network *> networks();
-  static Network *network(uint networkid);
-
   static QList<BufferInfo> allBufferInfos();
   static QList<Buffer *> buffers();
-  static Buffer *buffer(uint bufferUid);
+  static Buffer *buffer(BufferId bufferUid);
   static Buffer *buffer(BufferInfo);
 
+  static QList<NetworkId> networkIds();
+  static const Network * network(NetworkId);
+
   static QList<IdentityId> identityIds();
   static const Identity * identity(IdentityId);
 
@@ -80,15 +83,21 @@ public:
    */
   static void removeIdentity(IdentityId id);
 
+  static void addNetwork(NetworkId id);
+  static void addNetwork(Network *);
+
+
   static NetworkModel *networkModel();
   static BufferModel *bufferModel();
+  static NickModel *nickModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
 
   static bool isConnected();
+  static bool isSynced();
 
-  static void fakeInput(uint bufferUid, QString message);
+  static void fakeInput(BufferId bufferUid, QString message);
   static void fakeInput(BufferInfo bufferInfo, QString message);
 
   static void storeSessionData(const QString &key, const QVariant &data);
@@ -105,11 +114,6 @@ signals:
   void requestBacklog(BufferInfo, QVariant, QVariant);
   void requestNetworkStates();
 
-  void recvPartialItem(uint avail, uint size);
-  void coreConnectionError(QString errorMsg);
-  void coreConnectionMsg(const QString &msg);
-  void coreConnectionProgress(uint part, uint total);
-
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
@@ -140,29 +144,27 @@ signals:
   //! Sent to the core when an identity shall be removed. Should not be used elsewhere.
   void requestRemoveIdentity(IdentityId);
 
+  void networkAdded(NetworkId id);
+
 public slots:
   //void selectBuffer(Buffer *);
-  //void connectToLocalCore();
-  void connectToCore(const QVariantMap &);
+
+  void setConnectedToCore(QIODevice *socket);
+  void setSyncedToCore();
   void disconnectFromCore();
 
   void setCoreConfiguration(const QVariantMap &settings);
 
+  void userInput(BufferInfo, QString);
+
 private slots:
-  void recvCoreState(const QVariant &state);
   void recvSessionData(const QString &key, const QVariant &data);
 
-  void coreSocketError(QAbstractSocket::SocketError);
-  void coreHasData();
-  void coreSocketConnected();
-  void coreSocketDisconnected();
+  //void coreSocketError(QAbstractSocket::SocketError);
 
-  void userInput(BufferInfo, QString);
-
-  void networkConnected(uint);
-  void networkDisconnected(uint);
+  //void networkConnected(NetworkId);
+  //void networkDisconnected(NetworkId);
 
-  void updateCoreConnectionProgress();
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
   void recvBacklogData(BufferInfo, QVariantList, bool);
@@ -180,7 +182,7 @@ private:
   virtual ~Client();
   void init();
 
-  void syncToCore(const QVariant &coreState);
+  void syncToCore(const QVariantMap &sessionState);
 
   static QPointer<Client> instanceptr;
 
@@ -189,15 +191,14 @@ private:
   QPointer<AbstractUi> mainUi;
   QPointer<NetworkModel> _networkModel;
   QPointer<BufferModel> _bufferModel;
+  QPointer<NickModel> _nickModel;
 
   ClientMode clientMode;
 
-  quint32 blockSize;
-  bool connectedToCore;
+  bool _connectedToCore, _syncedToCore;
 
-  QVariantMap coreConnectionInfo;
   QHash<BufferId, Buffer *> _buffers;
-  QHash<NetworkId, Network *> _network;
+  QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
   QTimer *layoutTimer;
@@ -205,7 +206,7 @@ private:
 
   QVariantMap sessionData;
 
-
+  friend class ClientSyncer;
 };
 
 #endif