1 files changed, 25 insertions, 29 deletions
diff --git a/examples/widgets/itemviews/simpletreemodel/treeitem.cpp b/examples/widgets/itemviews/simpletreemodel/treeitem.cpp
index 59292bbbca..67e021d622 100644
--- a/examples/widgets/itemviews/simpletreemodel/treeitem.cpp
+++ b/examples/widgets/itemviews/simpletreemodel/treeitem.cpp
@@ -10,70 +10,66 @@
 #include "treeitem.h"
 
 //! [0]
-TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent)
-    : m_itemData(data), m_parentItem(parent)
+TreeItem::TreeItem(QVariantList data, TreeItem *parent)
+    : m_itemData(std::move(data)), m_parentItem(parent)
 {}
 //! [0]
 
 //! [1]
-TreeItem::~TreeItem()
+void TreeItem::appendChild(std::unique_ptr<TreeItem> &&child)
 {
-    qDeleteAll(m_childItems);
+    m_childItems.push_back(std::move(child));
 }
 //! [1]
 
 //! [2]
-void TreeItem::appendChild(TreeItem *item)
+TreeItem *TreeItem::child(int row)
 {
-    m_childItems.append(item);
+    return row >= 0 && row < childCount() ? m_childItems.at(row).get() : nullptr;
 }
 //! [2]
 
 //! [3]
-TreeItem *TreeItem::child(int row)
+int TreeItem::childCount() const
 {
-    if (row < 0 || row >= m_childItems.size())
-        return nullptr;
-    return m_childItems.at(row);
+    return int(m_childItems.size());
 }
 //! [3]
 
 //! [4]
-int TreeItem::childCount() const
+int TreeItem::columnCount() const
 {
-    return m_childItems.count();
+    return int(m_itemData.count());
 }
 //! [4]
 
 //! [5]
-int TreeItem::columnCount() const
+QVariant TreeItem::data(int column) const
 {
-    return m_itemData.count();
+    return m_itemData.value(column);
 }
 //! [5]
 
 //! [6]
-QVariant TreeItem::data(int column) const
-{
-    if (column < 0 || column >= m_itemData.size())
-        return QVariant();
-    return m_itemData.at(column);
-}
-//! [6]
-
-//! [7]
 TreeItem *TreeItem::parentItem()
 {
     return m_parentItem;
 }
-//! [7]
+//! [6]
 
-//! [8]
+//! [7]
 int TreeItem::row() const
 {
-    if (m_parentItem)
-        return m_parentItem->m_childItems.indexOf(const_cast<TreeItem*>(this));
+    if (m_parentItem == nullptr)
+        return 0;
+    const auto it = std::find_if(m_parentItem->m_childItems.cbegin(), m_parentItem->m_childItems.cend(),
+                                 [this](const std::unique_ptr<TreeItem> &treeItem) {
+                                     return treeItem.get() == this;
+                                 });
 
-    return 0;
+    if (it != m_parentItem->m_childItems.cend())
+        return std::distance(m_parentItem->m_childItems.cbegin(), it);
+    Q_ASSERT(false); // should not happen
+    return -1;
 }
-//! [8]
+//! [7]