diff options
| author | Anton Kudryavtsev <antkudr@mail.ru> | 2022-11-23 23:36:40 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <antkudr@mail.ru> | 2022-11-26 13:47:50 +0300 |
| commit | 6a027a8677888bcc881929f47185603778e4c50e (patch) | |
| tree | 7e083b4cbaff5a17c4041a337f611c4e0c37a241 /src/gui | |
| parent | 72bff530f9f2da0e10b1a339077c62c546470fab (diff) | |
QStandardItemPrivate: remove const from return type in itemData
While touching code, port iterator-based loop to range-based for.
Change-Id: I108ab4fa1e56c50f424a58984873906d37923d3d
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.cpp | 9 | ||||
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel_p.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 0920398610..64ffdaa3b7 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -275,14 +275,13 @@ void QStandardItemPrivate::setItemData(const QMap<int, QVariant> &roles) /*! \internal */ -const QMap<int, QVariant> QStandardItemPrivate::itemData() const +QMap<int, QVariant> QStandardItemPrivate::itemData() const { QMap<int, QVariant> result; - QList<QStandardItemData>::const_iterator it; - for (it = values.cbegin(); it != values.cend(); ++it){ + for (const auto &data : values) { // Qt::UserRole - 1 is used internally to store the flags - if (it->role != Qt::UserRole - 1) - result.insert(it->role, it->value); + if (data.role != Qt::UserRole - 1) + result.insert(data.role, data.value); } return result; } diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h index 27e108434d..def6c20727 100644 --- a/src/gui/itemmodels/qstandarditemmodel_p.h +++ b/src/gui/itemmodels/qstandarditemmodel_p.h @@ -144,7 +144,7 @@ public: void changeFlags(bool enable, Qt::ItemFlags f); void setItemData(const QMap<int, QVariant> &roles); - const QMap<int, QVariant> itemData() const; + QMap<int, QVariant> itemData() const; bool insertRows(int row, int count, const QList<QStandardItem*> &items); bool insertRows(int row, const QList<QStandardItem*> &items); |