X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.cpp;h=f79befb0476aef4f7ae86b00fe77c8fe3bf13e92;hb=bee47fa96837a5a0706d644fe39a79ddd881fa64;hp=6fc0c25b38a333944e46729caa3e83811e73a009;hpb=c0e4730a50f812cd3795d47561357ff221094f8c;p=quassel.git diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index 6fc0c25b..f79befb0 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -35,19 +35,11 @@ AbstractTreeItem::AbstractTreeItem(AbstractTreeItem *parent) 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 +47,11 @@ 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; @@ -93,17 +70,6 @@ bool AbstractTreeItem::removeChild(int row) { 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); - } - - return false; -} - void AbstractTreeItem::removeAllChilds() { const int numChilds = childCount(); @@ -131,6 +97,31 @@ void AbstractTreeItem::removeAllChilds() { emit endRemoveChilds(); } +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(); + + 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; + + return success; +} + AbstractTreeItem *AbstractTreeItem::child(int row) const { if(childCount() <= row) return 0; @@ -138,15 +129,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; @@ -155,32 +137,25 @@ int AbstractTreeItem::childCount(int column) const { } 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.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() { - 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++; } } @@ -324,22 +299,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(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"; @@ -554,7 +513,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(); } } @@ -571,7 +530,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(); } }