diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-06-05 20:29:48 +0200 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-06-07 10:01:48 +0200 |
commit | 32b586864e3a4398da38c045f4ac0823c3dc3c57 (patch) | |
tree | 65969a26c8f5f19b296b697a856f44fc55054a0d /src/gui | |
parent | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (diff) |
QAbstractItemModel: remove deprecated setRoleNames()
Remove setRoleNames() and all its now unneeded helper functions.
Change-Id: I0a83751aace35700655d4cc7c79278325994cbdd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.cpp | 9 | ||||
-rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.h | 1 | ||||
-rw-r--r-- | src/gui/itemmodels/qstandarditemmodel_p.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 8bc5abe461..d40e5d7923 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -2233,6 +2233,15 @@ void QStandardItemModel::setItemRoleNames(const QHash<int,QByteArray> &roleNames } /*! + reimp +*/ +QHash<int, QByteArray> QStandardItemModel::roleNames() const +{ + Q_D(const QStandardItemModel); + return d->roleNames; +} + +/*! Removes all items (including header items) from the model and sets the number of rows and columns to zero. diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index e0b274649a..34747fa86b 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -321,6 +321,7 @@ public: ~QStandardItemModel(); void setItemRoleNames(const QHash<int,QByteArray> &roleNames); + QHash<int, QByteArray> roleNames() const override; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex parent(const QModelIndex &child) const override; diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h index 97c2e6f01b..5a06b70c0b 100644 --- a/src/gui/itemmodels/qstandarditemmodel_p.h +++ b/src/gui/itemmodels/qstandarditemmodel_p.h @@ -245,6 +245,7 @@ public: QVector<QStandardItem*> columnHeaderItems; QVector<QStandardItem*> rowHeaderItems; + QHash<int, QByteArray> roleNames; QScopedPointer<QStandardItem> root; const QStandardItem *itemPrototype; int sortRole; |