diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-11-30 10:58:10 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-12-15 07:54:29 +0000 |
| commit | b2aeeaf628839d0fc0149db94e0a02c369ad16bc (patch) | |
| tree | 2f652d6030fcb489f82b425802369e6be1c0c584 /src | |
| parent | 1d03ed3f2b6cdad2719b66b056c4c6be2018c460 (diff) | |
QTreeWidget: fix const-incorrectness in indexFromItem() parameters
The item to look up isn't modified, so take by pointer-to-const.
Can't change the API, so overload and mark the old function
for removal in Qt 6.
Change-Id: I4671c6b079687ec9d81b1ac0e6745887ef7077cd
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/itemviews/qtreewidget.cpp | 13 | ||||
| -rw-r--r-- | src/widgets/itemviews/qtreewidget.h | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index 748d899dd0..c824b5111f 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -3342,15 +3342,26 @@ QList<QTreeWidgetItem*> QTreeWidget::items(const QMimeData *data) const /*! Returns the QModelIndex assocated with the given \a item in the given \a column. + \note In Qt versions prior to 5.7, this function took a non-\c{const} \a item. + \sa itemFromIndex(), topLevelItem() */ -QModelIndex QTreeWidget::indexFromItem(QTreeWidgetItem *item, int column) const +QModelIndex QTreeWidget::indexFromItem(const QTreeWidgetItem *item, int column) const { Q_D(const QTreeWidget); return d->index(item, column); } /*! + \overload + \internal +*/ +QModelIndex QTreeWidget::indexFromItem(QTreeWidgetItem *item, int column) const +{ + return indexFromItem(const_cast<const QTreeWidgetItem *>(item), column); +} + +/*! Returns a pointer to the QTreeWidgetItem assocated with the given \a index. \sa indexFromItem() diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 995528fe37..e39593c6c1 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -350,7 +350,8 @@ protected: virtual Qt::DropActions supportedDropActions() const; QList<QTreeWidgetItem*> items(const QMimeData *data) const; - QModelIndex indexFromItem(QTreeWidgetItem *item, int column = 0) const; + QModelIndex indexFromItem(const QTreeWidgetItem *item, int column = 0) const; + QModelIndex indexFromItem(QTreeWidgetItem *item, int column = 0) const; // ### Qt 6: remove QTreeWidgetItem *itemFromIndex(const QModelIndex &index) const; void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; |