X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=9a64526e92e890d44364f93797abc24d6e202ec5;hb=6447ec038a9553427fb729f5889c69e0f2f247a8;hp=d13001a48d8e4c065ab1aeec7649c2b058a76117;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index d13001a4..9a64526e 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -30,12 +30,13 @@
 class BufferInfo;
 class Message;
 
+class Identity;
 class NetworkInfo;
 
 
 class AbstractUi;
 class AbstractUiMsg;
-class BufferTreeModel;
+class NetworkModel;
 class SignalProxy;
 
 class QTimer;
@@ -59,7 +60,28 @@ public:
   static BufferInfo statusBufferInfo(QString net);
   static BufferInfo bufferInfo(QString net, QString buf);
 
-  static BufferTreeModel *bufferModel();
+  static QList<IdentityId> identityIds();
+  static const Identity * identity(IdentityId);
+
+  //! Request creation of an identity with the given data.
+  /** The request will be sent to the core, and will be propagated back to all the clients
+   *  with a new valid IdentityId.
+   *  \param identity The identity template for the new identity. It does not need to have a valid ID.
+   */
+  static void createIdentity(const Identity &identity);
+
+  //! 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.
+   */
+  static void updateIdentity(const Identity &identity);
+
+  //! 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.
+   */
+  static void removeIdentity(IdentityId id);
+
+  static NetworkModel *networkModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
@@ -94,11 +116,32 @@ signals:
 
   void connected();
   void disconnected();
+  void coreConnectionStateChanged(bool);
 
   void sessionDataChanged(const QString &key);
   void sessionDataChanged(const QString &key, const QVariant &data);
   void sendSessionData(const QString &key, const QVariant &data);
 
+  //! The identity with the given ID has been newly created in core and client.
+  /** \param id The ID of the newly created identity.
+   */
+  void identityCreated(IdentityId id);
+
+  //! The identity with the given ID has been removed.
+  /** Upon emitting this signal, the identity is already gone from the core, and it will
+   *  be deleted from the client immediately afterwards, so connected slots need to clean
+   *  up their stuff.
+   *  \param id The ID of the identity about to be removed.
+   */
+  void identityRemoved(IdentityId id);
+
+  //! 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);
+
 public slots:
   //void selectBuffer(Buffer *);
   //void connectToLocalCore();
@@ -129,10 +172,11 @@ private slots:
 
   void layoutMsg();
 
-private slots:
   void bufferDestroyed();
   void networkInfoDestroyed();
   void ircChannelAdded(QString);
+  void coreIdentityCreated(const Identity &);
+  void coreIdentityRemoved(IdentityId);
 
 private:
   Client(QObject *parent = 0);
@@ -146,7 +190,7 @@ private:
   QPointer<QIODevice> socket;
   QPointer<SignalProxy> _signalProxy;
   QPointer<AbstractUi> mainUi;
-  QPointer<BufferTreeModel> _bufferModel;
+  QPointer<NetworkModel> _networkModel;
 
   ClientMode clientMode;
 
@@ -154,8 +198,9 @@ private:
   bool connectedToCore;
 
   QVariantMap coreConnectionInfo;
-  QHash<uint, Buffer *> _buffers;
-  QHash<uint, NetworkInfo*> _networkInfo;
+  QHash<BufferId, Buffer *> _buffers;
+  QHash<NetworkId, NetworkInfo *> _networkInfo;
+  QHash<IdentityId, Identity *> _identities;
 
   QTimer *layoutTimer;
   QList<Buffer *> layoutQueue;