X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.cpp;h=48394c5ee29c1e231f219304ba3be3b654e5198c;hp=9a919803bd4e85d94b590d6dae7447b7fe60095e;hb=e561e02a8d2f1f009559d17c7b1c66cb6f4e2a5a;hpb=997a62b68d7469a93f373476dd955c44eb051be0 diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index 9a919803..48394c5e 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include "treemodel.h" +#include "global.h" #include #include @@ -28,26 +29,16 @@ *****************************************/ 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; } @@ -55,53 +46,29 @@ 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; -} - -bool AbstractTreeItem::removeChildById(const quint64 &id) { - const int numChilds = childCount(); + checkForDeletion(); - for(int i = 0; i < numChilds; i++) { - if(_childItems[i]->id() == id) - return removeChild(i); - } - - return false; + return true; } void AbstractTreeItem::removeAllChilds() { @@ -117,6 +84,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 +94,38 @@ void AbstractTreeItem::removeAllChilds() { while(childIter != _childItems.end()) { child = *childIter; childIter = _childItems.erase(childIter); - child->deleteLater(); + delete child; } emit endRemoveChilds(); + + checkForDeletion(); +} + +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(); + + parent()->checkForDeletion(); + + 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 { @@ -138,15 +135,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 +143,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++; } } @@ -287,7 +268,7 @@ TreeModel::TreeModel(const QList &data, QObject *parent) rootItem = new SimpleTreeItem(data, 0); connectItem(rootItem); - if(QCoreApplication::instance()->arguments().contains("--debugmodel")) { + 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)), @@ -324,22 +305,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"; @@ -399,9 +364,6 @@ QVariant TreeModel::data(const QModelIndex &index, int role) const { return QVariant(); AbstractTreeItem *item = static_cast(index.internalPointer()); - if(role == Qt::DisplayRole && !item->data(index.column(), role).isValid()) { - qDebug() << item->data(0, role) << item->columnCount(); - } return item->data(index.column(), role); } @@ -557,7 +519,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(); } } @@ -574,7 +536,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(); } }