disabling treeitem suicide if the item is deleted due to a cleanup (internal stuff...

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

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index c61cf9e..13b97f9 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include "treemodel.h"
+#include "global.h"
 
 #include <QDebug>
 #include <QCoreApplication>
@@ -28,26 +29,16 @@
  *****************************************/
 AbstractTreeItem::AbstractTreeItem(AbstractTreeItem *parent)
   : QObject(parent),
-    _flags(Qt::ItemIsSelectable | Qt::ItemIsEnabled)
+    _flags(Qt::ItemIsSelectable | Qt::ItemIsEnabled),
+    _treeItemFlags(0)
 {
 }
 
-AbstractTreeItem::~AbstractTreeItem() {
-}
-
-quint64 AbstractTreeItem::id() const {
-  return qHash(this);
-}
-
 bool AbstractTreeItem::newChild(AbstractTreeItem *item) {
-  // check if a child with that ID is already known
-  Q_ASSERT(childById(item->id()) == 0);
-    
   int newRow = childCount();
   emit beginAppendChilds(newRow, newRow);
   _childItems.append(item);
   emit endAppendChilds();
-  
   return true;
 }
 
@@ -55,26 +46,11 @@ bool AbstractTreeItem::newChilds(const QList<AbstractTreeItem *> &items) {
   if(items.isEmpty())
     return false;
   
-  QList<AbstractTreeItem *>::const_iterator itemIter = items.constBegin();
-  AbstractTreeItem *item;
-  while(itemIter != items.constEnd()) {
-    item = *itemIter;
-    if(childById(item->id()) != 0) {
-      qWarning() << "AbstractTreeItem::newChilds(): received child that is already attached" << item << item->id();
-      return false;
-    }
-    itemIter++;
-  }
-
   int nextRow = childCount();
   int lastRow = nextRow + items.count() - 1;
 
   emit beginAppendChilds(nextRow, lastRow);
-  itemIter = items.constBegin();
-  while(itemIter != items.constEnd()) {
-    _childItems.append(*itemIter);
-    itemIter++;
-  }
+  _childItems << items;
   emit endAppendChilds();
 
   return true;
@@ -90,18 +66,9 @@ bool AbstractTreeItem::removeChild(int row) {
   treeitem->deleteLater();
   emit endRemoveChilds();
 
-  return true;
-}
-
-bool AbstractTreeItem::removeChildById(const quint64 &id) {
-  const int numChilds = childCount();
-  
-  for(int i = 0; i < numChilds; i++) {
-    if(_childItems[i]->id() == id)
-      return removeChild(i);
-  }
+  checkForDeletion();
   
-  return false;
+  return true;
 }
 
 void AbstractTreeItem::removeAllChilds() {
@@ -117,6 +84,7 @@ void AbstractTreeItem::removeAllChilds() {
   childIter = _childItems.begin();
   while(childIter != _childItems.end()) {
     child = *childIter;
+    child->setTreeItemFlags(0); // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways
     child->removeAllChilds();
     childIter++;
   }
@@ -129,6 +97,8 @@ void AbstractTreeItem::removeAllChilds() {
     child->deleteLater();
   }
   emit endRemoveChilds();
+
+  checkForDeletion();
 }
 
 bool AbstractTreeItem::reParent(AbstractTreeItem *newParent) {
@@ -147,6 +117,8 @@ bool AbstractTreeItem::reParent(AbstractTreeItem *newParent) {
   parent()->_childItems.removeAt(oldRow);
   emit parent()->endRemoveChilds();
 
+  parent()->checkForDeletion();
+
   setParent(newParent);
 
   bool success = newParent->newChild(this);
@@ -163,15 +135,6 @@ AbstractTreeItem *AbstractTreeItem::child(int row) const {
     return _childItems[row];
 }
 
-AbstractTreeItem *AbstractTreeItem::childById(const quint64 &id) const {
-  const int numChilds = childCount();
-  for(int i = 0; i < numChilds; i++) {
-    if(_childItems[i]->id() == id)
-      return _childItems[i];
-  }
-  return 0;
-}
-
 int AbstractTreeItem::childCount(int column) const {
   if(column > 0)
     return 0;
@@ -191,26 +154,14 @@ int AbstractTreeItem::row() const {
   return row_;
 }
 
-AbstractTreeItem *AbstractTreeItem::parent() const {
-  return qobject_cast<AbstractTreeItem *>(QObject::parent());
-}
-
-Qt::ItemFlags AbstractTreeItem::flags() const {
-  return _flags;
-}
-
-void AbstractTreeItem::setFlags(Qt::ItemFlags flags) {
-  _flags = flags;
-}
-
 void AbstractTreeItem::dumpChildList() {
-  qDebug() << "==== Childlist for Item:" << this << id() << "====";
+  qDebug() << "==== Childlist for Item:" << this << "====";
   if(childCount() > 0) {
     AbstractTreeItem *child;
     QList<AbstractTreeItem *>::const_iterator childIter = _childItems.constBegin();
     while(childIter != _childItems.constEnd()) {
       child = *childIter;
-      qDebug() << "Row:" << child->row() << child << child->id() << child->data(0, Qt::DisplayRole);
+      qDebug() << "Row:" << child->row() << child << child->data(0, Qt::DisplayRole);
       childIter++;
     }
   }
@@ -317,7 +268,7 @@ TreeModel::TreeModel(const QList<QVariant> &data, QObject *parent)
   rootItem = new SimpleTreeItem(data, 0);
   connectItem(rootItem);
 
-  if(QCoreApplication::instance()->arguments().contains("--debugmodel")) {
+  if(Global::parser.isSet("debugmodel")) {
     connect(this, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
            this, SLOT(debug_rowsAboutToBeInserted(const QModelIndex &, int, int)));
     connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
@@ -354,22 +305,6 @@ QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) con
     return QModelIndex();
 }
 
-QModelIndex TreeModel::indexById(quint64 id, const QModelIndex &parent) const {
-  AbstractTreeItem *parentItem; 
-  
-  if(!parent.isValid())
-    parentItem = rootItem;
-  else
-    parentItem = static_cast<AbstractTreeItem *>(parent.internalPointer());
-  
-  AbstractTreeItem *childItem = parentItem->childById(id);
-  
-  if(childItem)
-    return createIndex(childItem->row(), 0, childItem);
-  else
-    return QModelIndex();
-}
-
 QModelIndex TreeModel::indexByItem(AbstractTreeItem *item) const {
   if(item == 0) {
     qWarning() << "TreeModel::indexByItem(AbstractTreeItem *item) received NULL-Pointer";
@@ -584,7 +519,7 @@ void TreeModel::debug_rowsAboutToBeRemoved(const QModelIndex &parent, int start,
     child = parent.child(i, 0);
     childItem = parentItem->child(i);
     Q_ASSERT(childItem);
-    qDebug() << ">>>" << i << child << childItem->id() << child.data().toString();
+    qDebug() << ">>>" << i << child << child.data().toString();
   }
 }
 
@@ -601,7 +536,7 @@ void TreeModel::debug_rowsInserted(const QModelIndex &parent, int start, int end
     child = parent.child(i, 0);
     childItem = parentItem->child(i);
     Q_ASSERT(childItem);
-    qDebug() << "<<<" << i << child << childItem->id() << child.data().toString();
+    qDebug() << "<<<" << i << child << child.data().toString();
   }
 }