X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.cpp;h=64cc26fe333ae79f6980593a192942aca8438423;hp=c61cf9e83366b7bcba8973acfcb69ea6c2476a4b;hb=46d75f41de7c1aaee605c096da28d4b0d8abf138;hpb=e8a5c49548759045b49c208c250c6f61c7fdfcd5 diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index c61cf9e8..64cc26fe 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-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,96 +20,73 @@ #include "treemodel.h" -#include #include +#include + +#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) + _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; } bool AbstractTreeItem::newChilds(const QList &items) { if(items.isEmpty()) return false; - - QList::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; } bool AbstractTreeItem::removeChild(int row) { - if(childCount() <= row) + if(row < 0 || childCount() <= row) return false; child(row)->removeAllChilds(); emit beginRemoveChilds(row, row); AbstractTreeItem *treeitem = _childItems.takeAt(row); - treeitem->deleteLater(); + delete treeitem; emit endRemoveChilds(); - return true; -} + checkForDeletion(); -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); - } - - return false; + return true; } void AbstractTreeItem::removeAllChilds() { const int numChilds = childCount(); - + if(numChilds == 0) return; - + AbstractTreeItem *child; QList::iterator childIter; @@ -117,6 +94,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++; } @@ -126,9 +104,30 @@ void AbstractTreeItem::removeAllChilds() { while(childIter != _childItems.end()) { child = *childIter; childIter = _childItems.erase(childIter); - child->deleteLater(); + delete child; } emit endRemoveChilds(); + + checkForDeletion(); +} + +void AbstractTreeItem::removeChildLater(AbstractTreeItem *child) { + Q_ASSERT(child); + QCoreApplication::postEvent(this, new RemoveChildLaterEvent(child)); +} + +void AbstractTreeItem::customEvent(QEvent *event) { + if(event->type() != QEvent::User) + return; + + event->accept(); + + RemoveChildLaterEvent *removeEvent = static_cast(event); + int childRow = _childItems.indexOf(removeEvent->child()); + if(childRow == -1) + return; + + removeChild(childRow); } bool AbstractTreeItem::reParent(AbstractTreeItem *newParent) { @@ -142,17 +141,21 @@ bool AbstractTreeItem::reParent(AbstractTreeItem *newParent) { 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; } @@ -163,15 +166,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; @@ -184,37 +178,25 @@ int AbstractTreeItem::row() const { qWarning() << "AbstractTreeItem::row():" << this << "has no parent AbstractTreeItem as it's parent! parent is" << QObject::parent(); return -1; } - + int row_ = parent()->_childItems.indexOf(const_cast(this)); if(row_ == -1) qWarning() << "AbstractTreeItem::row():" << this << "is not in the child list of" << QObject::parent(); return row_; } -AbstractTreeItem *AbstractTreeItem::parent() const { - return qobject_cast(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::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++; } } - qDebug() << "==== End Of Childlist ===="; + qDebug() << "==== End Of Childlist ===="; } /***************************************** @@ -271,7 +253,7 @@ PropertyMapItem::PropertyMapItem(AbstractTreeItem *parent) PropertyMapItem::~PropertyMapItem() { } - + QVariant PropertyMapItem::data(int column, int role) const { if(column >= columnCount()) return QVariant(); @@ -285,7 +267,7 @@ QVariant PropertyMapItem::data(int column, int role) const { default: return QVariant(); } - + } bool PropertyMapItem::setData(int column, const QVariant &value, int role) { @@ -299,7 +281,7 @@ bool PropertyMapItem::setData(int column, const QVariant &value, int role) { int PropertyMapItem::columnCount() const { return _propertyOrder.count(); } - + void PropertyMapItem::appendProperty(const QString &property) { _propertyOrder << property; } @@ -317,7 +299,7 @@ TreeModel::TreeModel(const QList &data, QObject *parent) rootItem = new SimpleTreeItem(data, 0); connectItem(rootItem); - if(QCoreApplication::instance()->arguments().contains("--debugmodel")) { + 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)), @@ -338,14 +320,14 @@ TreeModel::~TreeModel() { 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(parent.internalPointer()); - + AbstractTreeItem *childItem = parentItem->child(row); if(childItem) @@ -354,28 +336,12 @@ 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(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"; return QModelIndex(); } - + if(item == rootItem) return QModelIndex(); else @@ -387,14 +353,14 @@ QModelIndex TreeModel::parent(const QModelIndex &index) const { qWarning() << "TreeModel::parent(): has been asked for the rootItems Parent!"; return QModelIndex(); } - + AbstractTreeItem *childItem = static_cast(index.internalPointer()); AbstractTreeItem *parentItem = childItem->parent(); Q_ASSERT(parentItem); if(parentItem == rootItem) return QModelIndex(); - + return createIndex(parentItem->row(), 0, parentItem); } @@ -477,12 +443,12 @@ void TreeModel::itemDataChanged(int column) { 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()), @@ -498,7 +464,7 @@ void TreeModel::beginAppendChilds(int firstRow, int lastRow) { QModelIndex parent = indexByItem(parentItem); Q_ASSERT(!_aboutToRemoveOrInsert); - + _aboutToRemoveOrInsert = true; _childStatus = ChildStatus(parent, rowCount(parent), firstRow, lastRow); beginInsertRows(parent, firstRow, lastRow); @@ -533,7 +499,7 @@ void TreeModel::beginRemoveChilds(int firstRow, int lastRow) { for(int i = firstRow; i <= lastRow; i++) { disconnect(parentItem->child(i), 0, this, 0); } - + // consitency checks QModelIndex parent = indexByItem(parentItem); Q_ASSERT(firstRow <= lastRow); @@ -584,7 +550,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 +567,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(); } }