Rework of the TreeModel. This should finaliy *knock on wood* inconsitency issues.
[quassel.git] / src / client / networkmodel.cpp
index 9901615..4f4603d 100644 (file)
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QColor>  // FIXME Dependency on QtGui!
-
 #include "networkmodel.h"
 
-#include "mappedselectionmodel.h"
 #include <QAbstractItemView>
 
 #include "bufferinfo.h"
 #include "client.h"
 #include "signalproxy.h"
-#include "networkinfo.h"
+#include "network.h"
 #include "ircchannel.h"
 #include "ircuser.h"
 
+#include "util.h" // get rid of this (needed for isChannelName)
+
 /*****************************************
 *  Fancy Buffer Items
 *****************************************/
-BufferItem::BufferItem(Buffer *buffer, AbstractTreeItem *parent)
+BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
-    buf(buffer),
-    activity(Buffer::NoActivity)
+    _bufferInfo(bufferInfo),
+    _activity(NoActivity)
 {
+  // determine BufferType
+  if(bufferInfo.buffer().isEmpty())
+    _type = StatusType;
+  else if(isChannelName(bufferInfo.buffer()))
+    _type = ChannelType;
+  else
+    _type = QueryType;
+
   Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-  if(buf->bufferType() == Buffer::QueryType)
+  if(bufferType() == QueryType)
     flags |= Qt::ItemIsDropEnabled;
   setFlags(flags);
 }
 
+
+const BufferInfo &BufferItem::bufferInfo() const {
+  return _bufferInfo;
+}
+
 quint64 BufferItem::id() const {
-  return buf->bufferInfo().uid();
+  return bufferInfo().uid().toInt();
 }
 
-void BufferItem::setActivity(const Buffer::ActivityLevel &level) {
-  activity = level;
+bool BufferItem::isStatusBuffer() const {
+   return bufferType() == StatusType;
 }
 
-QColor BufferItem::foreground(int column) const {
-  Q_UNUSED(column)
-  // for the time beeing we ignore the column :)
-  if(activity & Buffer::Highlight) {
-    return QColor(Qt::red);
-  } else if(activity & Buffer::NewMessage) {
-    return QColor(Qt::darkYellow);
-  } else if(activity & Buffer::OtherActivity) {
-    return QColor(Qt::darkGreen);
-  } else {
-    if(buf->isActive())
-      return QColor(Qt::black);
-    else
-      return QColor(Qt::gray);
-  }
+BufferItem::Type BufferItem::bufferType() const {
+  return _type;
+}
+
+bool BufferItem::isActive() const {
+  if(bufferType() == ChannelType)
+    return _ircChannel;
+  else
+    return qobject_cast<NetworkItem *>(parent())->isActive();
+}
+
+BufferItem::ActivityLevel BufferItem::activity() const {
+  return _activity;
+}
+
+void BufferItem::setActivity(const ActivityLevel &level) {
+  _activity = level;
+}
+
+void BufferItem::addActivity(const ActivityLevel &level) {
+  _activity |= level;
 }
 
 QVariant BufferItem::data(int column, int role) const {
   switch(role) {
   case NetworkModel::ItemTypeRole:
     return NetworkModel::BufferItemType;
-  case NetworkModel::BufferUidRole:
-    return buf->bufferInfo().uid();
+  case NetworkModel::BufferIdRole:
+    return qVariantFromValue(bufferInfo().uid());
   case NetworkModel::NetworkIdRole:
-    return buf->bufferInfo().networkId();
+    return qVariantFromValue(bufferInfo().networkId());
+  case NetworkModel::BufferInfoRole:
+    return qVariantFromValue(bufferInfo());
   case NetworkModel::BufferTypeRole:
-    return int(buf->bufferType());
-  case NetworkModel::BufferActiveRole:
-    return buf->isActive();
-  case Qt::ForegroundRole:
-    return foreground(column);
+    return int(bufferType());
+  case NetworkModel::ItemActiveRole:
+    return isActive();
   default:
     return PropertyMapItem::data(column, role);
   }
@@ -102,10 +120,28 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
          this, SLOT(join(IrcUser *)));
   connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
          this, SLOT(part(IrcUser *)));
+  connect(ircChannel, SIGNAL(destroyed()),
+         this, SLOT(ircChannelDestroyed()));
+  connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)),
+         this, SLOT(userModeChanged(IrcUser *)));
+  connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)),
+         this, SLOT(userModeChanged(IrcUser *)));
+  connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)),
+         this, SLOT(userModeChanged(IrcUser *)));
+  
+  emit dataChanged();
+}
+
+void BufferItem::ircChannelDestroyed() {
+  emit dataChanged();
+  removeAllChilds();
 }
 
 QString BufferItem::bufferName() const {
-  return buf->name();
+  if(bufferType() == StatusType)
+    return tr("Status Buffer");
+  else
+    return bufferInfo().buffer();
 }
 
 QString BufferItem::topic() const {
@@ -128,22 +164,79 @@ void BufferItem::setTopic(const QString &topic) {
 }
 
 void BufferItem::join(IrcUser *ircUser) {
-//   emit newChild(new IrcUserItem(ircUser, this));
-//   emit dataChanged(2);
+  if(!ircUser)
+    return;
+
+  addUserToCategory(ircUser);
+  emit dataChanged(2);
+}
+
+void BufferItem::addUserToCategory(IrcUser *ircUser) {
+  Q_ASSERT(_ircChannel);
+
+  UserCategoryItem *categoryItem;
+  int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+  if(!(categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId))))) {
+    categoryItem = new UserCategoryItem(categoryId, this);
+    newChild(categoryItem);
+  }
+  categoryItem->addUser(ircUser);
+
+  int totalusers = 0;
+  for(int i = 0; i < childCount(); i++) {
+    totalusers += child(i)->childCount();
+  }
 }
 
 void BufferItem::part(IrcUser *ircUser) {
-  Q_UNUSED(ircUser);
+  if(!ircUser) {
+    qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser;
+    return;
+  }
+
+  removeUserFromCategory(ircUser);
   emit dataChanged(2);
 }
 
+void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
+  Q_ASSERT(_ircChannel);
+
+  bool success = false;
+  UserCategoryItem *categoryItem = 0;
+  for(int i = 0; i < childCount(); i++) {
+    categoryItem = qobject_cast<UserCategoryItem *>(child(i));
+    if(success = categoryItem->removeChildById((quint64)ircUser)) {
+      if(categoryItem->childCount() == 0)
+       removeChild(i);
+      break;
+    }
+  }
+  Q_ASSERT(success);
+
+  int totalusers = 0;
+  for(int i = 0; i < childCount(); i++) {
+    totalusers += child(i)->childCount();
+  }
+}
+
+void BufferItem::userModeChanged(IrcUser *ircUser) {
+  Q_ASSERT(_ircChannel);
+
+  UserCategoryItem *categoryItem;
+  int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
+    return; // already in the right category;
+  
+  removeUserFromCategory(ircUser);
+  addUserToCategory(ircUser);
+}
+
 /*****************************************
 *  Network Items
 *****************************************/
-NetworkItem::NetworkItem(const uint &netid, const QString &network, AbstractTreeItem *parent)
+NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
   : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
-    _networkId(netid),
-    _networkName(network)
+    _networkId(netid)
 {
   setFlags(Qt::ItemIsEnabled);
 }
@@ -151,61 +244,64 @@ NetworkItem::NetworkItem(const uint &netid, const QString &network, AbstractTree
 QVariant NetworkItem::data(int column, int role) const {
   switch(role) {
   case NetworkModel::NetworkIdRole:
-    return _networkId;
+    return qVariantFromValue(_networkId);
   case NetworkModel::ItemTypeRole:
     return NetworkModel::NetworkItemType;
+  case NetworkModel::ItemActiveRole:
+    return isActive();
   default:
     return PropertyMapItem::data(column, role);
   }
 }
 
 quint64 NetworkItem::id() const {
-  return _networkId;
+  return _networkId.toInt();
+}
+
+bool NetworkItem::isActive() const {
+  return _network;
 }
 
 QString NetworkItem::networkName() const {
-  if(_networkInfo)
-    return _networkInfo->networkName();
+  if(_network)
+    return _network->networkName();
   else
-    return _networkName;
+    return QString();
 }
 
 QString NetworkItem::currentServer() const {
-  if(_networkInfo)
-    return _networkInfo->currentServer();
+  if(_network)
+    return _network->currentServer();
   else
     return QString();
 }
 
 int NetworkItem::nickCount() const {
-  BufferItem *bufferItem;
-  int count = 0;
-  for(int i = 0; i < childCount(); i++) {
-    bufferItem = qobject_cast<BufferItem *>(child(i));
-    if(!bufferItem)
-      continue;
-    count += bufferItem->nickCount();
-  }
-  return count;
+  if(_network)
+    return _network->ircUsers().count();
+  else
+    return 0;
 }
 
-void NetworkItem::attachNetworkInfo(NetworkInfo *networkInfo) {
-  if(!networkInfo)
+void NetworkItem::attachNetwork(Network *network) {
+  if(!network)
     return;
   
-  _networkInfo = networkInfo;
+  _network = network;
 
-  connect(networkInfo, SIGNAL(networkNameSet(QString)),
+  connect(network, SIGNAL(networkNameSet(QString)),
          this, SLOT(setNetworkName(QString)));
-  connect(networkInfo, SIGNAL(currentServerSet(QString)),
+  connect(network, SIGNAL(currentServerSet(QString)),
          this, SLOT(setCurrentServer(QString)));
-  connect(networkInfo, SIGNAL(ircChannelAdded(QString)),
+  connect(network, SIGNAL(ircChannelAdded(QString)),
          this, SLOT(attachIrcChannel(QString)));
   // FIXME: connect this and that...
+
+  emit dataChanged();
 }
 
 void NetworkItem::attachIrcChannel(const QString &channelName) {
-  IrcChannel *ircChannel = _networkInfo->ircChannel(channelName);
+  IrcChannel *ircChannel = _network->ircChannel(channelName);
   if(!ircChannel) {
     qWarning() << "NetworkItem::attachIrcChannel(): unkown Channel" << channelName;
     return;
@@ -231,6 +327,48 @@ void NetworkItem::setCurrentServer(const QString &serverName) {
   emit dataChanged(1);
 }
 
+/*****************************************
+*  User Category Items (like @vh etc.)
+*****************************************/
+// we hardcode this even though we have PREFIX in network... but that wouldn't help with mapping modes to
+// category strings anyway.
+const QList<UserCategoryItem::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>()
+  << UserCategoryItem::Category('q', "Owners")
+  << UserCategoryItem::Category('a', "Admins")
+  << UserCategoryItem::Category('a', "Admins")
+  << UserCategoryItem::Category('o', "Operators")
+  << UserCategoryItem::Category('h', "Half-Ops")
+  << UserCategoryItem::Category('v', "Voiced");
+
+UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
+  : PropertyMapItem(QStringList() << "categoryId", parent),
+    _category(category)
+{
+}
+
+QString UserCategoryItem::categoryId() {
+  if(_category < categories.count())
+    return categories[_category].displayString;
+  else
+    return QString("Users");
+}
+
+quint64 UserCategoryItem::id() const {
+  return qHash(_category);
+}
+
+void UserCategoryItem::addUser(IrcUser *ircUser) {
+  newChild(new IrcUserItem(ircUser, this));
+}
+
+int UserCategoryItem::categoryFromModes(const QString &modes) {
+  for(int i = 0; i < categories.count(); i++) {
+    if(modes.contains(categories[i].mode))
+      return i;
+  }
+  return categories.count();
+}
+     
 /*****************************************
 *  Irc User Items
 *****************************************/
@@ -238,43 +376,43 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "nickName", parent),
     _ircUser(ircUser)
 {
-  connect(ircUser, SIGNAL(destroyed()),
-         this, SLOT(ircUserDestroyed()));
+  // we don't need to handle the ircUser's destroyed signal since it's automatically removed
+  // by the IrcChannel::ircUserParted();
   
   connect(ircUser, SIGNAL(nickSet(QString)),
          this, SLOT(setNick(QString)));
 }
 
-QString IrcUserItem::nickName() {
+QString IrcUserItem::nickName() const {
   return _ircUser->nick();
 }
 
+IrcUser *IrcUserItem::ircUser() {
+  return _ircUser;
+}
+
+quint64 IrcUserItem::id() const {
+  return (quint64)_ircUser;
+}
+
+QVariant IrcUserItem::data(int column, int role) const {
+  if(role != Qt::ToolTipRole)
+    return PropertyMapItem::data(column, role);
+
+  return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
+}
+
 void IrcUserItem::setNick(QString newNick) {
   Q_UNUSED(newNick);
   emit dataChanged(0);
 }
-void IrcUserItem::ircUserDestroyed() {
-  deleteLater();
-}
-
 
 /*****************************************
  * NetworkModel
  *****************************************/
 NetworkModel::NetworkModel(QObject *parent)
-  : TreeModel(NetworkModel::defaultHeader(), parent),
-    _selectionModelSynchronizer(new SelectionModelSynchronizer(this)),
-    _propertyMapper(new ModelPropertyMapper(this))
+  : TreeModel(NetworkModel::defaultHeader(), parent)
 {
-  // initialize the Property Mapper
-  _propertyMapper->setModel(this);
-  delete _propertyMapper->selectionModel();
-  MappedSelectionModel *mappedSelectionModel = new MappedSelectionModel(this);
-  _propertyMapper->setSelectionModel(mappedSelectionModel);
-  synchronizeSelectionModel(mappedSelectionModel);
-  
-  connect(_selectionModelSynchronizer, SIGNAL(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags)),
-         this, SLOT(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags)));
 }
 
 QList<QVariant >NetworkModel::defaultHeader() {
@@ -283,84 +421,68 @@ QList<QVariant >NetworkModel::defaultHeader() {
   return data;
 }
 
-void NetworkModel::synchronizeSelectionModel(MappedSelectionModel *selectionModel) {
-  selectionModelSynchronizer()->addSelectionModel(selectionModel);
-}
-
-void NetworkModel::synchronizeView(QAbstractItemView *view) {
-  MappedSelectionModel *mappedSelectionModel = new MappedSelectionModel(view->model());
-  selectionModelSynchronizer()->addSelectionModel(mappedSelectionModel);
-  Q_ASSERT(mappedSelectionModel);
-  delete view->selectionModel();
-  view->setSelectionModel(mappedSelectionModel);
-}
-
-void NetworkModel::mapProperty(int column, int role, QObject *target, const QByteArray &property) {
-  propertyMapper()->addMapping(column, role, target, property);
-}
-
 bool NetworkModel::isBufferIndex(const QModelIndex &index) const {
   return index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType;
 }
 
+/*
 Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const {
   BufferItem *item = static_cast<BufferItem *>(index.internalPointer());
-  // FIXME get rid of this
-  Q_ASSERT(item->buffer() == Client::instance()->buffer(item->id()));
-  return item->buffer();
+  return Client::instance()->buffer(item->id());
 }
+*/
 
 
 // experimental stuff :)
-QModelIndex NetworkModel::networkIndex(uint networkId) {
-  return indexById(networkId);
+QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
+  return indexById(networkId.toInt());
 }
 
-NetworkItem *NetworkModel::network(uint networkId) {
-  return qobject_cast<NetworkItem *>(rootItem->childById(networkId));
+NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
+  return qobject_cast<NetworkItem *>(rootItem->childById(networkId.toInt()));
 }
 
-NetworkItem *NetworkModel::newNetwork(uint networkId, const QString &networkName) {
-  NetworkItem *networkItem = network(networkId);
+NetworkItem *NetworkModel::networkItem(NetworkId networkId) {
+  NetworkItem *netItem = existsNetworkItem(networkId);
 
-  if(networkItem == 0) {
-    networkItem = new NetworkItem(networkId, networkName, rootItem);
-    appendChild(rootItem, networkItem);
+  if(netItem == 0) {
+    netItem = new NetworkItem(networkId, rootItem);
+    rootItem->newChild(netItem);
   }
 
-  Q_ASSERT(networkItem);
-  return networkItem;
+  Q_ASSERT(netItem);
+  return netItem;
 }
 
-QModelIndex NetworkModel::bufferIndex(BufferInfo bufferInfo) {
-  QModelIndex networkIdx = networkIndex(bufferInfo.networkId());
-  if(!networkIdx.isValid())
-    return QModelIndex();
-  else
-    return indexById(bufferInfo.uid(), networkIdx);
+QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
+  AbstractTreeItem *netItem, *bufferItem;
+  for(int i = 0; i < rootItem->childCount(); i++) {
+    netItem = rootItem->child(i);
+    if((bufferItem = netItem->childById(bufferId.toInt()))) {
+      return indexById(bufferItem->id(), networkIndex(netItem->id()));
+    }
+  }
+  return QModelIndex();
 }
 
-BufferItem *NetworkModel::buffer(BufferInfo bufferInfo) {
-  QModelIndex bufferIdx = bufferIndex(bufferInfo);
+BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
+  QModelIndex bufferIdx = bufferIndex(bufferInfo.uid());
   if(bufferIdx.isValid())
     return static_cast<BufferItem *>(bufferIdx.internalPointer());
   else
     return 0;
 }
 
-BufferItem *NetworkModel::newBuffer(BufferInfo bufferInfo) {
-  BufferItem *bufferItem = buffer(bufferInfo);
-  if(bufferItem == 0) {
-    NetworkItem *networkItem = newNetwork(bufferInfo.networkId(), bufferInfo.network());
-
-    // FIXME: get rid of the buffer pointer
-    Buffer *buffer = Client::instance()->buffer(bufferInfo.uid());
-    bufferItem = new BufferItem(buffer, networkItem);
-    appendChild(networkItem, bufferItem);
+BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) {
+  BufferItem *bufItem = existsBufferItem(bufferInfo);
+  if(bufItem == 0) {
+    NetworkItem *netItem = networkItem(bufferInfo.networkId());
+    bufItem = new BufferItem(bufferInfo, netItem);
+    netItem->newChild(bufItem);
   }
 
-  Q_ASSERT(bufferItem);
-  return bufferItem;
+  Q_ASSERT(bufItem);
+  return bufItem;
 }
 
 QStringList NetworkModel::mimeTypes() const {
@@ -376,19 +498,20 @@ bool NetworkModel::mimeContainsBufferList(const QMimeData *mimeData) {
   return mimeData->hasFormat("application/Quassel/BufferItemList");
 }
 
-QList< QPair<uint, uint> > NetworkModel::mimeDataToBufferList(const QMimeData *mimeData) {
-  QList< QPair<uint, uint> > bufferList;
+QList< QPair<NetworkId, BufferId> > NetworkModel::mimeDataToBufferList(const QMimeData *mimeData) {
+  QList< QPair<NetworkId, BufferId> > bufferList;
 
   if(!mimeContainsBufferList(mimeData))
     return bufferList;
 
   QStringList rawBufferList = QString::fromAscii(mimeData->data("application/Quassel/BufferItemList")).split(",");
-  uint networkId, bufferUid;
+  NetworkId networkId;
+  BufferId bufferUid;
   foreach(QString rawBuffer, rawBufferList) {
     if(!rawBuffer.contains(":"))
       continue;
-    networkId = rawBuffer.section(":", 0, 0).toUInt();
-    bufferUid = rawBuffer.section(":", 1, 1).toUInt();
+    networkId = rawBuffer.section(":", 0, 0).toInt();
+    bufferUid = rawBuffer.section(":", 1, 1).toInt();
     bufferList.append(qMakePair(networkId, bufferUid));
   }
   return bufferList;
@@ -401,8 +524,8 @@ QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const {
   QStringList bufferlist;
   QString netid, uid, bufferid;
   foreach(QModelIndex index, indexes) {
-    netid = QString::number(index.data(NetworkIdRole).toUInt());
-    uid = QString::number(index.data(BufferUidRole).toUInt());
+    netid = QString::number(index.data(NetworkIdRole).value<NetworkId>().toInt());
+    uid = QString::number(index.data(BufferIdRole).value<BufferId>().toInt());
     bufferid = QString("%1:%2").arg(netid).arg(uid);
     if(!bufferlist.contains(bufferid))
       bufferlist << bufferid;
@@ -422,85 +545,56 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
     return false;
 
   // target must be a query
-  Buffer::Type targetType = (Buffer::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
-  if(targetType != Buffer::QueryType)
+  BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
+  if(targetType != BufferItem::QueryType)
     return false;
 
-  QList< QPair<uint, uint> > bufferList = mimeDataToBufferList(data);
+  QList< QPair<NetworkId, BufferId> > bufferList = mimeDataToBufferList(data);
 
   // exactly one buffer has to be dropped
   if(bufferList.count() != 1)
     return false;
 
-  uint netId = bufferList.first().first;
-  uint bufferId = bufferList.first().second;
+  NetworkId netId = bufferList.first().first;
+  BufferId bufferId = bufferList.first().second;
 
   // no self merges (would kill us)
-  if(bufferId == parent.data(BufferUidRole).toUInt())
+  if(bufferId == parent.data(BufferIdRole).value<BufferId>())
     return false; 
   
-  Q_ASSERT(rootItem->childById(netId));
-  Q_ASSERT(rootItem->childById(netId)->childById(bufferId));
+  Q_ASSERT(rootItem->childById(netId.toInt()));
+  Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt()));
 
   // source must be a query too
-  Buffer::Type sourceType = (Buffer::Type)rootItem->childById(netId)->childById(bufferId)->data(0, BufferTypeRole).toInt();
-  if(sourceType != Buffer::QueryType)
+  BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId.toInt())->childById(bufferId.toInt())->data(0, BufferTypeRole).toInt();
+  if(sourceType != BufferItem::QueryType)
     return false;
     
   // TODO: warn user about buffermerge!
-  qDebug() << "merging" << bufferId << parent.data(BufferUidRole).toInt();
+  qDebug() << "merging" << bufferId << parent.data(BufferIdRole).value<BufferId>();
   removeRow(parent.row(), parent.parent());
   
   return true;
 }
 
-void NetworkModel::attachNetworkInfo(NetworkInfo *networkInfo) {
-  NetworkItem *networkItem = network(networkInfo->networkId());
-  if(!networkItem) {
-    qWarning() << "NetworkModel::attachNetworkInfo(): network is unknown!";
-    return;
-  }
-  networkItem->attachNetworkInfo(networkInfo);
+void NetworkModel::attachNetwork(Network *net) {
+  NetworkItem *netItem = networkItem(net->networkId());
+  netItem->attachNetwork(net);
 }
 
-void NetworkModel::bufferUpdated(Buffer *buffer) {
-  BufferItem *bufferItem = newBuffer(buffer->bufferInfo());
-  QModelIndex itemindex = indexByItem(bufferItem);
+void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
+  BufferItem *bufItem = bufferItem(bufferInfo);
+  QModelIndex itemindex = indexByItem(bufItem);
   emit dataChanged(itemindex, itemindex);
 }
 
-// This Slot indicates that the user has selected a different buffer in the gui
-void NetworkModel::setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) {
-  Q_UNUSED(command)
-  Buffer *newCurrentBuffer;
-  if(isBufferIndex(index) && currentBuffer != (newCurrentBuffer = getBufferByIndex(index))) {
-    currentBuffer = newCurrentBuffer;
-    bufferActivity(Buffer::NoActivity, currentBuffer);
-    emit bufferSelected(currentBuffer);
-    emit selectionChanged(index);
-  }
+void NetworkModel::bufferActivity(BufferItem::ActivityLevel level, BufferInfo bufferInfo) {
+//   BufferItem *bufferItem = buffer(buf->bufferInfo());
+//   if(!bufferItem) {
+//     qWarning() << "NetworkModel::bufferActivity(): received Activity Info for uknown Buffer";
+//     return;
+//   }
+//   bufferItem->setActivity(level);
+//   bufferUpdated(buf);
 }
 
-void NetworkModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buf) {
-  BufferItem *bufferItem = buffer(buf->bufferInfo());
-  if(!bufferItem) {
-    qWarning() << "NetworkModel::bufferActivity(): received Activity Info for uknown Buffer";
-    return;
-  }
-  
-  if(buf != currentBuffer)
-    bufferItem->setActivity(level);
-  else
-    bufferItem->setActivity(Buffer::NoActivity);
-  bufferUpdated(buf);
-}
-
-void NetworkModel::selectBuffer(Buffer *buffer) {
-  QModelIndex index = bufferIndex(buffer->bufferInfo());
-  if(!index.isValid()) {
-    qWarning() << "NetworkModel::selectBuffer(): unknown Buffer has been selected.";
-    return;
-  }
-  // SUPER UGLY!
-  setCurrentIndex(index, 0);
-}