X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=14b27ec85216adca1812b924ab63f3f4d042a985;hp=426c272c5b54d030e5772e2c3463623e5cb23d55;hb=f9fc50a5e043668a2525a6c0903ea339d4ba05b7;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 426c272c..14b27ec8 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "client.h"
-#include "buffer.h"
+//#include "buffer.h"
 #include "bufferview.h"
 #include "networkmodel.h"
 
@@ -82,12 +82,12 @@ void BufferView::setModel(QAbstractItemModel *model) {
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
-  Buffer::Type bufferType = (Buffer::Type)index.data(NetworkModel::BufferTypeRole).toInt();
+  BufferItem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).toInt();
 
-  if(bufferType != Buffer::ChannelType)
+  if(bufferType != BufferItem::ChannelType)
     return;
   
-  Client::fakeInput(index.data(NetworkModel::BufferUidRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+  Client::fakeInput(index.data(NetworkModel::BufferIdRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {