diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-06-15 16:43:53 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-09-02 08:14:16 +0000 |
commit | 75b5db3ce69e981132c86e90820d59becb874d4a (patch) | |
tree | ed01ac34d7762aba50a7bf2d73d9f6309af6f624 /src/widgets/itemviews/qlistwidget.cpp | |
parent | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (diff) |
Item widgets: make indexFromItem const-correct
The item is not supposed to be modified, so it should be passed
as pointer-to-const. A similar change was already done for
QTreeWidget in b2aeeaf628839d0fc0149db94e0a02c369ad16bc.
Change-Id: I75d597867771f414821693a50f97c94b05a4ccb2
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/widgets/itemviews/qlistwidget.cpp')
-rw-r--r-- | src/widgets/itemviews/qlistwidget.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index 95ad3f82d0..c14dcec744 100644 --- a/src/widgets/itemviews/qlistwidget.cpp +++ b/src/widgets/itemviews/qlistwidget.cpp @@ -189,8 +189,9 @@ int QListModel::rowCount(const QModelIndex &parent) const return parent.isValid() ? 0 : items.count(); } -QModelIndex QListModel::index(QListWidgetItem *item) const +QModelIndex QListModel::index(const QListWidgetItem *item_) const { + QListWidgetItem *item = const_cast<QListWidgetItem *>(item_); if (!item || !item->view || static_cast<const QListModel *>(item->view->model()) != this || items.isEmpty()) return QModelIndex(); @@ -1942,14 +1943,28 @@ QList<QListWidgetItem*> QListWidget::items(const QMimeData *data) const /*! Returns the QModelIndex associated with the given \a item. + + \note In Qt versions prior to 5.10, this function took a non-\c{const} \a item. */ -QModelIndex QListWidget::indexFromItem(QListWidgetItem *item) const +QModelIndex QListWidget::indexFromItem(const QListWidgetItem *item) const { Q_D(const QListWidget); return d->listModel()->index(item); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \internal + \obsolete + \overload +*/ +QModelIndex QListWidget::indexFromItem(QListWidgetItem *item) const +{ + return indexFromItem(const_cast<const QListWidgetItem *>(item)); +} +#endif + /*! Returns a pointer to the QListWidgetItem associated with the given \a index. */ |