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

diff --git a/src/client/client.h b/src/client/client.h
index 220e8c83..c7e3ae1e 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -27,6 +27,7 @@
 #include <QPointer>
 
 #include "buffer.h" // needed for activity lvl
+
 class BufferInfo;
 class Message;
 
@@ -38,6 +39,7 @@ class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
+class BufferSyncer;
 class IrcUser;
 class IrcChannel;
 class SignalProxy;
@@ -58,7 +60,7 @@ public:
   static QList<Buffer *> buffers();
   static Buffer *buffer(BufferId bufferUid);
   static Buffer *buffer(BufferInfo);
-  static Buffer *monitorBuffer();
+  static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
@@ -88,9 +90,12 @@ public:
   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 
-  static NetworkModel *networkModel();
-  static BufferModel *bufferModel();
-  static SignalProxy *signalProxy();
+  static inline NetworkModel *networkModel() { return instance()->_networkModel; }
+  static inline BufferModel *bufferModel() { return instance()->_bufferModel; }
+  static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
+  static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
+
+  static AccountId currentCoreAccount();
 
   static AbstractUiMsg *layoutMsg(const Message &);
 
@@ -99,12 +104,11 @@ 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 };
 
+  static void checkForHighlight(Message &msg);
+  static void setBufferLastSeen(BufferId id, const QDateTime &seen); // this is synced to core and other clients
+
 signals:
   void sendInput(BufferInfo, QString message);
   void showBuffer(Buffer *);
@@ -119,10 +123,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,15 +153,13 @@ 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 bufferRemoved(BufferId bufferId);
 
+private slots:
   //void coreSocketError(QAbstractSocket::SocketError);
 
   //void networkConnected(NetworkId);
@@ -171,6 +169,7 @@ private slots:
   void recvStatusMsg(QString network, QString message);
   void recvBacklogData(BufferInfo, QVariantList, bool);
   void updateBufferInfo(BufferInfo);
+  void updateLastSeen(BufferId id, const QDateTime &lastSeen);
 
   void layoutMsg();
 
@@ -181,6 +180,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,13 +190,17 @@ private:
 
   static void addNetwork(Network *);
 
+  static void setCurrentCoreAccount(AccountId);
+
   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;
-  QPointer<SignalProxy> _signalProxy;
-  QPointer<AbstractUi> mainUi;
-  QPointer<NetworkModel> _networkModel;
-  QPointer<BufferModel> _bufferModel;
+
+  SignalProxy * _signalProxy;
+  AbstractUi * mainUi;
+  NetworkModel * _networkModel;
+  BufferModel * _bufferModel;
+  BufferSyncer * _bufferSyncer;
 
   ClientMode clientMode;
 
@@ -209,7 +215,7 @@ private:
   QTimer *layoutTimer;
   QList<Buffer *> layoutQueue;
 
-  QVariantMap sessionData;
+  static AccountId _currentCoreAccount;
 
   friend class ClientSyncer;
 };