X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=48d8a70795833ff47e2be404c99d654bd8459b47;hb=48979ba2c343ab50ae93a8bb1c355ce79115bd4f;hp=1fb07971aeeab45b593a615c377fd0caca87743c;hpb=902c95728306e5ba115de84800fc8d5d239c9d62;p=quassel.git

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 1fb07971..48d8a707 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -17,6 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <QDebug>
+
 #include "buffer.h"
 
 #include "client.h"
@@ -29,11 +31,11 @@ Buffer::Buffer(BufferInfo bufferid, QObject *parent)
     _active(false)
 {
   if(bufferid.buffer().isEmpty())
-    _type = ServerBuffer;
+    _type = StatusType;
   else if(isChannelName(bufferid.buffer()))
-    _type = ChannelBuffer;
+    _type = ChannelType;
   else
-    _type = QueryBuffer;
+    _type = QueryType;
 
 /*
   QSettings s;
@@ -53,7 +55,6 @@ Buffer::~Buffer() {
   s.endGroup();
 */
   //delete state;
-  emit bufferDestroyed(this);
 }
 
 Buffer::Type Buffer::bufferType() const {
@@ -73,6 +74,10 @@ void Buffer::updateBufferInfo(BufferInfo bufferid) {
   _bufferInfo = bufferid;
 }
 
+uint Buffer::uid() const {
+  return bufferInfo().uid();
+}
+
 uint Buffer::networkId() const {
   return bufferInfo().networkId();
 }
@@ -81,15 +86,11 @@ QString Buffer::networkName() const {
   return bufferInfo().network();
 }
 
-QString Buffer::bufferName() const {
-  return bufferInfo().buffer();
-}
-
-QString Buffer::displayName() const {
-  if(bufferType() == ServerBuffer)
+QString Buffer::name() const {
+  if(bufferType() == StatusType)
     return tr("Status Buffer");
   else
-    return bufferName();
+    return bufferInfo().buffer();
 }
 
 QList<AbstractUiMsg *> Buffer::contents() const {
@@ -112,7 +113,7 @@ QString Buffer::ownNick() const {
 }
 
 bool Buffer::isStatusBuffer() const {
-   return bufferType() == ServerBuffer;
+   return bufferType() == StatusType;
 }
 
 void Buffer::setActive(bool a) {