X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=4df6685d57828ef24a1a34bd0905bbdf7ea2f1e0;hp=53ad0b5b5274df11f5ef4e938b1fbc5b84a0028d;hb=08aac67d4dc813ed541a81d06fb83d9c4fec5834;hpb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27

diff --git a/src/client/client.h b/src/client/client.h
index 53ad0b5b..4df6685d 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,15 +54,13 @@ 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 BufferInfo statusBufferInfo(QString net);
-  static BufferInfo bufferInfo(QString net, QString buf);
+
+  static QList<NetworkId> networkIds();
+  static const Network * network(NetworkId);
 
   static QList<IdentityId> identityIds();
   static const Identity * identity(IdentityId);
@@ -82,16 +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(BufferInfo bufferInfo, QString message);
+  static void userInput(BufferInfo bufferInfo, QString message);
 
   static void storeSessionData(const QString &key, const QVariant &data);
   static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
@@ -102,18 +108,11 @@ public:
 signals:
   void sendInput(BufferInfo, QString message);
   void showBuffer(Buffer *);
-  void bufferSelected(Buffer *);
-  void bufferUpdated(Buffer *);
-  void bufferActivity(Buffer::ActivityLevel, Buffer *);
+  void bufferUpdated(BufferInfo bufferInfo);
   void backlogReceived(Buffer *, QList<Message>);
   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();
@@ -144,29 +143,25 @@ 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);
 
 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(NetworkId);
+  //void networkDisconnected(NetworkId);
 
-  void networkConnected(uint);
-  void networkDisconnected(uint);
-
-  void updateCoreConnectionProgress();
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
   void recvBacklogData(BufferInfo, QVariantList, bool);
@@ -176,7 +171,6 @@ private slots:
 
   void bufferDestroyed();
   void networkDestroyed();
-  void ircChannelAdded(QString);
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
 
@@ -185,7 +179,7 @@ private:
   virtual ~Client();
   void init();
 
-  void syncToCore(const QVariant &coreState);
+  void syncToCore(const QVariantMap &sessionState);
 
   static QPointer<Client> instanceptr;
 
@@ -194,15 +188,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;
@@ -210,7 +203,7 @@ private:
 
   QVariantMap sessionData;
 
-
+  friend class ClientSyncer;
 };
 
 #endif