properly handling disconnects - this might even fix an antique bug with duplicate...

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

diff --git a/src/client/client.h b/src/client/client.h
index d8a2b4c..b8faf9f 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -18,17 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CLIENT_H_
-#define _CLIENT_H_
+#ifndef CLIENT_H_
+#define CLIENT_H_
 
 #include <QAbstractSocket>
 #include <QTcpSocket>
 #include <QList>
 #include <QPointer>
 
-#include "buffer.h" // needed for activity lvl
+#include "bufferinfo.h"
+#include "types.h"
 
-class BufferInfo;
 class Message;
 class MessageModel;
 class AbstractMessageProcessor;
@@ -43,6 +43,7 @@ class BufferModel;
 class BufferSyncer;
 class ClientBacklogManager;
 class ClientIrcListHelper;
+class ClientSyncer;
 class BufferViewManager;
 class IrcUser;
 class IrcChannel;
@@ -62,11 +63,6 @@ public:
   static void destroy();
   static void init(AbstractUi *);
 
-  static QList<BufferInfo> allBufferInfos();
-  static QList<Buffer *> buffers();
-  static Buffer *buffer(BufferId bufferUid);
-  static Buffer *buffer(BufferInfo);
-
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
 
@@ -82,9 +78,10 @@ public:
 
   //! Request update of an identity with the given data.
   /** The request will be sent to the core, and will be propagated back to all the clients.
-   *  \param identity The identity to be updated.
+   *  \param id The identity to be updated.
+   *  \param serializedData The identity's content (cf. SyncableObject::toVariantMap())
    */
-  static void updateIdentity(const Identity &identity);
+  static void updateIdentity(IdentityId id, const QVariantMap &serializedData);
 
   //! Request removal of the identity with the given ID from the core (and all the clients, of course).
   /** \param id The ID of the identity to be removed.
@@ -117,10 +114,6 @@ public:
 
 signals:
   void sendInput(BufferInfo, QString message);
-  void showBuffer(Buffer *);
-  void bufferUpdated(BufferInfo bufferInfo);
-  void backlogReceived(Buffer *, QList<Message>);
-  void requestBacklog(BufferInfo, QVariant, QVariant);
   void requestNetworkStates();
 
   void showConfigWizard(const QVariantMap &coredata);
@@ -145,8 +138,6 @@ signals:
 
   //! Sent to the core when an identity shall be created. Should not be used elsewhere.
   void requestCreateIdentity(const Identity &);
-  //! Sent to the core when an identity shall be updated. Should not be used elsewhere.
-  void requestUpdateIdentity(const Identity &);
   //! Sent to the core when an identity shall be removed. Should not be used elsewhere.
   void requestRemoveIdentity(IdentityId);
 
@@ -154,31 +145,24 @@ signals:
   void networkRemoved(NetworkId id);
 
   void requestCreateNetwork(const NetworkInfo &info);
-  void requestUpdateNetwork(const NetworkInfo &info);
   void requestRemoveNetwork(NetworkId);
 
+  void newClientSyncer(ClientSyncer *);
+
 public slots:
   //void selectBuffer(Buffer *);
 
   void disconnectFromCore();
 
-  void setCoreConfiguration(const QVariantMap &settings);
-
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
 
 private slots:
-  //void coreSocketError(QAbstractSocket::SocketError);
-
-  //void networkConnected(NetworkId);
-  //void networkDisconnected(NetworkId);
+  void disconnectedFromCore();
 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
-  void receiveBacklog(BufferId bufferId, const QVariantList &msgs);
-  void updateBufferInfo(BufferInfo);
 
-  void bufferDestroyed();
   void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
@@ -186,6 +170,7 @@ private slots:
   void coreNetworkRemoved(NetworkId);
 
   void setConnectedToCore(QIODevice *socket, AccountId id);
+  void setConnectedToInternalCore();
   void setSyncedToCore();
   void setSecuredConnection();
 
@@ -199,12 +184,8 @@ private:
   static void setCurrentCoreAccount(AccountId);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
-  Buffer *statusBuffer(const NetworkId &networkid) const;
-
   static QPointer<Client> instanceptr;
 
-  QPointer<QIODevice> socket;
-
   SignalProxy * _signalProxy;
   AbstractUi * mainUi;
   NetworkModel * _networkModel;
@@ -221,8 +202,6 @@ private:
 
   bool _connectedToCore, _syncedToCore;
 
-  QHash<BufferId, Buffer *> _buffers;
-  QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;