summaryrefslogtreecommitdiffstats
path: root/examples/widgets/itemviews/editabletreemodel/treeitem.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-11-28 13:42:00 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-12-06 18:22:41 +0100
commitd50b56b47544ad2b72811045f64df24eaaf0cf59 (patch)
tree7226ca390cd34136f6ea833d93edeb187e5b35c2 /examples/widgets/itemviews/editabletreemodel/treeitem.cpp
parent5038e1eb650e5661c8e9e497f84715679e5161a8 (diff)
Polish the EditableTreeModel example
- Fix/silence most clang-tidy/compiler warnings * unsigned/int comparison * Avoid repeating return / default parameter types * Use auto * for pointers * Streamline code, use ternary operators * Move constructor parameters * Observe rule of 5 by using Q_DISABLE_COPY_MOVE - Add some bells && whistles, resize properly, expand all Change-Id: I1721458ff66dcba123ff3a2cf50e7d15387a4e8b Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'examples/widgets/itemviews/editabletreemodel/treeitem.cpp')
-rw-r--r--examples/widgets/itemviews/editabletreemodel/treeitem.cpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp
index 27cf2ea2b1..42d911823d 100644
--- a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp
+++ b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp
@@ -10,24 +10,23 @@
#include "treeitem.h"
//! [0]
-TreeItem::TreeItem(const QVariantList &data, TreeItem *parent)
- : itemData(data), m_parentItem(parent)
+TreeItem::TreeItem(QVariantList data, TreeItem *parent)
+ : itemData(std::move(data)), m_parentItem(parent)
{}
//! [0]
//! [1]
TreeItem *TreeItem::child(int number)
{
- if (number < 0 || number >= qsizetype(m_childItems.size()))
- return nullptr;
- return m_childItems.at(number).get();
+ return (number >= 0 && number < childCount())
+ ? m_childItems.at(number).get() : nullptr;
}
//! [1]
//! [2]
int TreeItem::childCount() const
{
- return m_childItems.size();
+ return int(m_childItems.size());
}
//! [2]
@@ -38,7 +37,7 @@ int TreeItem::row() const
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() == const_cast<TreeItem *>(this);
+ return treeItem.get() == this;
});
if (it != m_parentItem->m_childItems.cend())
@@ -51,16 +50,14 @@ int TreeItem::row() const
//! [4]
int TreeItem::columnCount() const
{
- return itemData.count();
+ return int(itemData.count());
}
//! [4]
//! [5]
QVariant TreeItem::data(int column) const
{
- if (column < 0 || column >= itemData.size())
- return QVariant();
- return itemData.at(column);
+ return itemData.value(column);
}
//! [5]