X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=51f4123dd3e4858f73d3c41aed3a7ded36eba9ee;hp=5e1bc911d182c330a18b1f88668f51179d9984c7;hb=e561e02a8d2f1f009559d17c7b1c66cb6f4e2a5a;hpb=e8a5c49548759045b49c208c250c6f61c7fdfcd5

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 5e1bc911..51f4123d 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -33,39 +33,149 @@
 #include "util.h" // get rid of this (needed for isChannelName)
 
 /*****************************************
-*  Fancy Buffer Items
+*  Network Items
 *****************************************/
-BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
-  : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
-    _bufferInfo(bufferInfo),
-    _bufferName(bufferInfo.bufferName()),
-    _activity(Buffer::NoActivity),
-    _ircChannel(0)
+NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
+  : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
+    _networkId(netid)
 {
-  Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-  if(bufferType() == BufferInfo::QueryBuffer)
-    flags |= Qt::ItemIsDropEnabled;
+  setFlags(Qt::ItemIsEnabled);
+}
 
-  if(bufferType() == BufferInfo::StatusBuffer) {
-    NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent);
-    connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+QVariant NetworkItem::data(int column, int role) const {
+  switch(role) {
+  case NetworkModel::NetworkIdRole:
+    return qVariantFromValue(_networkId);
+  case NetworkModel::ItemTypeRole:
+    return NetworkModel::NetworkItemType;
+  case NetworkModel::ItemActiveRole:
+    return isActive();
+  default:
+    return PropertyMapItem::data(column, role);
   }
-  setFlags(flags);
 }
 
-quint64 BufferItem::id() const {
-  return qHash(bufferInfo().bufferId());
+BufferItem *NetworkItem::findBufferItem(BufferId bufferId) {
+  BufferItem *bufferItem = 0;
+  
+  for(int i = 0; i < childCount(); i++) {
+    bufferItem = qobject_cast<BufferItem *>(child(i));
+    if(!bufferItem)
+      continue;
+    if(bufferItem->bufferId() == bufferId)
+      return bufferItem;
+  }
+  return 0;
 }
 
-// bool BufferItem::isStatusBuffer() const {
-//   return bufferType() == BufferInfo::StatusBuffer;
-// }
 
-bool BufferItem::isActive() const {
-  if(bufferType() == BufferInfo::ChannelBuffer)
-    return _ircChannel;
-  else
-    return qobject_cast<NetworkItem *>(parent())->isActive();
+BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
+  BufferItem *bufferItem = findBufferItem(bufferInfo);
+  if(bufferItem)
+    return bufferItem;
+  
+  switch(bufferInfo.type()) {
+  case BufferInfo::StatusBuffer:
+    bufferItem = new StatusBufferItem(bufferInfo, this);
+    break;
+  case BufferInfo::ChannelBuffer:
+    bufferItem = new ChannelBufferItem(bufferInfo, this);
+    break;
+  case BufferInfo::QueryBuffer:
+    bufferItem = new QueryBufferItem(bufferInfo, this);
+    break;
+  default:
+    bufferItem = new BufferItem(bufferInfo, this);
+  }
+
+  newChild(bufferItem);
+  return bufferItem;
+}
+
+void NetworkItem::attachNetwork(Network *network) {
+  if(!network)
+    return;
+  
+  _network = network;
+
+  connect(network, SIGNAL(networkNameSet(QString)),
+	  this, SLOT(setNetworkName(QString)));
+  connect(network, SIGNAL(currentServerSet(QString)),
+	  this, SLOT(setCurrentServer(QString)));
+  connect(network, SIGNAL(ircChannelAdded(IrcChannel *)),
+	  this, SLOT(attachIrcChannel(IrcChannel *)));
+  connect(network, SIGNAL(ircUserAdded(IrcUser *)),
+	  this, SLOT(attachIrcUser(IrcUser *)));
+  connect(network, SIGNAL(connectedSet(bool)),
+	  this, SIGNAL(dataChanged()));
+  connect(network, SIGNAL(destroyed()),
+	  this, SIGNAL(dataChanged()));
+  
+  emit dataChanged();
+}
+
+void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) {
+  ChannelBufferItem *channelItem;
+  for(int i = 0; i < childCount(); i++) {
+    channelItem = qobject_cast<ChannelBufferItem *>(child(i));
+    if(!channelItem)
+      continue;
+
+    if(channelItem->bufferName().toLower() == ircChannel->name().toLower()) {
+      channelItem->attachIrcChannel(ircChannel);
+      return;
+    }
+  }
+}
+
+void NetworkItem::attachIrcUser(IrcUser *ircUser) {
+  QueryBufferItem *queryItem = 0;
+  for(int i = 0; i < childCount(); i++) {
+    queryItem = qobject_cast<QueryBufferItem *>(child(i));
+    if(!queryItem)
+      continue;
+
+    if(queryItem->bufferName().toLower() == ircUser->nick().toLower()) {
+      queryItem->attachIrcUser(ircUser);
+      break;
+    }
+  }
+}
+
+void NetworkItem::setNetworkName(const QString &networkName) {
+  Q_UNUSED(networkName);
+  emit dataChanged(0);
+}
+
+void NetworkItem::setCurrentServer(const QString &serverName) {
+  Q_UNUSED(serverName);
+  emit dataChanged(1);
+}
+
+
+QString NetworkItem::toolTip(int column) const {
+  Q_UNUSED(column);
+
+  QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
+  toolTip.append(QString("Server: %1").arg(currentServer()));
+  toolTip.append(QString("Users: %1").arg(nickCount()));
+
+  if(_network) {
+    toolTip.append(QString("Lag: %1 msecs").arg(_network->latency()));
+  }
+
+  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+/*****************************************
+*  Fancy Buffer Items
+*****************************************/
+BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
+  : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
+    _bufferInfo(bufferInfo),
+    _activity(Buffer::NoActivity)
+{
+  setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
 }
 
 void BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
@@ -115,10 +225,181 @@ bool BufferItem::setData(int column, const QVariant &value, int role) {
   return true;
 }
 
+void BufferItem::setBufferName(const QString &name) {
+  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name);
+  emit dataChanged(0);
+}
+
+QString BufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  return tr("<p> %1 - %2 </p>").arg(bufferInfo().bufferId().toInt()).arg(bufferName());
+}
+
+/*
+void BufferItem::setLastMsgInsert(QDateTime msgDate) {
+  if(msgDate.isValid() && msgDate > _lastMsgInsert)
+    _lastMsgInsert = msgDate;
+}
+*/
+/*
+// FIXME emit dataChanged()
+bool BufferItem::setLastSeen() {
+  if(_lastSeen > _lastMsgInsert)
+    return false;
+  
+  _lastSeen = _lastMsgInsert;
+  BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
+  return true;
+}
+
+QDateTime BufferItem::lastSeen() {
+  return _lastSeen;
+}
+*/
 
-void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
-  if(!ircChannel)
+/*****************************************
+*  StatusBufferItem
+*****************************************/
+StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
+  : BufferItem(bufferInfo, parent)
+{
+  Q_ASSERT(parent);
+  connect(parent, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+}
+
+QString StatusBufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  QStringList toolTip;
+
+  QString netName = Client::network(bufferInfo().networkId())->networkName();
+  toolTip.append(tr("<b>Status buffer of %1</b>").arg(netName));
+
+  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+/*****************************************
+*  QueryBufferItem
+*****************************************/
+QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
+  : BufferItem(bufferInfo, parent),
+    _ircUser(0)
+{
+  setFlags(flags() | Qt::ItemIsDropEnabled);
+
+  const Network *net = Client::network(bufferInfo.networkId());
+  if(!net)
     return;
+
+  IrcUser *ircUser = net->ircUser(bufferInfo.bufferName());
+  if(ircUser)
+    attachIrcUser(ircUser);
+
+}
+
+bool QueryBufferItem::isActive() const {
+  if(_ircUser)
+    return !_ircUser->isAway();
+  else
+    return false;
+}
+
+QString QueryBufferItem::toolTip(int column) const {
+  // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this... 
+  Q_UNUSED(column);
+  QStringList toolTip;
+
+  toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
+
+  if(_ircUser) {
+    if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
+    if(_ircUser->isAway()) {
+      toolTip[0].append(QString(" (away%1)").arg(!_ircUser->awayMessage().isEmpty() ? (QString(" ") + _ircUser->awayMessage()) : QString()));
+    }
+    if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());
+    if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(_ircUser->nick()).arg(_ircUser->ircOperator()));
+    if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost());
+    if(!_ircUser->whoisServiceReply().isEmpty()) toolTip.append(_ircUser->whoisServiceReply());
+    
+    toolTip.append(_ircUser->hostmask().remove(0, _ircUser->hostmask().indexOf("!")+1));
+    
+    if(_ircUser->idleTime().isValid()) {
+      QDateTime now = QDateTime::currentDateTime();
+      QDateTime idle = _ircUser->idleTime();
+      int idleTime = idle.secsTo(now);
+      toolTip.append(tr("idling since %1").arg(secondsToString(idleTime)));
+    }
+    if(_ircUser->loginTime().isValid()) {
+      toolTip.append(tr("login time: %1").arg(_ircUser->loginTime().toString()));
+    }
+    
+    if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server()));
+  }
+
+  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+void QueryBufferItem::attachIrcUser(IrcUser *ircUser) {
+  _ircUser = ircUser;
+  connect(_ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
+  connect(_ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
+  emit dataChanged();
+}
+
+void QueryBufferItem::ircUserDestroyed() {
+  _ircUser = 0;
+  emit dataChanged();
+}
+
+/*****************************************
+*  ChannelBufferItem
+*****************************************/
+ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
+  : BufferItem(bufferInfo, parent),
+    _ircChannel(0)
+{
+  const Network *net = Client::network(bufferInfo.networkId());
+  if(!net)
+    return;
+
+  IrcChannel *ircChannel = net->ircChannel(bufferInfo.bufferName());
+  if(ircChannel)
+    attachIrcChannel(ircChannel);
+}
+
+QString ChannelBufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  QStringList toolTip;
+
+  toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
+  if(isActive()) {
+    //TODO: add channel modes 
+    toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
+    if(_ircChannel) {
+      QString channelMode = _ircChannel->channelModeString(); // channelModeString is compiled on the fly -> thus cache the result
+      if(!channelMode.isEmpty())
+	toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
+    }
+    
+    BufferSettings s;
+    bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
+    if(showTopic) {
+      QString _topic = topic();
+      if(_topic != "") {
+	_topic.replace(QString("<"), QString("&lt;"));
+	_topic.replace(QString(">"), QString("&gt;"));
+	toolTip.append(QString("<font size='-2'>&nbsp;</font>"));
+	toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
+      }
+    }
+  } else {
+    toolTip.append(tr("Not active <br /> Double-click to join"));
+  }
+
+  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));  
+}
+
+void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) {
+  Q_ASSERT(!_ircChannel && ircChannel);
   
   _ircChannel = ircChannel;
 
@@ -137,15 +418,13 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
   connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)),
 	  this, SLOT(userModeChanged(IrcUser *)));
 
-  if(!ircChannel->ircUsers().isEmpty()) {
-    qWarning() << "Channel" << ircChannel->name() << "has already users which is quite surprising :)";
+  if(!ircChannel->ircUsers().isEmpty())
     join(ircChannel->ircUsers());
-  }
   
   emit dataChanged();
 }
 
-void BufferItem::ircChannelDestroyed() {
+void ChannelBufferItem::ircChannelDestroyed() {
   Q_CHECK_PTR(_ircChannel);
   disconnect(_ircChannel, 0, this, 0);
   _ircChannel = 0;
@@ -153,64 +432,29 @@ void BufferItem::ircChannelDestroyed() {
   removeAllChilds();
 }
 
-QString BufferItem::bufferName() const {
-  if(bufferType() == BufferInfo::StatusBuffer)
-    return tr("Status Buffer");
-  else
-    return _bufferName;
-}
-
-void BufferItem::setBufferName(const QString &name) {
-  _bufferName = name;
-  // as long as we need those bufferInfos, we have to update that one aswell.
-  // pretty ugly though :/
-  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name);
-  emit dataChanged(0);
-}
-
-QString BufferItem::topic() const {
-  if(_ircChannel)
-    return _ircChannel->topic();
-  else
-    return QString();
-}
-
-void BufferItem::ircUserDestroyed() {
-  // PRIVATE
-  IrcUser *ircUser = static_cast<IrcUser *>(sender());
-  removeUserFromCategory(ircUser);
+void ChannelBufferItem::join(const QList<IrcUser *> &ircUsers) {
+  addUsersToCategory(ircUsers);
   emit dataChanged(2);
 }
 
-int BufferItem::nickCount() const {
-  if(_ircChannel)
-    return _ircChannel->ircUsers().count();
-  else
-    return 0;
-}
-
-void BufferItem::setTopic(const QString &topic) {
-  Q_UNUSED(topic);
-  emit dataChanged(1);
-}
-
-void BufferItem::join(const QList<IrcUser *> &ircUsers) {
-  addUsersToCategory(ircUsers);
-
-  foreach(IrcUser *ircUser, ircUsers) {
-    if(!ircUser)
+UserCategoryItem *ChannelBufferItem::findCategoryItem(int categoryId) {
+  UserCategoryItem *categoryItem = 0;
+  
+  for(int i = 0; i < childCount(); i++) {
+    categoryItem = qobject_cast<UserCategoryItem *>(child(i));
+    if(!categoryItem)
       continue;
-    connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
+    if(categoryItem->categoryId() == categoryId)
+      return categoryItem;
   }
-  
-  emit dataChanged(2);
+  return 0;
 }
 
-void BufferItem::addUserToCategory(IrcUser *ircUser) {
+void ChannelBufferItem::addUserToCategory(IrcUser *ircUser) {
   addUsersToCategory(QList<IrcUser *>() << ircUser);
 }
 
-void BufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
+void ChannelBufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
   Q_ASSERT(_ircChannel);
 
   QHash<UserCategoryItem *, QList<IrcUser *> > categories;
@@ -220,7 +464,7 @@ void BufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
   
   foreach(IrcUser *ircUser, ircUsers) {
     categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-    categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)));
+    categoryItem = findCategoryItem(categoryId);
     if(!categoryItem) {
       categoryItem = new UserCategoryItem(categoryId, this);
       categories[categoryItem] = QList<IrcUser *>();
@@ -236,9 +480,9 @@ void BufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
   }
 }
 
-void BufferItem::part(IrcUser *ircUser) {
+void ChannelBufferItem::part(IrcUser *ircUser) {
   if(!ircUser) {
-    qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser;
+    qWarning() << bufferName() << "ChannelBufferItem::part(): unknown User" << ircUser;
     return;
   }
 
@@ -247,7 +491,7 @@ void BufferItem::part(IrcUser *ircUser) {
   emit dataChanged(2);
 }
 
-void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
+void ChannelBufferItem::removeUserFromCategory(IrcUser *ircUser) {
   if(!_ircChannel) {
     // If we parted the channel there might still be some ircUsers connected.
     // in that case we just ignore the call
@@ -266,20 +510,27 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
   }
 }
 
-void BufferItem::userModeChanged(IrcUser *ircUser) {
+void ChannelBufferItem::userModeChanged(IrcUser *ircUser) {
   Q_ASSERT(_ircChannel);
 
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  UserCategoryItem *categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)));
+  UserCategoryItem *categoryItem = findCategoryItem(categoryId);
     
-  if(categoryItem && categoryItem->childById(qHash(ircUser)))
-    return; // already in the right category;
+  if(categoryItem) {
+    if(categoryItem->findIrcUser(ircUser)) {
+      return; // already in the right category;
+    }
+  } else {
+    categoryItem = new UserCategoryItem(categoryId, this);
+    newChild(categoryItem);
+  }
 
   // find the item that needs reparenting
   IrcUserItem *ircUserItem = 0;
   for(int i = 0; i < childCount(); i++) {
-    UserCategoryItem *categoryItem = qobject_cast<UserCategoryItem *>(child(i));
-    IrcUserItem *userItem = qobject_cast<IrcUserItem *>(categoryItem->childById(qHash(ircUser)));
+    UserCategoryItem *oldCategoryItem = qobject_cast<UserCategoryItem *>(child(i));
+    Q_ASSERT(oldCategoryItem);
+    IrcUserItem *userItem = oldCategoryItem->findIrcUser(ircUser);
     if(userItem) {
       ircUserItem = userItem;
       break;
@@ -287,196 +538,12 @@ void BufferItem::userModeChanged(IrcUser *ircUser) {
   }
 
   if(!ircUserItem) {
-    qWarning() << "BufferItem::userModeChanged(IrcUser *): unable to determine old category of" << ircUser;
+    qWarning() << "ChannelBufferItem::userModeChanged(IrcUser *): unable to determine old category of" << ircUser;
     return;
   }
   ircUserItem->reParent(categoryItem);
 }
 
-QString BufferItem::toolTip(int column) const {
-  Q_UNUSED(column);
-  QStringList toolTip;
-
-  switch(bufferType()) {
-    case BufferInfo::StatusBuffer: {
-      QString netName = Client::network(bufferInfo().networkId())->networkName();
-      toolTip.append(tr("<b>Status buffer of %1</b>").arg(netName));
-      break;
-    }
-    case BufferInfo::ChannelBuffer:
-      toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
-      if(isActive()) {
-        //TODO: add channel modes 
-        toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
-
-        BufferSettings s;
-        bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
-        if(showTopic) {
-          QString _topic = topic();
-          if(_topic != "") {
-            _topic.replace(QString("<"), QString("&lt;"));
-            _topic.replace(QString(">"), QString("&gt;"));
-            toolTip.append(QString("<font size='-2'>&nbsp;</font>"));
-            toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
-          }
-        }
-	if(_ircChannel) {
-	  QString channelMode = _ircChannel->channelModeString(); // channelModeString is compiled on the fly -> thus cache the result
-	  if(!channelMode.isEmpty())
-	    toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
-	}
-      } else {
-        toolTip.append(tr("Not active <br /> Double-click to join"));
-      }
-      break;
-    case BufferInfo::QueryBuffer:
-      toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
-      if(topic() != "") toolTip.append(tr("Away Message: %1").arg(topic()));
-      break;
-    default: //this should not happen
-      toolTip.append(tr("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName()));
-      break;
-  }
-
-  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
-}
-
-/*
-void BufferItem::setLastMsgInsert(QDateTime msgDate) {
-  if(msgDate.isValid() && msgDate > _lastMsgInsert)
-    _lastMsgInsert = msgDate;
-}
-*/
-/*
-// FIXME emit dataChanged()
-bool BufferItem::setLastSeen() {
-  if(_lastSeen > _lastMsgInsert)
-    return false;
-  
-  _lastSeen = _lastMsgInsert;
-  BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
-  return true;
-}
-
-QDateTime BufferItem::lastSeen() {
-  return _lastSeen;
-}
-*/
-
-/*****************************************
-*  Network Items
-*****************************************/
-NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
-  : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
-    _networkId(netid)
-{
-  setFlags(Qt::ItemIsEnabled);
-}
-
-QVariant NetworkItem::data(int column, int role) const {
-  switch(role) {
-  case NetworkModel::NetworkIdRole:
-    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 qHash(_networkId);
-}
-
-bool NetworkItem::isActive() const {
-  if(_network)
-    return _network->isConnected();
-  else
-    return false;
-}
-
-QString NetworkItem::networkName() const {
-  if(_network)
-    return _network->networkName();
-  else
-    return QString();
-}
-
-QString NetworkItem::currentServer() const {
-  if(_network)
-    return _network->currentServer();
-  else
-    return QString();
-}
-
-int NetworkItem::nickCount() const {
-  if(_network)
-    return _network->ircUsers().count();
-  else
-    return 0;
-}
-
-void NetworkItem::attachNetwork(Network *network) {
-  if(!network)
-    return;
-  
-  _network = network;
-
-  connect(network, SIGNAL(networkNameSet(QString)),
-	  this, SLOT(setNetworkName(QString)));
-  connect(network, SIGNAL(currentServerSet(QString)),
-	  this, SLOT(setCurrentServer(QString)));
-  connect(network, SIGNAL(ircChannelAdded(QString)),
-	  this, SLOT(attachIrcChannel(QString)));
-  connect(network, SIGNAL(connectedSet(bool)),
-	  this, SIGNAL(dataChanged()));
-  connect(network, SIGNAL(destroyed()),
-	  this, SIGNAL(dataChanged()));
-  
-  emit dataChanged();
-}
-
-void NetworkItem::attachIrcChannel(const QString &channelName) {
-  IrcChannel *ircChannel = _network->ircChannel(channelName);
-  if(!ircChannel) {
-    qWarning() << "NetworkItem::attachIrcChannel(): unkown Channel" << channelName;
-    return;
-  }
-  
-  BufferItem *bufferItem;
-  for(int i = 0; i < childCount(); i++) {
-    bufferItem = qobject_cast<BufferItem *>(child(i));
-    if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) {
-      bufferItem->attachIrcChannel(ircChannel);
-      break;
-    }
-  }
-}
-
-void NetworkItem::setNetworkName(const QString &networkName) {
-  Q_UNUSED(networkName);
-  emit dataChanged(0);
-}
-
-void NetworkItem::setCurrentServer(const QString &serverName) {
-  Q_UNUSED(serverName);
-  emit dataChanged(1);
-}
-
-
-QString NetworkItem::toolTip(int column) const {
-  Q_UNUSED(column);
-
-  QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
-  toolTip.append(QString("Server: %1").arg(currentServer()));
-  toolTip.append(QString("Users: %1").arg(nickCount()));
-
-  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
-}
-
-
 /*****************************************
 *  User Category Items (like @vh etc.)
 *****************************************/
@@ -488,6 +555,8 @@ UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "categoryName", parent),
     _category(category)
 {
+  setTreeItemFlags(AbstractTreeItem::DeleteOnLastChildRemoved);
+  setObjectName(parent->data(0, Qt::DisplayRole).toString() + "/" + QString::number(category));
 }
 
 // caching this makes no sense, since we display the user number dynamically
@@ -503,8 +572,17 @@ QString UserCategoryItem::categoryName() const {
   }
 }
 
-quint64 UserCategoryItem::id() const {
-  return qHash(_category);
+IrcUserItem *UserCategoryItem::findIrcUser(IrcUser *ircUser) {
+  IrcUserItem *userItem = 0;
+
+  for(int i = 0; i < childCount(); i++) {
+    userItem = qobject_cast<IrcUserItem *>(child(i));
+    if(!userItem)
+      continue;
+    if(userItem->ircUser() == ircUser)
+      return userItem;
+  }
+  return 0;
 }
 
 void UserCategoryItem::addUsers(const QList<IrcUser *> &ircUsers) {
@@ -516,9 +594,12 @@ void UserCategoryItem::addUsers(const QList<IrcUser *> &ircUsers) {
 }
 
 bool UserCategoryItem::removeUser(IrcUser *ircUser) {
-  bool success = removeChildById(qHash(ircUser));
-  if(success)
+  IrcUserItem *userItem = findIrcUser(ircUser);
+  bool success = (bool)userItem;
+  if(success) {
+    removeChild(userItem);
     emit dataChanged(0);
+  }
   return success;
 }
 
@@ -555,30 +636,12 @@ QVariant UserCategoryItem::data(int column, int role) const {
 *****************************************/
 IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "nickName", parent),
-    _ircUser(ircUser),
-    _id(qHash(ircUser))
+    _ircUser(ircUser)
 {
-  // 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)));
-  connect(ircUser, SIGNAL(awaySet(bool)),
-          this, SLOT(setAway(bool)));
-}
-
-QString IrcUserItem::nickName() const {
-  if(_ircUser)
-    return _ircUser->nick();
-  else
-    return QString();
-}
-
-bool IrcUserItem::isActive() const {
-  if(_ircUser)
-    return !_ircUser->isAway();
-  else
-    return false;
+  setObjectName(ircUser->nick());  
+  connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
+  connect(ircUser, SIGNAL(nickSet(QString)), this, SIGNAL(dataChanged()));
+  connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
 }
 
 QVariant IrcUserItem::data(int column, int role) const {
@@ -602,8 +665,11 @@ QString IrcUserItem::toolTip(int column) const {
   Q_UNUSED(column);
   QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
   if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
-  if(_ircUser->isAway()) toolTip[0].append(" is away");
-  if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
+  if(_ircUser->isAway()) {
+    toolTip[0].append(" is away");
+    if(!_ircUser->awayMessage().isEmpty())
+      toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
+  }
   if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());
   if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(nickName()).arg(_ircUser->ircOperator()));
   if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost());
@@ -626,15 +692,11 @@ QString IrcUserItem::toolTip(int column) const {
   return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
 }
 
-void IrcUserItem::setNick(QString newNick) {
-  Q_UNUSED(newNick);
-  emit dataChanged(0);
-}
-
-void IrcUserItem::setAway(bool away) {
-  Q_UNUSED(away);
-  emit dataChanged(0);
-}
+// void IrcUserItem::ircUserDestroyed() {
+//   parent()->removeChild(this);
+//   if(parent()->childCount() == 0)
+//     parent()->parent()->removeChild(parent());
+// }
 
 /*****************************************
  * NetworkModel
@@ -661,61 +723,83 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const {
 }
 */
 
+int NetworkModel::networkRow(NetworkId networkId) {
+  NetworkItem *netItem = 0;
+  for(int i = 0; i < rootItem->childCount(); i++) {
+    netItem = qobject_cast<NetworkItem *>(rootItem->child(i));
+    if(!netItem)
+      continue;
+    if(netItem->networkId() == networkId)
+      return i;
+  }
+  return -1;
+}
 
-// experimental stuff :)
 QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
-  return indexById(qHash(networkId));
+  int netRow = networkRow(networkId);
+  if(netRow == -1)
+    return QModelIndex();
+  else
+    return indexByItem(qobject_cast<NetworkItem *>(rootItem->child(netRow)));
 }
 
-NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
-  return qobject_cast<NetworkItem *>(rootItem->childById(networkId.toInt()));
+NetworkItem *NetworkModel::findNetworkItem(NetworkId networkId) {
+  int netRow = networkRow(networkId);
+  if(netRow == -1)
+    return 0;
+  else
+    return qobject_cast<NetworkItem *>(rootItem->child(netRow));
 }
 
 NetworkItem *NetworkModel::networkItem(NetworkId networkId) {
-  NetworkItem *netItem = existsNetworkItem(networkId);
+  NetworkItem *netItem = findNetworkItem(networkId);
 
   if(netItem == 0) {
     netItem = new NetworkItem(networkId, rootItem);
     rootItem->newChild(netItem);
   }
-
-  Q_ASSERT(netItem);
   return netItem;
 }
 
 void NetworkModel::networkRemoved(const NetworkId &networkId) {
-  rootItem->removeChildById(qHash(networkId));
+  int netRow = networkRow(networkId);
+  if(netRow != -1) {
+    rootItem->removeChild(netRow);
+  }
 }
 
 QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
-  AbstractTreeItem *netItem, *bufferItem;
-  for(int i = 0; i < rootItem->childCount(); i++) {
-    netItem = rootItem->child(i);
-    if((bufferItem = netItem->childById(qHash(bufferId)))) {
-      return indexByItem(bufferItem);
-    }
-  }
-  return QModelIndex();
+  BufferItem *bufferItem = findBufferItem(bufferId);
+  if(bufferItem)
+    return indexByItem(bufferItem);
+  else
+    return QModelIndex();
 }
 
-BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
-  QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId());
-  if(bufferIdx.isValid())
-    return static_cast<BufferItem *>(bufferIdx.internalPointer());
-  else
+BufferItem *NetworkModel::findBufferItem(const BufferInfo &bufferInfo) {
+  NetworkItem *netItem = findNetworkItem(bufferInfo.networkId());
+  if(!netItem)
     return 0;
+
+  BufferItem *bufferItem = netItem->findBufferItem(bufferInfo);
+  return 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);
+BufferItem *NetworkModel::findBufferItem(BufferId bufferId) {
+  NetworkItem *netItem;
+  BufferItem *bufferItem;
+  
+  for(int i = 0; i < rootItem->childCount(); i++) {
+    netItem = qobject_cast<NetworkItem *>(rootItem->child(i));
+    if((bufferItem = netItem->findBufferItem(bufferId)))
+      return bufferItem;
   }
+  return 0;
+}
 
-  Q_ASSERT(bufItem);
-  return bufItem;
+BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) {
+  NetworkItem *netItem = networkItem(bufferInfo.networkId());
+  return netItem->bufferItem(bufferInfo);
 }
 
 QStringList NetworkModel::mimeTypes() const {
@@ -794,13 +878,15 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
   // no self merges (would kill us)
   if(bufferId == parent.data(BufferIdRole).value<BufferId>())
     return false; 
-  
-  Q_ASSERT(rootItem->childById(qHash(netId)));
-  Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(bufferId)));
+
+  NetworkItem *netItem = findNetworkItem(netId);
+  Q_ASSERT(netItem);
+
+  BufferItem *bufferItem = netItem->findBufferItem(bufferId);
+  Q_ASSERT(bufferItem);
 
   // source must be a query too
-  BufferInfo::Type sourceType = (BufferInfo::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt();
-  if(sourceType != BufferInfo::QueryBuffer)
+  if(bufferItem->bufferType() != BufferInfo::QueryBuffer)
     return false;
     
   // TODO: warn user about buffermerge!
@@ -822,14 +908,9 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
 }
 
 void NetworkModel::removeBuffer(BufferId bufferId) {
-  const int numNetworks = rootItem->childCount();
-  if(numNetworks == 0)
-    return;
-
-  for(int i = 0; i < numNetworks; i++) {
-    if(rootItem->child(i)->removeChildById(qHash(bufferId)))
-      break;
-  }
+  BufferItem *bufferItem = findBufferItem(bufferId);
+  if(bufferItem)
+    bufferItem->parent()->removeChild(bufferItem);
 }
 
 /*