X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.cpp;h=64cc26fe333ae79f6980593a192942aca8438423;hp=5c23063dd3c7470d9600a827d93c70d32b94c7c0;hb=46d75f41de7c1aaee605c096da28d4b0d8abf138;hpb=fe9ec46e2b6394b7735a73da5c438b10ba7e5e82 diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index 5c23063d..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 * @@ -19,23 +19,31 @@ ***************************************************************************/ #include "treemodel.h" -#include "global.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() { -} - bool AbstractTreeItem::newChild(AbstractTreeItem *item) { int newRow = childCount(); emit beginAppendChilds(newRow, newRow); @@ -47,7 +55,7 @@ bool AbstractTreeItem::newChild(AbstractTreeItem *item) { bool AbstractTreeItem::newChilds(const QList &items) { if(items.isEmpty()) return false; - + int nextRow = childCount(); int lastRow = nextRow + items.count() - 1; @@ -59,24 +67,26 @@ bool AbstractTreeItem::newChilds(const QList &items) { } 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(); + checkForDeletion(); + return true; } void AbstractTreeItem::removeAllChilds() { const int numChilds = childCount(); - + if(numChilds == 0) return; - + AbstractTreeItem *child; QList::iterator childIter; @@ -84,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++; } @@ -93,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) { @@ -109,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; } @@ -142,7 +178,7 @@ 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(); @@ -160,7 +196,7 @@ void AbstractTreeItem::dumpChildList() { childIter++; } } - qDebug() << "==== End Of Childlist ===="; + qDebug() << "==== End Of Childlist ===="; } /***************************************** @@ -217,7 +253,7 @@ PropertyMapItem::PropertyMapItem(AbstractTreeItem *parent) PropertyMapItem::~PropertyMapItem() { } - + QVariant PropertyMapItem::data(int column, int role) const { if(column >= columnCount()) return QVariant(); @@ -231,7 +267,7 @@ QVariant PropertyMapItem::data(int column, int role) const { default: return QVariant(); } - + } bool PropertyMapItem::setData(int column, const QVariant &value, int role) { @@ -245,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; } @@ -263,7 +299,7 @@ TreeModel::TreeModel(const QList &data, QObject *parent) rootItem = new SimpleTreeItem(data, 0); connectItem(rootItem); - if(Global::parser.isSet("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)), @@ -284,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) @@ -305,7 +341,7 @@ QModelIndex TreeModel::indexByItem(AbstractTreeItem *item) const { qWarning() << "TreeModel::indexByItem(AbstractTreeItem *item) received NULL-Pointer"; return QModelIndex(); } - + if(item == rootItem) return QModelIndex(); else @@ -317,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); } @@ -407,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()), @@ -428,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); @@ -463,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);