Fixing the Bug where a clear of the BufferTreeModel would not result in cleard hashlists.

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

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index 0d6111f..6dd7626 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -38,16 +38,35 @@ TreeItem::~TreeItem() {
   qDeleteAll(childItems);
 }
 
+uint TreeItem::id() const {
+  return (uint)this;
+}
+
 void TreeItem::appendChild(TreeItem *item) {
   childItems.append(item);
+  childHash[item->id()] = item;
 }
 
 void TreeItem::removeChild(int row) {
+  if(row >= childItems.size())
+    return;
+  TreeItem *treeitem = childItems.value(row);
   childItems.removeAt(row);
+  childHash.remove(childHash.key(treeitem));
 }
 
-TreeItem *TreeItem::child(int row) {
-  return childItems.value(row);
+TreeItem *TreeItem::child(int row) const {
+  if(row < childItems.size())
+    return childItems.value(row);
+  else
+    return 0;
+}
+
+TreeItem *TreeItem::childById(const uint &id) const {
+  if(childHash.contains(id))
+    return childHash.value(id);
+  else
+    return 0;
 }
 
 int TreeItem::childCount() const {
@@ -106,6 +125,21 @@ QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) con
     return QModelIndex();
 }
 
+QModelIndex TreeModel::indexById(uint id, const QModelIndex &parent) const {
+  TreeItem *parentItem; 
+  
+  if(!parent.isValid())
+    parentItem = rootItem;
+  else
+    parentItem = static_cast<TreeItem *>(parent.internalPointer());
+  
+  TreeItem *childItem = parentItem->childById(id);
+  if(childItem)
+    return createIndex(childItem->row(), 0, childItem);
+  else
+    return QModelIndex();
+}
+
 QModelIndex TreeModel::parent(const QModelIndex &index) const {
   if(!index.isValid())
     return QModelIndex();