diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-15 15:08:43 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-15 15:08:43 (GMT) |
| commit | 7a42405649aeea3e709231464d450b5da521e5cb (patch) | |
| tree | c8a0bc351478ee24a29e2a436fe498213598a5ae /src/gui/itemviews/qtreewidgetitemiterator.cpp | |
| parent | ba1491c5942239f9e0f3f283114f9ed91f43f02b (diff) | |
| parent | 08ae7ee1fb930e7d4b4039e2294cba69f9380964 (diff) | |
| download | Qt-7a42405649aeea3e709231464d450b5da521e5cb.zip Qt-7a42405649aeea3e709231464d450b5da521e5cb.tar.gz Qt-7a42405649aeea3e709231464d450b5da521e5cb.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/tools/qringbuffer_p.h
Diffstat (limited to 'src/gui/itemviews/qtreewidgetitemiterator.cpp')
| -rw-r--r-- | src/gui/itemviews/qtreewidgetitemiterator.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/itemviews/qtreewidgetitemiterator.cpp b/src/gui/itemviews/qtreewidgetitemiterator.cpp index 3e30e03..7e167b9 100644 --- a/src/gui/itemviews/qtreewidgetitemiterator.cpp +++ b/src/gui/itemviews/qtreewidgetitemiterator.cpp @@ -97,7 +97,7 @@ QTreeWidgetItemIterator::QTreeWidgetItemIterator(QTreeWidget *widget, IteratorFl Q_ASSERT(widget); QTreeModel *model = qobject_cast<QTreeModel*>(widget->model()); Q_ASSERT(model); - d_ptr = new QTreeWidgetItemIteratorPrivate(this, model); + d_ptr.reset(new QTreeWidgetItemIteratorPrivate(this, model)); model->iterators.append(this); if (!model->rootItem->children.isEmpty()) current = model->rootItem->children.first(); if (current && !matchesFlags(current)) @@ -150,7 +150,6 @@ QTreeWidgetItemIterator::QTreeWidgetItemIterator(QTreeWidgetItem *item, Iterator QTreeWidgetItemIterator::~QTreeWidgetItemIterator() { d_func()->m_model->iterators.removeAll(this); - delete d_ptr; } /*! |