diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-11-23 20:05:42 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-23 15:13:41 +0000 |
commit | c590aa678d5c27162b0ca7191fa76b1d3a112767 (patch) | |
tree | e62a34cee93a761f267347dd2df530832811a21a /examples/widgets/itemviews/simpletreemodel/treeitem.cpp | |
parent | 7cc6f78dd448992c9a9cb31e001b908d44028516 (diff) |
Cleanup SimpleTreeModel example
Cleanup the SimpleTreeModel example:
- include own headers first
- use nullptr
- add sanity checks
Change-Id: If57d608e3919368b2022ff86aede8de9c2ba7369
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Diffstat (limited to 'examples/widgets/itemviews/simpletreemodel/treeitem.cpp')
-rw-r--r-- | examples/widgets/itemviews/simpletreemodel/treeitem.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/widgets/itemviews/simpletreemodel/treeitem.cpp b/examples/widgets/itemviews/simpletreemodel/treeitem.cpp index e11639ff67..41fe24e737 100644 --- a/examples/widgets/itemviews/simpletreemodel/treeitem.cpp +++ b/examples/widgets/itemviews/simpletreemodel/treeitem.cpp @@ -54,16 +54,12 @@ A container for items of data supplied by the simple tree model. */ -#include <QStringList> - #include "treeitem.h" //! [0] -TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent) -{ - m_parentItem = parent; - m_itemData = data; -} +TreeItem::TreeItem(const QVector<QVariant> &data, TreeItem *parent) + : m_itemData(data), m_parentItem(parent) +{} //! [0] //! [1] @@ -83,7 +79,9 @@ void TreeItem::appendChild(TreeItem *item) //! [3] TreeItem *TreeItem::child(int row) { - return m_childItems.value(row); + if (row < 0 || row >= m_childItems.size()) + return nullptr; + return m_childItems.at(row); } //! [3] @@ -104,7 +102,9 @@ int TreeItem::columnCount() const //! [6] QVariant TreeItem::data(int column) const { - return m_itemData.value(column); + if (column < 0 || column >= m_itemData.size()) + return QVariant(); + return m_itemData.at(column); } //! [6] |