X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=62ad9b09725c352e16ab2cadfe70fe688f862c5a;hp=e626d756354a4c2b5f3dc39e9cbe609e423fafa5;hb=332069a1830ed3a055ac6f2d7661bae1cc83e40c;hpb=dbe74e993bcad57c15feb30d9bed30b6d43a3332

diff --git a/src/client/client.h b/src/client/client.h
index e626d756..62ad9b09 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -18,17 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CLIENT_H_
-#define _CLIENT_H_
+#ifndef CLIENT_H_
+#define CLIENT_H_
 
 #include <QAbstractSocket>
 #include <QTcpSocket>
 #include <QList>
 #include <QPointer>
 
-#include "buffer.h" // needed for activity lvl
+#include "bufferinfo.h"
+#include "types.h"
 
-class BufferInfo;
 class Message;
 class MessageModel;
 class AbstractMessageProcessor;
@@ -62,11 +62,6 @@ public:
   static void destroy();
   static void init(AbstractUi *);
 
-  static QList<BufferInfo> allBufferInfos();
-  static QList<Buffer *> buffers();
-  // static Buffer *buffer(BufferId bufferUid);
-  static Buffer *buffer(BufferInfo);
-
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
 
@@ -118,10 +113,6 @@ public:
 
 signals:
   void sendInput(BufferInfo, QString message);
-  void showBuffer(Buffer *);
-  void bufferUpdated(BufferInfo bufferInfo);
-  void backlogReceived(Buffer *, QList<Message>);
-  void requestBacklog(BufferInfo, QVariant, QVariant);
   void requestNetworkStates();
 
   void showConfigWizard(const QVariantMap &coredata);
@@ -173,10 +164,7 @@ private slots:
 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
-  void receiveBacklog(BufferId bufferId, const QVariantList &msgs);
-  void updateBufferInfo(BufferInfo);
 
-  void bufferDestroyed();
   void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
@@ -197,8 +185,6 @@ private:
   static void setCurrentCoreAccount(AccountId);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
-  Buffer *statusBuffer(const NetworkId &networkid) const;
-
   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;
@@ -219,8 +205,6 @@ private:
 
   bool _connectedToCore, _syncedToCore;
 
-  QHash<BufferId, Buffer *> _buffers;
-  QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;