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/corelib/itemmodels/qabstractproxymodel.cpp | |
| 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/corelib/itemmodels/qabstractproxymodel.cpp')
| -rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/itemmodels/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp index 87559cd6b2..90b2d1f6bf 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.cpp +++ b/src/corelib/itemmodels/qabstractproxymodel.cpp @@ -138,21 +138,11 @@ void QAbstractProxyModel::setSourceModel(QAbstractItemModel *sourceModel) } else { d->model = QAbstractItemModelPrivate::staticEmptyModel(); } - d->roleNames = d->model->roleNames(); emit sourceModelChanged(QPrivateSignal()); } } /*! - Clears the roleNames of this proxy model. -*/ -void QAbstractProxyModel::resetInternalData() -{ - Q_D(QAbstractProxyModel); - d->roleNames = d->model->roleNames(); -} - -/*! Returns the model that contains the data that is available through the proxy model. */ QAbstractItemModel *QAbstractProxyModel::sourceModel() const @@ -477,6 +467,16 @@ Qt::DropActions QAbstractProxyModel::supportedDropActions() const return d->model->supportedDropActions(); } +/*! + \reimp + */ +QHash<int,QByteArray> QAbstractProxyModel::roleNames() const +{ + Q_D(const QAbstractProxyModel); + return d->model->roleNames(); +} + + QT_END_NAMESPACE #include "moc_qabstractproxymodel.cpp" |