X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=d6ae6c08d4c3683bc19342ca14f547eb6a2d2a57;hb=7a6e882282779ac24e015c53e3d9fc746c08063d;hp=26e67cc5d504bfa9a83a02f40ff1be726692444e;hpb=d1b6499b0b848d4287efae89107576548533502c;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index 26e67cc5..d6ae6c08 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -40,8 +40,8 @@ class NetworkModel;
 class BufferModel;
 class IrcUser;
 class IrcChannel;
-class NickModel;
 class SignalProxy;
+struct NetworkInfo;
 
 class QTimer;
 
@@ -54,13 +54,14 @@ public:
   static void destroy();
   static void init(AbstractUi *);
 
-  static QList<Network *> networks();
-  static Network *network(NetworkId networkid);
-
   static QList<BufferInfo> allBufferInfos();
   static QList<Buffer *> buffers();
   static Buffer *buffer(BufferId bufferUid);
   static Buffer *buffer(BufferInfo);
+  static Buffer *monitorBuffer();
+
+  static QList<NetworkId> networkIds();
+  static const Network * network(NetworkId);
 
   static QList<IdentityId> identityIds();
   static const Identity * identity(IdentityId);
@@ -83,13 +84,12 @@ public:
    */
   static void removeIdentity(IdentityId id);
 
-  static void addNetwork(NetworkId id);
-  static void addNetwork(Network *);
-
+  static void createNetwork(const NetworkInfo &info);
+  static void updateNetwork(const NetworkInfo &info);
+  static void removeNetwork(NetworkId id);
 
   static NetworkModel *networkModel();
   static BufferModel *bufferModel();
-  static NickModel *nickModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
@@ -97,12 +97,7 @@ public:
   static bool isConnected();
   static bool isSynced();
 
-  static void fakeInput(BufferId 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();
+  static void userInput(BufferInfo bufferInfo, QString message);
 
   enum ClientMode { LocalCore, RemoteCore };
 
@@ -120,10 +115,6 @@ signals:
   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.
    */
@@ -144,6 +135,13 @@ signals:
   //! Sent to the core when an identity shall be removed. Should not be used elsewhere.
   void requestRemoveIdentity(IdentityId);
 
+  void networkCreated(NetworkId id);
+  void networkRemoved(NetworkId id);
+
+  void requestCreateNetwork(const NetworkInfo &info);
+  void requestUpdateNetwork(const NetworkInfo &info);
+  void requestRemoveNetwork(NetworkId);
+
 public slots:
   //void selectBuffer(Buffer *);
 
@@ -153,14 +151,9 @@ public slots:
 
   void setCoreConfiguration(const QVariantMap &settings);
 
-
 private slots:
-  void recvSessionData(const QString &key, const QVariant &data);
-
   //void coreSocketError(QAbstractSocket::SocketError);
 
-  void userInput(BufferInfo, QString);
-
   //void networkConnected(NetworkId);
   //void networkDisconnected(NetworkId);
 
@@ -175,13 +168,15 @@ private slots:
   void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
+  void coreNetworkCreated(NetworkId);
+  void coreNetworkRemoved(NetworkId);
 
 private:
   Client(QObject *parent = 0);
   virtual ~Client();
   void init();
 
-  void syncToCore(const QVariantMap &sessionState);
+  static void addNetwork(Network *);
 
   static QPointer<Client> instanceptr;
 
@@ -190,7 +185,6 @@ private:
   QPointer<AbstractUi> mainUi;
   QPointer<NetworkModel> _networkModel;
   QPointer<BufferModel> _bufferModel;
-  QPointer<NickModel> _nickModel;
 
   ClientMode clientMode;
 
@@ -200,11 +194,11 @@ private:
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
+  Buffer *_monitorBuffer;
+
   QTimer *layoutTimer;
   QList<Buffer *> layoutQueue;
 
-  QVariantMap sessionData;
-
   friend class ClientSyncer;
 };