Committing a whole bunch of Identity-related stuff that's not actually used yet,

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

diff --git a/src/client/client.h b/src/client/client.h
index 2f3d907..60aa7c1 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -5,7 +5,7 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -30,12 +30,13 @@
 class BufferInfo;
 class Message;
 
+class Identity;
 class NetworkInfo;
 
 
 class AbstractUi;
 class AbstractUiMsg;
-class BufferTreeModel;
+class NetworkModel;
 class SignalProxy;
 
 class QTimer;
@@ -51,7 +52,7 @@ public:
 
   static QList<NetworkInfo *> networkInfos();
   static NetworkInfo *networkInfo(uint networkid);
-  
+
   static QList<BufferInfo> allBufferInfos();
   static QList<Buffer *> buffers();
   static Buffer *buffer(uint bufferUid);
@@ -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 &);
@@ -68,7 +90,7 @@ public:
 
   static void fakeInput(uint bufferUid, QString message);
   static void fakeInput(BufferInfo bufferInfo, QString message);
-  
+
   static void storeSessionData(const QString &key, const QVariant &data);
   static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
   static QStringList sessionDataKeys();
@@ -89,22 +111,43 @@ signals:
   void coreConnectionError(QString errorMsg);
   void coreConnectionMsg(const QString &msg);
   void coreConnectionProgress(uint part, uint total);
-    
+
   void showConfigWizard(const QVariantMap &coredata);
 
   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();
   void connectToCore(const QVariantMap &);
   void disconnectFromCore();
-    
+
   void setCoreConfiguration(const QVariantMap &settings);
 
 private slots:
@@ -129,32 +172,35 @@ 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);
   virtual ~Client();
   void init();
-  
+
   void syncToCore(const QVariant &coreState);
 
   static QPointer<Client> instanceptr;
-  
+
   QPointer<QIODevice> socket;
   QPointer<SignalProxy> _signalProxy;
   QPointer<AbstractUi> mainUi;
-  QPointer<BufferTreeModel> _bufferModel;
+  QPointer<NetworkModel> _networkModel;
 
   ClientMode clientMode;
 
   quint32 blockSize;
   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;