X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=27224a3ac0a48849f8310634a80b9e5313270592;hp=220e8c837512238d9b529e10e3efa3390a82e2e3;hb=521a9e7155173db954ea5f32c93dd6933cd7aeda;hpb=6623fd2d46dadd0168e4e28d1db6944c26c2a773

diff --git a/src/client/client.h b/src/client/client.h
index 220e8c83..27224a3a 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,10 @@ 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();
-
   enum ClientMode { LocalCore, RemoteCore };
 
+  void checkForHighlight(Message &msg) const;
+  
 signals:
   void sendInput(BufferInfo, QString message);
   void showBuffer(Buffer *);
@@ -119,10 +119,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.
    */
@@ -153,21 +149,17 @@ signals:
 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);
   //void networkDisconnected(NetworkId);
 
-  void recvMessage(const Message &message);
+  void recvMessage(Message &message);
   void recvStatusMsg(QString network, QString message);
   void recvBacklogData(BufferInfo, QVariantList, bool);
   void updateBufferInfo(BufferInfo);
@@ -181,6 +173,9 @@ private slots:
   void coreNetworkCreated(NetworkId);
   void coreNetworkRemoved(NetworkId);
 
+  void setConnectedToCore(QIODevice *socket, AccountId id);
+  void setSyncedToCore();
+
 private:
   Client(QObject *parent = 0);
   virtual ~Client();
@@ -188,6 +183,8 @@ private:
 
   static void addNetwork(Network *);
 
+  static void setCurrentCoreAccount(AccountId);
+
   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;
@@ -209,7 +206,7 @@ private:
   QTimer *layoutTimer;
   QList<Buffer *> layoutQueue;
 
-  QVariantMap sessionData;
+  static AccountId _currentCoreAccount;
 
   friend class ClientSyncer;
 };