X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.cpp;h=fd47bc04991e8ef86d8bdbd32bf19551a849df67;hp=05b2635764d84a15d472fbfbac96ef8dad6dd891;hb=e3fd10043d24f875937fe82c9b5406e9ae93abd7;hpb=7f9a9f7627d590ae99d489c343b75d76c9db33ae

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index 05b26357..fd47bc04 100644
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,499 +15,665 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "treemodel.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 
+#include "quassel.h"
+
+class RemoveChildLaterEvent : public QEvent
+{
+public:
+    RemoveChildLaterEvent(AbstractTreeItem *child) : QEvent(QEvent::User), _child(child) {};
+    inline AbstractTreeItem *child() { return _child; }
+private:
+    AbstractTreeItem *_child;
+};
+
+
 /*****************************************
  *  Abstract Items of a TreeModel
  *****************************************/
 AbstractTreeItem::AbstractTreeItem(AbstractTreeItem *parent)
-  : QObject(parent),
-    _flags(Qt::ItemIsSelectable | Qt::ItemIsEnabled)
+    : QObject(parent),
+    _flags(Qt::ItemIsSelectable | Qt::ItemIsEnabled),
+    _treeItemFlags(0)
 {
 }
 
-AbstractTreeItem::~AbstractTreeItem() {
-  removeAllChilds();
-}
 
-quint64 AbstractTreeItem::id() const {
-  return (quint64)this;
+bool AbstractTreeItem::newChild(AbstractTreeItem *item)
+{
+    int newRow = childCount();
+    emit beginAppendChilds(newRow, newRow);
+    _childItems.append(item);
+    emit endAppendChilds();
+    return true;
 }
 
-int AbstractTreeItem::defaultColumn() const {
-  // invalid QModelIndexes aka rootNodes get their Childs stuffed into column -1
-  // all others to 0
-  if(parent() == 0)
-    return -1;
-  else
-    return 0;
-}
 
-void AbstractTreeItem::appendChild(int column, AbstractTreeItem *item) {
-  if(!_childItems.contains(column)) {
-    _childItems[column] = QList<AbstractTreeItem *>();
-    _childHash[column] = QHash<quint64, AbstractTreeItem *>();
-  }
-  
-  _childItems[column].append(item);
-  _childHash[column][item->id()] = item;
+bool AbstractTreeItem::newChilds(const QList<AbstractTreeItem *> &items)
+{
+    if (items.isEmpty())
+        return false;
+
+    int nextRow = childCount();
+    int lastRow = nextRow + items.count() - 1;
 
-  connect(item, SIGNAL(destroyed()), this, SLOT(childDestroyed()));
-}
+    emit beginAppendChilds(nextRow, lastRow);
+    _childItems << items;
+    emit endAppendChilds();
 
-void AbstractTreeItem::appendChild(AbstractTreeItem *child) {
-  appendChild(defaultColumn(), child);
+    return true;
 }
 
-void AbstractTreeItem::removeChild(int column, int row) {
-  if(!_childItems.contains(column)
-     || _childItems[column].size() <= row)
-    return;
 
-  if(column == defaultColumn())
+bool AbstractTreeItem::removeChild(int row)
+{
+    if (row < 0 || childCount() <= row)
+        return false;
+
+    child(row)->removeAllChilds();
     emit beginRemoveChilds(row, row);
-  
-  AbstractTreeItem *treeitem = _childItems[column].value(row);
-  _childItems[column].removeAt(row);
-  _childHash[column].remove(_childHash[column].key(treeitem));
-  disconnect(treeitem, 0, this, 0);
-  treeitem->deleteLater();
-
-  if(column == defaultColumn())
+    AbstractTreeItem *treeitem = _childItems.takeAt(row);
+    delete treeitem;
     emit endRemoveChilds();
-}
 
-void AbstractTreeItem::removeChild(int row) {
-  removeChild(defaultColumn(), row);
+    checkForDeletion();
+
+    return true;
 }
 
-void AbstractTreeItem::removeAllChilds() {
-  if(childCount() == 0)
-    return;
 
-  emit beginRemoveChilds(0, childCount() - 1);
+void AbstractTreeItem::removeAllChilds()
+{
+    const int numChilds = childCount();
 
-  AbstractTreeItem *child;
-  foreach(int key, _childItems.keys()) {
-    QList<AbstractTreeItem *>::iterator iter = _childItems[key].begin();
-    while(iter != _childItems[key].end()) {
-      child = *iter;
-      iter = _childItems[key].erase(iter);
-      disconnect(child, 0, this, 0);
-      child->removeAllChilds();
-      child->deleteLater();
+    if (numChilds == 0)
+        return;
+
+    AbstractTreeItem *child;
+
+    QList<AbstractTreeItem *>::iterator childIter;
+
+    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++;
     }
-  }
-  emit endRemoveChilds();
-}
 
-AbstractTreeItem *AbstractTreeItem::child(int column, int row) const {
-  if(!_childItems.contains(column)
-     || _childItems[column].size() <= row)
-    return 0;
-  else
-    return _childItems[column].value(row);
-}
+    emit beginRemoveChilds(0, numChilds - 1);
+    childIter = _childItems.begin();
+    while (childIter != _childItems.end()) {
+        child = *childIter;
+        childIter = _childItems.erase(childIter);
+        delete child;
+    }
+    emit endRemoveChilds();
 
-AbstractTreeItem *AbstractTreeItem::child(int row) const {
-  return child(defaultColumn(), row);
+    checkForDeletion();
 }
 
-AbstractTreeItem *AbstractTreeItem::childById(int column, const quint64 &id) const {
-  if(!_childHash.contains(column)
-     || !_childHash[column].contains(id))
-    return 0;
-  else
-    return _childHash[column].value(id);
-}
 
-AbstractTreeItem *AbstractTreeItem::childById(const quint64 &id) const {
-  return childById(defaultColumn(), id);
+void AbstractTreeItem::removeChildLater(AbstractTreeItem *child)
+{
+    Q_ASSERT(child);
+    QCoreApplication::postEvent(this, new RemoveChildLaterEvent(child));
 }
 
-int AbstractTreeItem::childCount(int column) const {
-  if(!_childItems.contains(column))
-    return 0;
-  else
-    return _childItems[column].count();
-}
 
-int AbstractTreeItem::childCount() const {
-  return childCount(defaultColumn());
-}
+void AbstractTreeItem::customEvent(QEvent *event)
+{
+    if (event->type() != QEvent::User)
+        return;
 
-int AbstractTreeItem::column() const {
-  if(!parent())
-    return -1;
+    event->accept();
 
-  QHash<int, QList<AbstractTreeItem*> >::const_iterator iter = parent()->_childItems.constBegin();
-  while(iter != parent()->_childItems.constEnd()) {
-    if(iter.value().contains(const_cast<AbstractTreeItem *>(this)))
-      return iter.key();
-    iter++;
-  }
+    RemoveChildLaterEvent *removeEvent = static_cast<RemoveChildLaterEvent *>(event);
+    int childRow = _childItems.indexOf(removeEvent->child());
+    if (childRow == -1)
+        return;
 
-  // unable to find us o_O
-  return parent()->defaultColumn();
-}
+    // since we are called asynchronously we have to recheck if the item in question still has no childs
+    if (removeEvent->child()->childCount())
+        return;
 
-int AbstractTreeItem::row() const {
-  if(!parent())
-    return -1;
-  else
-    return parent()->_childItems[column()].indexOf(const_cast<AbstractTreeItem*>(this));
+    removeChild(childRow);
 }
 
-AbstractTreeItem *AbstractTreeItem::parent() const {
-  return qobject_cast<AbstractTreeItem *>(QObject::parent());
+
+bool AbstractTreeItem::reParent(AbstractTreeItem *newParent)
+{
+    // currently we support only re parenting if the child that's about to be
+    // adopted does not have any children itself.
+    if (childCount() != 0) {
+        qDebug() << "AbstractTreeItem::reParent(): cannot reparent"  << this << "with children.";
+        return false;
+    }
+
+    int oldRow = row();
+    if (oldRow == -1)
+        return false;
+
+    emit parent()->beginRemoveChilds(oldRow, oldRow);
+    parent()->_childItems.removeAt(oldRow);
+    emit parent()->endRemoveChilds();
+
+    AbstractTreeItem *oldParent = parent();
+    setParent(newParent);
+
+    bool success = newParent->newChild(this);
+    if (!success)
+        qWarning() << "AbstractTreeItem::reParent(): failed to attach to new parent after removing from old parent! this:" << this << "new parent:" << newParent;
+
+    if (oldParent)
+        oldParent->checkForDeletion();
+
+    return success;
 }
 
-Qt::ItemFlags AbstractTreeItem::flags() const {
-  return _flags;
+
+AbstractTreeItem *AbstractTreeItem::child(int row) const
+{
+    if (childCount() <= row)
+        return 0;
+    else
+        return _childItems[row];
 }
 
-void AbstractTreeItem::setFlags(Qt::ItemFlags flags) {
-  _flags = flags;
+
+int AbstractTreeItem::childCount(int column) const
+{
+    if (column > 0)
+        return 0;
+    else
+        return _childItems.count();
 }
 
-void AbstractTreeItem::childDestroyed() {
-  AbstractTreeItem *item = static_cast<AbstractTreeItem*>(sender());
 
-  if(!item) {
-    qWarning() << "AbstractTreeItem::childDestroyed() received null pointer!";
-    return;
-  }
+int AbstractTreeItem::row() const
+{
+    if (!parent()) {
+        qWarning() << "AbstractTreeItem::row():" << this << "has no parent AbstractTreeItem as it's parent! parent is" << QObject::parent();
+        return -1;
+    }
 
-  QHash<int, QList<AbstractTreeItem*> >::const_iterator iter = _childItems.constBegin();
-  int column, row = -1;
-  while(iter != _childItems.constEnd()) {
-    row = iter.value().indexOf(item);
-    if(row != -1) {
-      column = iter.key();
-      break;
+    int row_ = parent()->_childItems.indexOf(const_cast<AbstractTreeItem *>(this));
+    if (row_ == -1)
+        qWarning() << "AbstractTreeItem::row():" << this << "is not in the child list of" << QObject::parent();
+    return row_;
+}
+
+
+void AbstractTreeItem::dumpChildList()
+{
+    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->data(0, Qt::DisplayRole);
+            childIter++;
+        }
     }
-    iter++;
-  }
-
-  if(row == -1) {
-    qWarning() << "AbstractTreeItem::childDestroyed(): unknown Child died:" << item << "parent:" << this;
-    return;
-  }
-  
-  _childItems[column].removeAt(row);
-  _childHash[column].remove(_childHash[column].key(item));
-  emit beginRemoveChilds(row, row);
-  emit endRemoveChilds();
-}
-  
+    qDebug() << "==== End Of Childlist ====";
+}
+
+
 /*****************************************
  * SimpleTreeItem
  *****************************************/
 SimpleTreeItem::SimpleTreeItem(const QList<QVariant> &data, AbstractTreeItem *parent)
-  : AbstractTreeItem(parent),
+    : AbstractTreeItem(parent),
     _itemData(data)
 {
 }
 
-SimpleTreeItem::~SimpleTreeItem() {
+
+SimpleTreeItem::~SimpleTreeItem()
+{
 }
 
-QVariant SimpleTreeItem::data(int column, int role) const {
-  if(role == Qt::DisplayRole && column < _itemData.count())
-    return _itemData[column];
-  else
-    return QVariant();
+
+QVariant SimpleTreeItem::data(int column, int role) const
+{
+    if (column >= columnCount() || role != Qt::DisplayRole)
+        return QVariant();
+    else
+        return _itemData[column];
 }
 
-int SimpleTreeItem::columnCount() const {
-  return _itemData.count();
+
+bool SimpleTreeItem::setData(int column, const QVariant &value, int role)
+{
+    if (column > columnCount() || role != Qt::DisplayRole)
+        return false;
+
+    if (column == columnCount())
+        _itemData.append(value);
+    else
+        _itemData[column] = value;
+
+    emit dataChanged(column);
+    return true;
 }
 
+
+int SimpleTreeItem::columnCount() const
+{
+    return _itemData.count();
+}
+
+
 /*****************************************
  * PropertyMapItem
  *****************************************/
 PropertyMapItem::PropertyMapItem(const QStringList &propertyOrder, AbstractTreeItem *parent)
-  : AbstractTreeItem(parent),
+    : AbstractTreeItem(parent),
     _propertyOrder(propertyOrder)
 {
 }
 
+
 PropertyMapItem::PropertyMapItem(AbstractTreeItem *parent)
-  : AbstractTreeItem(parent),
+    : AbstractTreeItem(parent),
     _propertyOrder(QStringList())
 {
 }
 
 
-PropertyMapItem::~PropertyMapItem() {
+PropertyMapItem::~PropertyMapItem()
+{
 }
-  
-QVariant PropertyMapItem::data(int column, int role) const {
-  if(column >= columnCount())
-    return QVariant();
 
-  if(role != Qt::DisplayRole)
-    return QVariant();
 
-  return property(_propertyOrder[column].toAscii());
+QVariant PropertyMapItem::data(int column, int role) const
+{
+    if (column >= columnCount())
+        return QVariant();
+
+    switch (role) {
+    case Qt::ToolTipRole:
+        return toolTip(column);
+    case Qt::DisplayRole:
+    case TreeModel::SortRole: // fallthrough, since SortRole should default to DisplayRole
+        return property(_propertyOrder[column].toLatin1());
+    default:
+        return QVariant();
+    }
 }
 
-int PropertyMapItem::columnCount() const {
-  return _propertyOrder.count();
+
+bool PropertyMapItem::setData(int column, const QVariant &value, int role)
+{
+    if (column >= columnCount() || role != Qt::DisplayRole)
+        return false;
+
+    emit dataChanged(column);
+    return setProperty(_propertyOrder[column].toLatin1(), value);
 }
-  
-void PropertyMapItem::appendProperty(const QString &property) {
-  _propertyOrder << property;
+
+
+int PropertyMapItem::columnCount() const
+{
+    return _propertyOrder.count();
 }
 
 
+void PropertyMapItem::appendProperty(const QString &property)
+{
+    _propertyOrder << property;
+}
+
 
 /*****************************************
  * TreeModel
  *****************************************/
 TreeModel::TreeModel(const QList<QVariant> &data, QObject *parent)
-  : QAbstractItemModel(parent)
+    : QAbstractItemModel(parent),
+    _childStatus(QModelIndex(), 0, 0, 0),
+    _aboutToRemoveOrInsert(false)
 {
-  rootItem = new SimpleTreeItem(data, 0);
+    rootItem = new SimpleTreeItem(data, 0);
+    connectItem(rootItem);
+
+    if (Quassel::isOptionSet("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)),
+            this, SLOT(debug_rowsAboutToBeRemoved(const QModelIndex &, int, int)));
+        connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+            this, SLOT(debug_rowsInserted(const QModelIndex &, int, int)));
+        connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+            this, SLOT(debug_rowsRemoved(const QModelIndex &, int, int)));
+        connect(this, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
+            this, SLOT(debug_dataChanged(const QModelIndex &, const QModelIndex &)));
+    }
 }
 
-TreeModel::~TreeModel() {
-  delete rootItem;
+
+TreeModel::~TreeModel()
+{
+    delete rootItem;
 }
 
-QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) const {
-  if(!hasIndex(row, column, parent))
-    return QModelIndex();
-  
-  AbstractTreeItem *parentItem;
-  
-  if(!parent.isValid())
-    parentItem = rootItem;
-  else
-    parentItem = static_cast<AbstractTreeItem*>(parent.internalPointer());
-  
-  AbstractTreeItem *childItem = parentItem->child(parent.column(), row);
 
-  if(childItem)
-    return createIndex(row, column, childItem);
-  else
-    return QModelIndex();
+QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0 || row >= rowCount(parent) || column < 0 || column >= columnCount(parent))
+        return QModelIndex();
+
+    AbstractTreeItem *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<AbstractTreeItem *>(parent.internalPointer());
+
+    AbstractTreeItem *childItem = parentItem->child(row);
+
+    if (childItem)
+        return createIndex(row, column, childItem);
+    else
+        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(parent.column(), 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";
-    return QModelIndex();
-  }
-  
-  if(item == rootItem)
-    return QModelIndex();
-  else
-    return createIndex(item->row(), 0, item);
-
-}
-
-QModelIndex TreeModel::parent(const QModelIndex &index) const {
-  if(!index.isValid())
-    return QModelIndex();
-  
-  AbstractTreeItem *childItem = static_cast<AbstractTreeItem *>(index.internalPointer());
-  AbstractTreeItem *parentItem = static_cast<AbstractTreeItem *>(childItem->parent());
-  
-  if(parentItem == rootItem)
-    return QModelIndex();
-  
-  return createIndex(parentItem->row(), 0, parentItem);
-}
-
-int TreeModel::rowCount(const QModelIndex &parent) const {
-  AbstractTreeItem *parentItem;
-  if(!parent.isValid())
-    parentItem = rootItem;
-  else
-    parentItem = static_cast<AbstractTreeItem*>(parent.internalPointer());
-
-  return parentItem->childCount(parent.column());
-}
-
-int TreeModel::columnCount(const QModelIndex &parent) const {
-  Q_UNUSED(parent)
-  // since there the Qt Views don't draw more columns than the header has columns
-  // we can be lazy and simply return the count of header columns
-  // actually this gives us more freedom cause we don't have to ensure that a rows parent
-  // has equal or more columns than that row
-  
-//   if(parent.isValid()) {
-//     AbstractTreeItem *child;
-//     if(child = static_cast<AbstractTreeItem *>(parent.internalPointer())->child(parent.column(), parent.row()))
-//       return child->columnCount();
-//     else
-//       return static_cast<AbstractTreeItem*>(parent.internalPointer())->columnCount();
-//   } else {
-//     return rootItem->columnCount();
-//   }
 
-  return rootItem->columnCount();
+QModelIndex TreeModel::indexByItem(AbstractTreeItem *item) const
+{
+    if (item == 0) {
+        qWarning() << "TreeModel::indexByItem(AbstractTreeItem *item) received NULL-Pointer";
+        return QModelIndex();
+    }
+
+    if (item == rootItem)
+        return QModelIndex();
+    else
+        return createIndex(item->row(), 0, item);
 }
 
-QVariant TreeModel::data(const QModelIndex &index, int role) const {
-  if(!index.isValid())
-    return QVariant();
-
-  AbstractTreeItem *item = static_cast<AbstractTreeItem*>(index.internalPointer());
-  return item->data(index.column(), role);
-}
-
-Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const {
-  AbstractTreeItem *item;
-  if(!index.isValid())
-    item = rootItem;
-  else
-    item = static_cast<AbstractTreeItem *>(index.internalPointer());
-  return item->flags();
-}
-
-QVariant TreeModel::headerData(int section, Qt::Orientation orientation, int role) const {
-  if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
-    return rootItem->data(section, role);
-  else
-    return QVariant();
-}
-
-void TreeModel::itemDataChanged(int column) {
-  AbstractTreeItem *item = qobject_cast<AbstractTreeItem *>(sender());
-  QModelIndex leftIndex, rightIndex;
-
-  if(item == rootItem)
-    return;
-
-  if(column == -1) {
-    leftIndex = createIndex(item->row(), 0, item);
-    rightIndex = createIndex(item->row(), item->columnCount()-1, item);
-  } else {
-    leftIndex = createIndex(item->row(), column, item);
-    rightIndex = leftIndex;
-  }
-
-  emit dataChanged(leftIndex, rightIndex);
+
+QModelIndex TreeModel::parent(const QModelIndex &index) const
+{
+    if (!index.isValid()) {
+        // ModelTest does this
+        // qWarning() << "TreeModel::parent(): has been asked for the rootItems Parent!";
+        return QModelIndex();
+    }
+
+    AbstractTreeItem *childItem = static_cast<AbstractTreeItem *>(index.internalPointer());
+    AbstractTreeItem *parentItem = childItem->parent();
+
+    Q_ASSERT(parentItem);
+    if (parentItem == rootItem)
+        return QModelIndex();
+
+    return createIndex(parentItem->row(), 0, parentItem);
 }
 
-void TreeModel::appendChild(AbstractTreeItem *parent, AbstractTreeItem *child) {
-  if(parent == 0 or child == 0) {
-    qWarning() << "TreeModel::appendChild(parent, child) parent and child have to be valid pointers!" << parent << child;
-    return;
-  }
 
-  int nextRow = parent->childCount();
-  beginInsertRows(indexByItem(parent), nextRow, nextRow);
-  parent->appendChild(child);
-  endInsertRows();
+int TreeModel::rowCount(const QModelIndex &parent) const
+{
+    AbstractTreeItem *parentItem;
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<AbstractTreeItem *>(parent.internalPointer());
+
+    return parentItem->childCount(parent.column());
+}
+
 
-  connect(child, SIGNAL(dataChanged(int)),
-	  this, SLOT(itemDataChanged(int)));
-  
-  connect(child, SIGNAL(newChild(AbstractTreeItem *)),
-	  this, SLOT(newChild(AbstractTreeItem *)));
-
-//   connect(child, SIGNAL(childRemoved(int)),
-// 	  this, SLOT(childRemoved(int)));
+int TreeModel::columnCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return rootItem->columnCount();
+    // since there the Qt Views don't draw more columns than the header has columns
+    // we can be lazy and simply return the count of header columns
+    // actually this gives us more freedom cause we don't have to ensure that a rows parent
+    // has equal or more columns than that row
 
-  connect(child, SIGNAL(beginRemoveChilds(int, int)),
-	  this, SLOT(beginRemoveChilds(int, int)));
-  
-  connect(child, SIGNAL(endRemoveChilds()),
-	  this, SLOT(endRemoveChilds()));
+//   AbstractTreeItem *parentItem;
+//   if(!parent.isValid())
+//     parentItem = rootItem;
+//   else
+//     parentItem = static_cast<AbstractTreeItem*>(parent.internalPointer());
+//   return parentItem->columnCount();
 }
 
-void TreeModel::newChild(AbstractTreeItem *child) {
-  appendChild(static_cast<AbstractTreeItem *>(sender()), child);
+
+QVariant TreeModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    AbstractTreeItem *item = static_cast<AbstractTreeItem *>(index.internalPointer());
+    return item->data(index.column(), role);
 }
 
-void TreeModel::beginRemoveChilds(int firstRow, int lastRow) {
-  QModelIndex parent = indexByItem(static_cast<AbstractTreeItem *>(sender()));
-  beginRemoveRows(parent, firstRow, lastRow);
+
+bool TreeModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid())
+        return false;
+
+    AbstractTreeItem *item = static_cast<AbstractTreeItem *>(index.internalPointer());
+    return item->setData(index.column(), value, role);
+}
+
+
+Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid()) {
+        return rootItem->flags() & Qt::ItemIsDropEnabled;
+    }
+    else {
+        AbstractTreeItem *item = static_cast<AbstractTreeItem *>(index.internalPointer());
+        return item->flags();
+    }
 }
 
-void TreeModel::endRemoveChilds() {
-  endRemoveRows();
+
+QVariant TreeModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+        return rootItem->data(section, role);
+    else
+        return QVariant();
 }
 
-void TreeModel::childRemoved(int row) {
-  QModelIndex parent = indexByItem(static_cast<AbstractTreeItem *>(sender()));
-  beginRemoveRows(parent, row, row);
-  endRemoveRows();
+
+void TreeModel::itemDataChanged(int column)
+{
+    AbstractTreeItem *item = qobject_cast<AbstractTreeItem *>(sender());
+    QModelIndex leftIndex, rightIndex;
+
+    if (item == rootItem)
+        return;
+
+    if (column == -1) {
+        leftIndex = createIndex(item->row(), 0, item);
+        rightIndex = createIndex(item->row(), item->columnCount() - 1, item);
+    }
+    else {
+        leftIndex = createIndex(item->row(), column, item);
+        rightIndex = leftIndex;
+    }
+
+    emit dataChanged(leftIndex, rightIndex);
 }
 
-void TreeModel::childsRemoved(int firstRow, int lastRow) {
-  QModelIndex parent = indexByItem(static_cast<AbstractTreeItem *>(sender()));
-  beginRemoveRows(parent, firstRow, lastRow);
-  endRemoveRows();
-  
+
+void TreeModel::connectItem(AbstractTreeItem *item)
+{
+    connect(item, SIGNAL(dataChanged(int)),
+        this, SLOT(itemDataChanged(int)));
+
+    connect(item, SIGNAL(beginAppendChilds(int, int)),
+        this, SLOT(beginAppendChilds(int, int)));
+    connect(item, SIGNAL(endAppendChilds()),
+        this, SLOT(endAppendChilds()));
+
+    connect(item, SIGNAL(beginRemoveChilds(int, int)),
+        this, SLOT(beginRemoveChilds(int, int)));
+    connect(item, SIGNAL(endRemoveChilds()),
+        this, SLOT(endRemoveChilds()));
 }
 
-bool TreeModel::removeRow(int row, const QModelIndex &parent) {
-  if(row > rowCount(parent))
-    return false;
-  
-  AbstractTreeItem *item;
-  if(!parent.isValid())
-    item = rootItem;
-  else
-    item = static_cast<AbstractTreeItem*>(parent.internalPointer());
-  
-  beginRemoveRows(parent, row, row);
-  item->removeChild(parent.column(), row);
-  endRemoveRows();
-  return true;
+
+void TreeModel::beginAppendChilds(int firstRow, int lastRow)
+{
+    AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
+    if (!parentItem) {
+        qWarning() << "TreeModel::beginAppendChilds(): cannot append Children to unknown parent";
+        return;
+    }
+
+    QModelIndex parent = indexByItem(parentItem);
+    Q_ASSERT(!_aboutToRemoveOrInsert);
+
+    _aboutToRemoveOrInsert = true;
+    _childStatus = ChildStatus(parent, rowCount(parent), firstRow, lastRow);
+    beginInsertRows(parent, firstRow, lastRow);
 }
 
-bool TreeModel::removeRows(int row, int count, const QModelIndex &parent) {
-  // check if there is work to be done
-  if(count == 0)
-    return true;
 
-  // out of range check
-  if(row + count - 1 > rowCount(parent) || row < 0 || count < 0) 
-    return false;
-  
-  AbstractTreeItem *item;
-  if(!parent.isValid())
-    item = rootItem;
-  else
-    item = static_cast<AbstractTreeItem *>(parent.internalPointer());
-  
-  
-  beginRemoveRows(parent, row, row + count - 1);
-
-  for(int i = row + count - 1; i >= 0; i--) {
-    item->removeChild(parent.column(), i);
-  }
-  endRemoveRows();
-  return true;
-}
-
-void TreeModel::clear() {
-  removeRows(0, rowCount());
-  reset();
+void TreeModel::endAppendChilds()
+{
+    AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
+    if (!parentItem) {
+        qWarning() << "TreeModel::endAppendChilds(): cannot append Children to unknown parent";
+        return;
+    }
+    Q_ASSERT(_aboutToRemoveOrInsert);
+    ChildStatus cs = _childStatus;
+#ifndef QT_NO_DEBUG
+    QModelIndex parent = indexByItem(parentItem);
+    Q_ASSERT(cs.parent == parent);
+    Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
+#endif
+    _aboutToRemoveOrInsert = false;
+    for (int i = cs.start; i <= cs.end; i++) {
+        connectItem(parentItem->child(i));
+    }
+    endInsertRows();
+}
+
+
+void TreeModel::beginRemoveChilds(int firstRow, int lastRow)
+{
+    AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
+    if (!parentItem) {
+        qWarning() << "TreeModel::beginRemoveChilds(): cannot append Children to unknown parent";
+        return;
+    }
+
+    for (int i = firstRow; i <= lastRow; i++) {
+        disconnect(parentItem->child(i), 0, this, 0);
+    }
+
+    // consitency checks
+    QModelIndex parent = indexByItem(parentItem);
+    Q_ASSERT(firstRow <= lastRow);
+    Q_ASSERT(parentItem->childCount() > lastRow);
+    Q_ASSERT(!_aboutToRemoveOrInsert);
+    _aboutToRemoveOrInsert = true;
+    _childStatus = ChildStatus(parent, rowCount(parent), firstRow, lastRow);
+
+    beginRemoveRows(parent, firstRow, lastRow);
+}
+
+
+void TreeModel::endRemoveChilds()
+{
+    AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
+    if (!parentItem) {
+        qWarning() << "TreeModel::endRemoveChilds(): cannot remove Children from unknown parent";
+        return;
+    }
+
+    // concistency checks
+    Q_ASSERT(_aboutToRemoveOrInsert);
+#ifndef QT_NO_DEBUG
+    ChildStatus cs = _childStatus;
+    QModelIndex parent = indexByItem(parentItem);
+    Q_ASSERT(cs.parent == parent);
+    Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
+#endif
+    _aboutToRemoveOrInsert = false;
+
+    endRemoveRows();
+}
+
+
+void TreeModel::clear()
+{
+    rootItem->removeAllChilds();
+}
+
+
+void TreeModel::debug_rowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
+{
+    qDebug() << "debug_rowsAboutToBeInserted" << parent << parent.internalPointer() << parent.data().toString() << rowCount(parent) << start << end;
+}
+
+
+void TreeModel::debug_rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+{
+    AbstractTreeItem *parentItem;
+    parentItem = static_cast<AbstractTreeItem *>(parent.internalPointer());
+    if (!parentItem)
+        parentItem = rootItem;
+    qDebug() << "debug_rowsAboutToBeRemoved" << parent << parentItem << parent.data().toString() << rowCount(parent) << start << end;
+
+    QModelIndex child;
+    for (int i = end; i >= start; i--) {
+        child = parent.child(i, 0);
+        Q_ASSERT(parentItem->child(i));
+        qDebug() << ">>>" << i << child << child.data().toString();
+    }
+}
+
+
+void TreeModel::debug_rowsInserted(const QModelIndex &parent, int start, int end)
+{
+    AbstractTreeItem *parentItem;
+    parentItem = static_cast<AbstractTreeItem *>(parent.internalPointer());
+    if (!parentItem)
+        parentItem = rootItem;
+    qDebug() << "debug_rowsInserted:" << parent << parentItem << parent.data().toString() << rowCount(parent) << start << end;
+
+    QModelIndex child;
+    for (int i = start; i <= end; i++) {
+        child = parent.child(i, 0);
+        Q_ASSERT(parentItem->child(i));
+        qDebug() << "<<<" << i << child << child.data().toString();
+    }
+}
+
+
+void TreeModel::debug_rowsRemoved(const QModelIndex &parent, int start, int end)
+{
+    qDebug() << "debug_rowsRemoved" << parent << parent.internalPointer() << parent.data().toString() << rowCount(parent) << start << end;
+}
+
+
+void TreeModel::debug_dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+{
+    qDebug() << "debug_dataChanged" << topLeft << bottomRight;
+    QStringList displayData;
+    for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
+        displayData = QStringList();
+        for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
+            displayData << data(topLeft.sibling(row, column), Qt::DisplayRole).toString();
+        }
+        qDebug() << "  row:" << row << displayData;
+    }
 }