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 | |
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')
-rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel.cpp | 30 | ||||
-rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel.h | 8 | ||||
-rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel_p.h | 1 | ||||
-rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel.cpp | 20 | ||||
-rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel.h | 8 |
5 files changed, 13 insertions, 54 deletions
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 49b5031559..95bfb109eb 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -518,8 +518,7 @@ Q_GLOBAL_STATIC(QEmptyItemModel, qEmptyModel) QAbstractItemModelPrivate::QAbstractItemModelPrivate() : QObjectPrivate(), - supportedDragActions(-1), - roleNames(defaultRoleNames()) + supportedDragActions(-1) { } @@ -2486,30 +2485,6 @@ QSize QAbstractItemModel::span(const QModelIndex &) const } /*! - \fn void QAbstractItemModel::setRoleNames(const QHash<int,QByteArray> &roleNames) - \since 4.6 - \obsolete - - This function is obsolete. Reimplement roleNames() instead. - - Sets the model's role names to \a roleNames. - - This function allows mapping of role identifiers to role property names in - scripting languages. - - \sa roleNames() -*/ - -/*! - \internal - */ -void QAbstractItemModel::doSetRoleNames(const QHash<int,QByteArray> &roleNames) -{ - Q_D(QAbstractItemModel); - d->roleNames = roleNames; -} - -/*! \since 4.6 Returns the model's role names. @@ -2542,8 +2517,7 @@ void QAbstractItemModel::doSetRoleNames(const QHash<int,QByteArray> &roleNames) */ QHash<int,QByteArray> QAbstractItemModel::roleNames() const { - Q_D(const QAbstractItemModel); - return d->roleNames; + return QAbstractItemModelPrivate::defaultRoleNames(); } /*! diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index a23b5b8cfc..ff413c7542 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -349,15 +349,7 @@ protected: void changePersistentIndexList(const QModelIndexList &from, const QModelIndexList &to); QModelIndexList persistentIndexList() const; -#if QT_DEPRECATED_SINCE(5,0) - QT_DEPRECATED void setRoleNames(const QHash<int,QByteArray> &theRoleNames) - { - doSetRoleNames(theRoleNames); - } -#endif - private: - void doSetRoleNames(const QHash<int,QByteArray> &roleNames); void doSetSupportedDragActions(Qt::DropActions actions); Q_DECLARE_PRIVATE(QAbstractItemModel) diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h index 92a440a125..e7d68ef3c4 100644 --- a/src/corelib/itemmodels/qabstractitemmodel_p.h +++ b/src/corelib/itemmodels/qabstractitemmodel_p.h @@ -149,7 +149,6 @@ public: Qt::DropActions supportedDragActions; - QHash<int,QByteArray> roleNames; static const QHash<int,QByteArray> &defaultRoleNames(); static bool isVariantLessThan(const QVariant &left, const QVariant &right, Qt::CaseSensitivity cs = Qt::CaseSensitive, bool isLocaleAware = false); 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" diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index f6f6e45c1a..8eef0551ca 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -98,17 +98,11 @@ public: QStringList mimeTypes() const override; Qt::DropActions supportedDragActions() const override; Qt::DropActions supportedDropActions() const override; + QHash<int, QByteArray> roleNames() const override; Q_SIGNALS: void sourceModelChanged(QPrivateSignal); -protected Q_SLOTS: - void resetInternalData() -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - override -#endif - ; - protected: QAbstractProxyModel(QAbstractProxyModelPrivate &, QObject *parent); |