X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffertreemodel.cpp;h=26612f97c434534522d129b719915a808255f804;hp=568f7e6c3b9fecaee47f8456e3794131edbf7a33;hb=8a618fb4514d83a76cec8e7cd1319b935366a616;hpb=c0ca17fde48836a5d2e7ea9ceaaabcdd7225d9b8

diff --git a/src/client/buffertreemodel.cpp b/src/client/buffertreemodel.cpp
index 568f7e6c..26612f97 100644
--- a/src/client/buffertreemodel.cpp
+++ b/src/client/buffertreemodel.cpp
@@ -79,10 +79,10 @@ QVariant BufferTreeItem::data(int column, int role) const {
     case BufferTreeModel::BufferNameRole:
       return buf->bufferName();
     case BufferTreeModel::BufferTypeRole:
-      return buf->bufferType();
+      return int(buf->bufferType());
     case BufferTreeModel::BufferActiveRole:
       return buf->isActive();
-    case BufferTreeModel::BufferInfoRole:
+    case BufferTreeModel::BufferUidRole:
       return buf->bufferInfo().uid();
     default:
       return QVariant();
@@ -238,15 +238,6 @@ void BufferTreeModel::changeCurrent(const QModelIndex &current, const QModelInde
   }
 }
 
-// we received a double click on a buffer, so we're going to join it
-void BufferTreeModel::doubleClickReceived(const QModelIndex &clicked) {
-  if(isBufferIndex(clicked)) {
-    Buffer *buffer = getBufferByIndex(clicked);
-    if(!buffer->isStatusBuffer()) 
-      emit fakeUserInput(buffer->bufferInfo(), QString("/join " + buffer->bufferName()));
-  }
-}
-
 void BufferTreeModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buffer) {
   BufferTreeItem *bufferItem = static_cast<BufferTreeItem*>(getOrCreateBufferItemIndex(buffer).internalPointer());
   if(buffer != currentBuffer)