X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.cpp;h=48394c5ee29c1e231f219304ba3be3b654e5198c;hp=0d35ef64936ecd64e2c4bd52678d52f83109b503;hb=e561e02a8d2f1f009559d17c7b1c66cb6f4e2a5a;hpb=e2e5327ccade6baf433598b1b25dfe99cb360028;ds=sidebyside diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index 0d35ef64..48394c5e 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -19,196 +19,151 @@ ***************************************************************************/ #include "treemodel.h" +#include "global.h" #include +#include /***************************************** * 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 (quint64)this; -} - -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; +bool AbstractTreeItem::newChild(AbstractTreeItem *item) { + int newRow = childCount(); + emit beginAppendChilds(newRow, newRow); + _childItems.append(item); + emit endAppendChilds(); + return true; } -bool AbstractTreeItem::newChild(int column, AbstractTreeItem *item) { - if(column >= columnCount()) { - qWarning() << "AbstractTreeItem::newChild() cannot append Child to not existing column!" << this << column; +bool AbstractTreeItem::newChilds(const QList &items) { + if(items.isEmpty()) return false; - } - if(!_childItems.contains(column)) { - _childItems[column] = QList(); - } + int nextRow = childCount(); + int lastRow = nextRow + items.count() - 1; - // check if a child with that ID is already known - Q_ASSERT(childById(item->id()) == 0); - - int newRow = _childItems[column].count(); - emit beginAppendChilds(column, newRow, newRow); - _childItems[column].append(item); + emit beginAppendChilds(nextRow, lastRow); + _childItems << items; emit endAppendChilds(); - - return true; -} -bool AbstractTreeItem::newChild(AbstractTreeItem *item) { - return newChild(defaultColumn(), item); + return true; } -bool AbstractTreeItem::removeChild(int column, int row) { - if(!_childItems.contains(column) || row >= childCount(column)) +bool AbstractTreeItem::removeChild(int row) { + if(row < 0 || childCount() <= row) return false; - emit beginRemoveChilds(column, row, row); - AbstractTreeItem *treeitem = _childItems[column].takeAt(row); - treeitem->deleteLater(); + child(row)->removeAllChilds(); + emit beginRemoveChilds(row, row); + AbstractTreeItem *treeitem = _childItems.takeAt(row); + delete treeitem; emit endRemoveChilds(); + checkForDeletion(); + return true; } -bool AbstractTreeItem::removeChild(int row) { - return removeChild(defaultColumn(), row); -} +void AbstractTreeItem::removeAllChilds() { + const int numChilds = childCount(); + + if(numChilds == 0) + return; + + AbstractTreeItem *child; -bool AbstractTreeItem::removeChildById(int column, const quint64 &id) { - if(!_childItems.contains(column)) - return false; + QList::iterator childIter; - for(int i = 0; i < _childItems[column].count(); i++) { - if(_childItems[column][i]->id() == id) - return removeChild(column, i); + 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++; } - return false; -} -bool AbstractTreeItem::removeChildById(const quint64 &id) { - return removeChildById(defaultColumn(), id); -} + emit beginRemoveChilds(0, numChilds - 1); + childIter = _childItems.begin(); + while(childIter != _childItems.end()) { + child = *childIter; + childIter = _childItems.erase(childIter); + delete child; + } + emit endRemoveChilds(); -void AbstractTreeItem::removeAllChilds() { - AbstractTreeItem *child; + checkForDeletion(); +} - QHash >::iterator columnIter = _childItems.begin(); - while(columnIter != _childItems.end()) { - if(columnIter->count() > 0) { - emit beginRemoveChilds(columnIter.key(), 0, columnIter->count() - 1); - QList::iterator childIter = columnIter->begin(); - while(childIter != columnIter->end()) { - child = *childIter; - // child->removeAllChilds(); - childIter = columnIter->erase(childIter); - child->deleteLater(); - } - emit endRemoveChilds(); - } - columnIter++; +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; } -} -AbstractTreeItem *AbstractTreeItem::child(int column, int row) const { - if(!_childItems.contains(column) || _childItems[column].size() <= row) - return 0; - else - return _childItems[column].value(row); -} + int oldRow = row(); + if(oldRow == -1) + return false; + + emit parent()->beginRemoveChilds(oldRow, oldRow); + parent()->_childItems.removeAt(oldRow); + emit parent()->endRemoveChilds(); -AbstractTreeItem *AbstractTreeItem::child(int row) const { - return child(defaultColumn(), row); -} + parent()->checkForDeletion(); -AbstractTreeItem *AbstractTreeItem::childById(int column, const quint64 &id) const { - if(!_childItems.contains(column)) - return 0; + setParent(newParent); - for(int i = 0; i < _childItems[column].count(); i++) { - if(_childItems[column][i]->id() == id) - return _childItems[column][i]; - } - return 0; -} + 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; -AbstractTreeItem *AbstractTreeItem::childById(const quint64 &id) const { - return childById(defaultColumn(), id); + return success; } -int AbstractTreeItem::childCount(int column) const { - if(!_childItems.contains(column)) +AbstractTreeItem *AbstractTreeItem::child(int row) const { + if(childCount() <= row) return 0; else - return _childItems[column].count(); -} - -int AbstractTreeItem::childCount() const { - return childCount(defaultColumn()); + return _childItems[row]; } -int AbstractTreeItem::column() const { - if(!parent()) - return -1; - - QHash >::const_iterator iter = parent()->_childItems.constBegin(); - while(iter != parent()->_childItems.constEnd()) { - if(iter->contains(const_cast(this))) - return iter.key(); - iter++; - } - - qWarning() << "AbstractTreeItem::column(): unable to determine the Column of" << this; - return parent()->defaultColumn(); +int AbstractTreeItem::childCount(int column) const { + if(column > 0) + return 0; + else + return _childItems.count(); } int AbstractTreeItem::row() const { - if(!parent()) + if(!parent()) { + qWarning() << "AbstractTreeItem::row():" << this << "has no parent AbstractTreeItem as it's parent! parent is" << QObject::parent(); return -1; - else - return parent()->_childItems[column()].indexOf(const_cast(this)); -} - -AbstractTreeItem *AbstractTreeItem::parent() const { - return qobject_cast(QObject::parent()); -} - -Qt::ItemFlags AbstractTreeItem::flags() const { - return _flags; -} - -void AbstractTreeItem::setFlags(Qt::ItemFlags flags) { - _flags = flags; + } + + 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_; } void AbstractTreeItem::dumpChildList() { - AbstractTreeItem *child; - - qDebug() << "==== Childlist for Item:" << this << id() << "===="; - QHash >::iterator columnIter = _childItems.begin(); - while(columnIter != _childItems.end()) { - if(columnIter->count() > 0) { - QList::const_iterator childIter = columnIter->constBegin(); - while(childIter != columnIter->constEnd()) { - child = *childIter; - qDebug() << "Column:" << columnIter.key() << "Row:" << child->row() << child << child->id() << child->data(0, Qt::DisplayRole); - childIter++; - } + 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->data(0, Qt::DisplayRole); + childIter++; } - columnIter++; } qDebug() << "==== End Of Childlist ===="; } @@ -276,6 +231,7 @@ QVariant PropertyMapItem::data(int column, int role) const { case Qt::ToolTipRole: return toolTip(column); case Qt::DisplayRole: + case TreeModel::SortRole: // fallthrough, since SortRole should default to DisplayRole return property(_propertyOrder[column].toAscii()); default: return QVariant(); @@ -312,16 +268,18 @@ TreeModel::TreeModel(const QList &data, QObject *parent) rootItem = new SimpleTreeItem(data, 0); connectItem(rootItem); - /* - 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))); - */ + 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)), + 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() { @@ -337,9 +295,9 @@ QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) con if(!parent.isValid()) parentItem = rootItem; else - parentItem = static_cast(parent.internalPointer()); + parentItem = static_cast(parent.internalPointer()); - AbstractTreeItem *childItem = parentItem->child(parent.column(), row); + AbstractTreeItem *childItem = parentItem->child(row); if(childItem) return createIndex(row, column, childItem); @@ -347,23 +305,7 @@ 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(parent.column(), id); - - if(childItem) - return createIndex(childItem->row(), 0, childItem); - else - return QModelIndex(); -} - -QModelIndex TreeModel::indexByItem(AbstractTreeItem *item, int column) const { +QModelIndex TreeModel::indexByItem(AbstractTreeItem *item) const { if(item == 0) { qWarning() << "TreeModel::indexByItem(AbstractTreeItem *item) received NULL-Pointer"; return QModelIndex(); @@ -372,21 +314,23 @@ QModelIndex TreeModel::indexByItem(AbstractTreeItem *item, int column) const { if(item == rootItem) return QModelIndex(); else - return createIndex(item->row(), column, item); - + return createIndex(item->row(), 0, item); } QModelIndex TreeModel::parent(const QModelIndex &index) const { - if(!index.isValid()) + if(!index.isValid()) { + qWarning() << "TreeModel::parent(): has been asked for the rootItems Parent!"; return QModelIndex(); + } AbstractTreeItem *childItem = static_cast(index.internalPointer()); - AbstractTreeItem *parentItem = static_cast(childItem->parent()); - + AbstractTreeItem *parentItem = childItem->parent(); + + Q_ASSERT(parentItem); if(parentItem == rootItem) return QModelIndex(); - return createIndex(parentItem->row(), childItem->column(), parentItem); + return createIndex(parentItem->row(), 0, parentItem); } int TreeModel::rowCount(const QModelIndex &parent) const { @@ -401,22 +345,18 @@ int TreeModel::rowCount(const QModelIndex &parent) const { 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 - -// if(parent.isValid()) { -// AbstractTreeItem *child; -// if(child = static_cast(parent.internalPointer())->child(parent.column(), parent.row())) -// return child->columnCount(); -// else -// return static_cast(parent.internalPointer())->columnCount(); -// } else { -// return rootItem->columnCount(); -// } - return rootItem->columnCount(); +// AbstractTreeItem *parentItem; +// if(!parent.isValid()) +// parentItem = rootItem; +// else +// parentItem = static_cast(parent.internalPointer()); +// return parentItem->columnCount(); } QVariant TreeModel::data(const QModelIndex &index, int role) const { @@ -436,12 +376,12 @@ bool TreeModel::setData(const QModelIndex &index, const QVariant &value, int rol } Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const { - AbstractTreeItem *item; - if(!index.isValid()) - item = rootItem; - else - item = static_cast(index.internalPointer()); - return item->flags(); + if(!index.isValid()) { + return rootItem->flags() & Qt::ItemIsDropEnabled; + } else { + AbstractTreeItem *item = static_cast(index.internalPointer()); + return item->flags(); + } } QVariant TreeModel::headerData(int section, Qt::Orientation orientation, int role) const { @@ -460,7 +400,7 @@ void TreeModel::itemDataChanged(int column) { if(column == -1) { leftIndex = createIndex(item->row(), 0, item); - rightIndex = createIndex(item->row(), item->columnCount()-1, item); + rightIndex = createIndex(item->row(), item->columnCount() - 1, item); } else { leftIndex = createIndex(item->row(), column, item); rightIndex = leftIndex; @@ -473,24 +413,25 @@ void TreeModel::connectItem(AbstractTreeItem *item) { connect(item, SIGNAL(dataChanged(int)), this, SLOT(itemDataChanged(int))); - connect(item, SIGNAL(beginAppendChilds(int, int, int)), - this, SLOT(beginAppendChilds(int, int, 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, int)), - this, SLOT(beginRemoveChilds(int, int, int))); + connect(item, SIGNAL(beginRemoveChilds(int, int)), + this, SLOT(beginRemoveChilds(int, int))); connect(item, SIGNAL(endRemoveChilds()), this, SLOT(endRemoveChilds())); } -void TreeModel::beginAppendChilds(int column, int firstRow, int lastRow) { +void TreeModel::beginAppendChilds(int firstRow, int lastRow) { AbstractTreeItem *parentItem = qobject_cast(sender()); if(!parentItem) { qWarning() << "TreeModel::beginAppendChilds(): cannot append Childs to unknown parent"; return; } - QModelIndex parent = indexByItem(parentItem, column); + + QModelIndex parent = indexByItem(parentItem); Q_ASSERT(!_aboutToRemoveOrInsert); _aboutToRemoveOrInsert = true; @@ -506,46 +447,54 @@ void TreeModel::endAppendChilds() { } Q_ASSERT(_aboutToRemoveOrInsert); ChildStatus cs = _childStatus; - QModelIndex parent = indexByItem(parentItem, cs.parent.column()); + QModelIndex parent = indexByItem(parentItem); Q_ASSERT(cs.parent == parent); Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1); _aboutToRemoveOrInsert = false; for(int i = cs.start; i <= cs.end; i++) { - connectItem(parentItem->child(parent.column(), i)); + connectItem(parentItem->child(i)); } endInsertRows(); } -void TreeModel::beginRemoveChilds(int column, int firstRow, int lastRow) { +void TreeModel::beginRemoveChilds(int firstRow, int lastRow) { AbstractTreeItem *parentItem = qobject_cast(sender()); if(!parentItem) { qWarning() << "TreeModel::beginRemoveChilds(): cannot append Childs to unknown parent"; return; } - QModelIndex parent = indexByItem(parentItem, column); + + 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(column) > 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(sender()); if(!parentItem) { - qWarning() << "TreeModel::endRemoveChilds(): cannot append Childs to unknown parent"; + qWarning() << "TreeModel::endRemoveChilds(): cannot remove Childs from unknown parent"; return; } + + // concistency checks Q_ASSERT(_aboutToRemoveOrInsert); ChildStatus cs = _childStatus; - QModelIndex parent = indexByItem(parentItem, cs.parent.column()); + QModelIndex parent = indexByItem(parentItem); Q_ASSERT(cs.parent == parent); Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1); - _aboutToRemoveOrInsert = false; + endRemoveRows(); } @@ -558,23 +507,51 @@ void TreeModel::debug_rowsAboutToBeInserted(const QModelIndex &parent, int start } void TreeModel::debug_rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { - qDebug() << "debug_rowsAboutToBeRemoved" << parent << parent.internalPointer() << parent.data().toString() << rowCount(parent) << start << end; + AbstractTreeItem *parentItem; + parentItem = static_cast(parent.internalPointer()); + if(!parentItem) + parentItem = rootItem; + qDebug() << "debug_rowsAboutToBeRemoved" << parent << parentItem << parent.data().toString() << rowCount(parent) << start << end; + QModelIndex child; - for(int i = start; i <= end; i++) { + AbstractTreeItem *childItem; + for(int i = end; i >= start; i--) { child = parent.child(i, 0); - qDebug() << " " << child << child.data().toString(); // << static_cast(parent.child(i, 0).internalPointer())->id(); + childItem = parentItem->child(i); + Q_ASSERT(childItem); + qDebug() << ">>>" << i << child << child.data().toString(); } } void TreeModel::debug_rowsInserted(const QModelIndex &parent, int start, int end) { - qDebug() << "debug_rowsInserted" << parent << parent.internalPointer() << parent.data().toString() << rowCount(parent) << start << end; + AbstractTreeItem *parentItem; + parentItem = static_cast(parent.internalPointer()); + if(!parentItem) + parentItem = rootItem; + qDebug() << "debug_rowsInserted:" << parent << parentItem << parent.data().toString() << rowCount(parent) << start << end; + QModelIndex child; + AbstractTreeItem *childItem; for(int i = start; i <= end; i++) { child = parent.child(i, 0); - qDebug() << " " << child << child.data().toString(); // << static_cast(parent.child(i, 0).internalPointer())->id(); + childItem = parentItem->child(i); + Q_ASSERT(childItem); + 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; + } +}