X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffer.h;h=e862d5afa63b0a645925baf9a82c1349b0b971fd;hp=3465e5f282ccacb4ca807e40028fd9baea8bf811;hb=99c92e21b3b9eb5ed661632cdfb69aabfc6b2deb;hpb=902c95728306e5ba115de84800fc8d5d239c9d62

diff --git a/src/client/buffer.h b/src/client/buffer.h
index 3465e5f2..e862d5af 100644
--- a/src/client/buffer.h
+++ b/src/client/buffer.h
@@ -38,12 +38,12 @@ class Buffer : public QObject {
 
 public:
   Buffer(BufferInfo, QObject *parent = 0);
-  ~Buffer();
+  virtual ~Buffer();
 
   enum Type {
-    ServerBuffer,
-    ChannelBuffer,
-    QueryBuffer
+    StatusType,
+    ChannelType,
+    QueryType
   };
 
   enum Activity {
@@ -60,12 +60,12 @@ public:
 
   BufferInfo bufferInfo() const;
   void updateBufferInfo(BufferInfo bufferid);
-  
-  uint networkId() const;
+
+  BufferId uid() const;
+  NetworkId networkId() const;
   
   QString networkName() const;
-  QString bufferName() const;
-  QString displayName() const;
+  QString name() const;
   
   QList<AbstractUiMsg *> contents() const;
   
@@ -79,7 +79,6 @@ signals:
   void topicSet(QString topic);
   void ownNickSet(QString ownNick);
   void bufferUpdated(Buffer *);
-  void bufferDestroyed(Buffer *);
 
   void msgAppended(AbstractUiMsg *);
   void msgPrepended(AbstractUiMsg *);