X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffer.h;h=9bf4b783f3ad05172fa28154cce8f9a455594380;hp=fa2e4724e860a18fa8f01e333419a3f516d260ab;hb=08aac67d4dc813ed541a81d06fb83d9c4fec5834;hpb=a76b7bf7206e939b1503910825a3225119c89e8b

diff --git a/src/client/buffer.h b/src/client/buffer.h
index fa2e4724..9bf4b783 100644
--- a/src/client/buffer.h
+++ b/src/client/buffer.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -22,14 +22,14 @@
 #define _BUFFER_H_
 
 class AbstractUiMsg;
+class IrcChannel;
+class NickModel;
 
 struct BufferState;
 
 #include "message.h"
 #include "bufferinfo.h"
 
-#include <QVariantMap>
-
 //!\brief Encapsulates the contents of a single channel, query or server status context.
 /** A Buffer maintains a list of existing nicks and their status.
  */
@@ -38,80 +38,27 @@ class Buffer : public QObject {
 
 public:
   Buffer(BufferInfo, QObject *parent = 0);
-  virtual ~Buffer();
-
-  enum Type {
-    StatusType,
-    ChannelType,
-    QueryType
-  };
-
-  enum Activity {
-    NoActivity = 0x00,
-    OtherActivity = 0x01,
-    NewMessage = 0x02,
-    Highlight = 0x40
-  };
-  Q_DECLARE_FLAGS(ActivityLevel, Activity)
-
-  bool isStatusBuffer() const;
-  Type bufferType() const;
-  bool isActive() const;
 
   BufferInfo bufferInfo() const;
-  void updateBufferInfo(BufferInfo bufferid);
 
-  uint uid() const;
-  uint networkId() const;
-  
-  QString networkName() const;
-  QString bufferName() const;
-  QString displayName() const;
-  
   QList<AbstractUiMsg *> contents() const;
   
-  QVariantMap nickList() const;
-  QString topic() const;
-  QString ownNick() const;
-
 signals:
-  void userInput(const BufferInfo &, QString);
-  void nickListChanged(QVariantMap nicks);
-  void topicSet(QString topic);
-  void ownNickSet(QString ownNick);
-  void bufferUpdated(Buffer *);
-
   void msgAppended(AbstractUiMsg *);
   void msgPrepended(AbstractUiMsg *);
   void layoutQueueEmpty();
 
 public slots:
-  void setActive(bool active = true);
   void appendMsg(const Message &);
   void prependMsg(const Message &);
   bool layoutMsg();
 
-  // no longer needed
-//   void setTopic(QString);
-//   //void setNicks(QStringList);
-//   void addNick(QString nick, QVariantMap props);
-//   void renameNick(QString oldnick, QString newnick);
-//   void removeNick(QString nick);
-//   void updateNick(QString nick, QVariantMap props);
-//  void setOwnNick(QString nick);
-
-  void processUserInput(QString);
-
 private:
   BufferInfo _bufferInfo;
-  bool _active;
-  Type _type;
-  BufferState *state;
 
   QList<Message> layoutQueue;
   QList<AbstractUiMsg *> layoutedMsgs;
 
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(Buffer::ActivityLevel)
 
 #endif