X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.cpp;h=0d6111fb5c3916f85ac6efd4717f1e54f08f8739;hb=4bdda41a706b963c0163d38764acb3ffea52f256;hp=1505a25ed11272a72f66d5e8fed3806f2f59fa71;hpb=e104b220388a276a4483a45567243a8473ca5fa6;p=quassel.git diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index 1505a25e..0d6111fb 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -162,17 +162,40 @@ QVariant TreeModel::headerData(int section, Qt::Orientation orientation, int rol } bool TreeModel::removeRow(int row, const QModelIndex &parent) { + if(row > rowCount(parent)) + return false; + + TreeItem *item; + if(!parent.isValid()) + item = rootItem; + else + item = static_cast(parent.internalPointer()); + beginRemoveRows(parent, row, row); - TreeItem *item = static_cast(parent.internalPointer()); item->removeChild(row); endRemoveRows(); return true; } bool TreeModel::removeRows(int row, int count, const QModelIndex &parent) { + // check if there is work to be done + if(count == 0) + return true; + + // out of range check + if(row + count - 1 > rowCount(parent) || row < 0 || count < 0) + return false; + + TreeItem *item; + if(!parent.isValid()) + item = rootItem; + else + item = static_cast(parent.internalPointer()); + + beginRemoveRows(parent, row, row + count - 1); - TreeItem *item = static_cast(parent.internalPointer()); - for(int i = row; i < row + count; i++) { + + for(int i = row + count - 1; i >= 0; i--) { item->removeChild(i); } endRemoveRows(); @@ -180,5 +203,5 @@ bool TreeModel::removeRows(int row, int count, const QModelIndex &parent) { } void TreeModel::clear() { - removeRows(0, rowCount(), QModelIndex()); + removeRows(0, rowCount()); }