Started to reorganize the Buffer{Model|View|Filter}. Mostly cleanup at the moment.

[quassel.git] / src / client / buffertreemodel.cpp

diff --git a/src/client/buffertreemodel.cpp b/src/client/buffertreemodel.cpp
index fc9ea51..26612f9 100644 (file)
--- 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();
@@ -142,7 +142,7 @@ QModelIndex BufferTreeModel::getOrCreateNetworkItemIndex(Buffer *buffer) {
   QString net = buffer->networkName();
   TreeItem *networkItem;
 
-  if(not(networkItem = rootItem->childById(qHash(net)))) {
+  if(!(networkItem = rootItem->childById(qHash(net)))) {
     int nextRow = rootItem->childCount();
     networkItem = new NetworkTreeItem(net, rootItem);
     
@@ -160,7 +160,7 @@ QModelIndex BufferTreeModel::getOrCreateBufferItemIndex(Buffer *buffer) {
   NetworkTreeItem *networkItem = static_cast<NetworkTreeItem*>(networkItemIndex.internalPointer());
   TreeItem *bufferItem;
   
-  if(not(bufferItem = networkItem->childById(buffer->bufferInfo().uid()))) {
+  if(!(bufferItem = networkItem->childById(buffer->bufferInfo().uid()))) {
     int nextRow = networkItem->childCount();
     bufferItem = new BufferTreeItem(buffer, networkItem);
     
@@ -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)