diff options
-rw-r--r-- | src/widgets/itemviews/qtreewidgetitemiterator.cpp | 9 | ||||
-rw-r--r-- | tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp | 27 |
2 files changed, 31 insertions, 5 deletions
diff --git a/src/widgets/itemviews/qtreewidgetitemiterator.cpp b/src/widgets/itemviews/qtreewidgetitemiterator.cpp index e8854d8197..6aa8f4b91e 100644 --- a/src/widgets/itemviews/qtreewidgetitemiterator.cpp +++ b/src/widgets/itemviews/qtreewidgetitemiterator.cpp @@ -101,7 +101,7 @@ QTreeWidgetItemIterator::QTreeWidgetItemIterator(QTreeWidget *widget, IteratorFl Q_ASSERT(model); d_ptr.reset(new QTreeWidgetItemIteratorPrivate(this, model)); model->iterators.append(this); - if (!model->rootItem->children.isEmpty()) current = model->rootItem->children.first(); + if (!model->rootItem->children.isEmpty()) current = model->rootItem->child(0); if (current && !matchesFlags(current)) ++(*this); } @@ -130,14 +130,13 @@ QTreeWidgetItemIterator::QTreeWidgetItemIterator(QTreeWidgetItem *item, Iterator // the beginning. QTreeWidgetItem *parent = item; parent = parent->parent(); - QList<QTreeWidgetItem *> children = parent ? parent->children : d->m_model->rootItem->children; - d->m_currentIndex = children.indexOf(item); + QTreeWidgetItem *root = d->m_model->rootItem; + d->m_currentIndex = (parent ? parent : root)->indexOfChild(item); while (parent) { QTreeWidgetItem *itm = parent; parent = parent->parent(); - QList<QTreeWidgetItem *> children = parent ? parent->children : d->m_model->rootItem->children; - int index = children.indexOf(itm); + const int index = (parent ? parent : root)->indexOfChild(itm); d->m_parentIndex.prepend(index); } diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp index 7ab68345fa..f1f9f1c01a 100644 --- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp +++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp @@ -80,6 +80,7 @@ private slots: void updateIteratorAfterDeletedItem_and_ContinueIteration_data(); void updateIteratorAfterDeletedItem_and_ContinueIteration(); void initializeIterator(); + void sortingEnabled(); private: QTreeWidget *testWidget; }; @@ -1236,5 +1237,31 @@ void tst_QTreeWidgetItemIterator::initializeIterator() QCOMPARE((*it), static_cast<QTreeWidgetItem*>(0)); } +void tst_QTreeWidgetItemIterator::sortingEnabled() +{ + QTreeWidget *tree = new QTreeWidget; + tree->setColumnCount(2); + tree->headerItem()->setText(0, "Id"); + tree->headerItem()->setText(1, "Color"); + + tree->setSortingEnabled(true); + tree->sortByColumn(0, Qt::AscendingOrder); + + QTreeWidgetItem *second = new QTreeWidgetItem; + second->setText(0, "2"); + second->setText(1, "second"); + QTreeWidgetItem *first = new QTreeWidgetItem; + first->setText(0, "1"); + first->setText(1, "first"); + + tree->addTopLevelItem(second); + tree->addTopLevelItem(first); + + QTreeWidgetItemIterator it(tree); + QCOMPARE(*it, first); + ++it; + QCOMPARE(*it, second); +} + QTEST_MAIN(tst_QTreeWidgetItemIterator) #include "tst_qtreewidgetitemiterator.moc" |