diff options
Diffstat (limited to 'examples/widgets/itemviews/editabletreemodel/treeitem.cpp')
-rw-r--r-- | examples/widgets/itemviews/editabletreemodel/treeitem.cpp | 84 |
1 files changed, 41 insertions, 43 deletions
diff --git a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp index 5784202b93..42d911823d 100644 --- a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp +++ b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp @@ -10,76 +10,74 @@ #include "treeitem.h" //! [0] -TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent) - : itemData(data), parentItem(parent) +TreeItem::TreeItem(QVariantList data, TreeItem *parent) + : itemData(std::move(data)), m_parentItem(parent) {} //! [0] //! [1] -TreeItem::~TreeItem() +TreeItem *TreeItem::child(int number) { - qDeleteAll(childItems); + return (number >= 0 && number < childCount()) + ? m_childItems.at(number).get() : nullptr; } //! [1] //! [2] -TreeItem *TreeItem::child(int number) +int TreeItem::childCount() const { - if (number < 0 || number >= childItems.size()) - return nullptr; - return childItems.at(number); + return int(m_childItems.size()); } //! [2] //! [3] -int TreeItem::childCount() const +int TreeItem::row() const { - return childItems.count(); + if (!m_parentItem) + 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; + }); + + if (it != m_parentItem->m_childItems.cend()) + return std::distance(m_parentItem->m_childItems.cbegin(), it); + Q_ASSERT(false); // should not happen + return -1; } //! [3] //! [4] -int TreeItem::childNumber() const +int TreeItem::columnCount() const { - if (parentItem) - return parentItem->childItems.indexOf(const_cast<TreeItem*>(this)); - return 0; + return int(itemData.count()); } //! [4] //! [5] -int TreeItem::columnCount() const +QVariant TreeItem::data(int column) const { - return itemData.count(); + return itemData.value(column); } //! [5] //! [6] -QVariant TreeItem::data(int column) const -{ - if (column < 0 || column >= itemData.size()) - return QVariant(); - return itemData.at(column); -} -//! [6] - -//! [7] bool TreeItem::insertChildren(int position, int count, int columns) { - if (position < 0 || position > childItems.size()) + if (position < 0 || position > qsizetype(m_childItems.size())) return false; for (int row = 0; row < count; ++row) { - QList<QVariant> data(columns); - TreeItem *item = new TreeItem(data, this); - childItems.insert(position, item); + QVariantList data(columns); + m_childItems.insert(m_childItems.cbegin() + position, + std::make_unique<TreeItem>(data, this)); } return true; } -//! [7] +//! [6] -//! [8] +//! [7] bool TreeItem::insertColumns(int position, int columns) { if (position < 0 || position > itemData.size()) @@ -88,32 +86,32 @@ bool TreeItem::insertColumns(int position, int columns) for (int column = 0; column < columns; ++column) itemData.insert(position, QVariant()); - for (TreeItem *child : qAsConst(childItems)) + for (auto &child : std::as_const(m_childItems)) child->insertColumns(position, columns); return true; } -//! [8] +//! [7] -//! [9] +//! [8] TreeItem *TreeItem::parent() { - return parentItem; + return m_parentItem; } -//! [9] +//! [8] -//! [10] +//! [9] bool TreeItem::removeChildren(int position, int count) { - if (position < 0 || position + count > childItems.size()) + if (position < 0 || position + count > qsizetype(m_childItems.size())) return false; for (int row = 0; row < count; ++row) - delete childItems.takeAt(position); + m_childItems.erase(m_childItems.cbegin() + position); return true; } -//! [10] +//! [9] bool TreeItem::removeColumns(int position, int columns) { @@ -123,13 +121,13 @@ bool TreeItem::removeColumns(int position, int columns) for (int column = 0; column < columns; ++column) itemData.remove(position); - for (TreeItem *child : qAsConst(childItems)) + for (auto &child : std::as_const(m_childItems)) child->removeColumns(position, columns); return true; } -//! [11] +//! [10] bool TreeItem::setData(int column, const QVariant &value) { if (column < 0 || column >= itemData.size()) @@ -138,4 +136,4 @@ bool TreeItem::setData(int column, const QVariant &value) itemData[column] = value; return true; } -//! [11] +//! [10] |