X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=40bf332d5c22bac0fb4f804d9e16311cece5de72;hb=1bd0b3710fe361c778bc5b5a726353e205d16eaf;hp=f2b3ec3c5a5cfb46f8ba8de8cc5d23335c4da458;hpb=7f8acf4ede38a0178a97eb701a9382e455ca7c2d;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index f2b3ec3c..40bf332d 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -92,6 +92,8 @@ public:
   static BufferModel *bufferModel();
   static SignalProxy *signalProxy();
 
+  static AccountId currentCoreAccount();
+
   static AbstractUiMsg *layoutMsg(const Message &);
 
   static bool isConnected();
@@ -99,12 +101,6 @@ public:
 
   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());
-  static QStringList sessionDataKeys();
-
-  static void disconnectFromNetwork(NetworkId);
-
   enum ClientMode { LocalCore, RemoteCore };
 
 signals:
@@ -121,10 +117,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.
    */
@@ -150,20 +142,16 @@ signals:
 
   void requestCreateNetwork(const NetworkInfo &info);
   void requestUpdateNetwork(const NetworkInfo &info);
-  void requestRemoveNetwork(const NetworkInfo &info);
+  void requestRemoveNetwork(NetworkId);
 
 public slots:
   //void selectBuffer(Buffer *);
 
-  void setConnectedToCore(QIODevice *socket);
-  void setSyncedToCore();
   void disconnectFromCore();
 
   void setCoreConfiguration(const QVariantMap &settings);
 
 private slots:
-  void recvSessionData(const QString &key, const QVariant &data);
-
   //void coreSocketError(QAbstractSocket::SocketError);
 
   //void networkConnected(NetworkId);
@@ -180,6 +168,11 @@ private slots:
   void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
+  void coreNetworkCreated(NetworkId);
+  void coreNetworkRemoved(NetworkId);
+
+  void setConnectedToCore(QIODevice *socket, AccountId id);
+  void setSyncedToCore();
 
 private:
   Client(QObject *parent = 0);
@@ -188,6 +181,8 @@ private:
 
   static void addNetwork(Network *);
 
+  static void setCurrentCoreAccount(AccountId);
+
   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;
@@ -209,7 +204,7 @@ private:
   QTimer *layoutTimer;
   QList<Buffer *> layoutQueue;
 
-  QVariantMap sessionData;
+  static AccountId _currentCoreAccount;
 
   friend class ClientSyncer;
 };