fixing the creating of new buffers in the client. bye bye Client::buffer(BufferId)

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

diff --git a/src/client/client.h b/src/client/client.h
index fab9a99..edda8c6 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -53,15 +53,19 @@ class Client : public QObject {
   Q_OBJECT
 
 public:
+  enum ClientMode {
+    LocalCore,
+    RemoteCore
+  };
+
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);
 
   static QList<BufferInfo> allBufferInfos();
   static QList<Buffer *> buffers();
-  static Buffer *buffer(BufferId bufferUid);
+  // static Buffer *buffer(BufferId bufferUid);
   static Buffer *buffer(BufferInfo);
-  static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
@@ -108,9 +112,6 @@ public:
 
   static void userInput(BufferInfo bufferInfo, QString message);
 
-  enum ClientMode { LocalCore, RemoteCore };
-
-  static void checkForHighlight(Message &msg);
   static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
 
@@ -176,7 +177,6 @@ private slots:
   void recvStatusMsg(QString network, QString message);
   void receiveBacklog(BufferId bufferId, const QVariantList &msgs);
   void updateBufferInfo(BufferInfo);
-  void updateLastSeenMsg(BufferId id, const MsgId &msgId);
 
   void bufferDestroyed();
   void networkDestroyed();
@@ -226,8 +226,6 @@ private:
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
-  Buffer *_monitorBuffer;
-
   static AccountId _currentCoreAccount;
 
   friend class ClientSyncer;