QTreeWidget: mark (is|set)Item(Selected|Hidden|Expanded) as deprecated

QTreeWidget::(is|set)Item(Selected|Hidden|Expanded)() are deprecated
for a long time but not marked as such. Therefore explicitly mark them
as deprecated so they can get removed with Qt6.

Change-Id: Ie4971350de61326811e0788df0d359ed3c442869
Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

3 files changed, 80 insertions, 60 deletions

diff --git a/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
index ee7e028a13..7c8d3f936e 100644
--- a/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
@@ -154,14 +154,14 @@ void MainWindow::findItems()
     QTreeWidgetItem *item;
 //! [6]
     foreach (item, treeWidget->selectedItems())
-        treeWidget->setItemSelected(item, false);
+        item->setSelected(false);
 
 //! [7]
     QList<QTreeWidgetItem *> found = treeWidget->findItems(
         itemText, Qt::MatchWildcard);
 
     foreach (item, found) {
-        treeWidget->setItemSelected(item, true);
+        item->setSelected(true);
         // Show the item->text(0) for each item.
     }
 //! [7]
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index fdca2b058b..acd6ad6e41 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -1009,8 +1009,18 @@ void QTreeModel::timerEvent(QTimerEvent *ev)
   Sets the selected state of the item to \a select.
 
   \sa isSelected()
-
 */
+void QTreeWidgetItem::setSelected(bool select)
+{
+    const QTreeModel *model = treeModel();
+    if (!model || !view->selectionModel())
+        return;
+    const QModelIndex index = model->index(this, 0);
+    view->selectionModel()->select(index, (select ? QItemSelectionModel::Select
+                                                  : QItemSelectionModel::Deselect)
+                                   | QItemSelectionModel::Rows);
+    d->selected = select;
+}
 
 /*!
   \fn bool QTreeWidgetItem::isSelected() const
@@ -1020,6 +1030,10 @@ void QTreeModel::timerEvent(QTimerEvent *ev)
 
   \sa setSelected()
 */
+bool QTreeWidgetItem::isSelected() const
+{
+    return d->selected;
+}
 
 /*!
   \fn void QTreeWidgetItem::setHidden(bool hide)
@@ -1033,12 +1047,18 @@ void QTreeModel::timerEvent(QTimerEvent *ev)
   \sa isHidden()
 */
 
-void QTreeWidgetItem::setHidden(bool ahide)
+void QTreeWidgetItem::setHidden(bool hide)
 {
-    if (view) {
-        view->setItemHidden(this, ahide);
-        d->hidden = ahide;
+    const QTreeModel *model = treeModel();
+    if (!model)
+        return;
+    if (this == model->headerItem) {
+        view->header()->setHidden(hide);
+    } else {
+        const QModelIndex index = view->d_func()->index(this);
+        view->setRowHidden(index.row(), index.parent(), hide);
     }
+    d->hidden = hide;
 }
 
 /*!
@@ -1052,7 +1072,15 @@ void QTreeWidgetItem::setHidden(bool ahide)
 
 bool QTreeWidgetItem::isHidden() const
 {
-    return (view ? d->hidden : false);
+    const QTreeModel *model = treeModel();
+    if (!model)
+        return false;
+    if (this == model->headerItem)
+        return view->header()->isHidden();
+    if (view->d_func()->hiddenIndexes.isEmpty())
+        return false;
+    QTreeModel::SkipSorting skipSorting(model);
+    return view->d_func()->isRowHidden(view->d_func()->index(this));
 }
 
 /*!
@@ -1064,6 +1092,14 @@ bool QTreeWidgetItem::isHidden() const
 
   \sa isExpanded()
 */
+void QTreeWidgetItem::setExpanded(bool expand)
+{
+    const QTreeModel *model = treeModel();
+    if (!model)
+        return;
+    QTreeModel::SkipSorting skipSorting(model);
+    view->setExpanded(view->d_func()->index(this), expand);
+}
 
 /*!
   \fn bool QTreeWidgetItem::isExpanded() const
@@ -1073,6 +1109,14 @@ bool QTreeWidgetItem::isHidden() const
 
   \sa setExpanded()
 */
+bool QTreeWidgetItem::isExpanded() const
+{
+    const QTreeModel *model = treeModel();
+    if (!model)
+        return false;
+    QTreeModel::SkipSorting skipSorting(model);
+    return view->isExpanded(view->d_func()->index(this));
+}
 
 /*!
   \fn void QTreeWidgetItem::setFirstColumnSpanned(bool span)
@@ -3058,6 +3102,7 @@ void QTreeWidget::setItemWidget(QTreeWidgetItem *item, int column, QWidget *widg
     QAbstractItemView::setIndexWidget(d->index(item, column), widget);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   Returns \c true if the \a item is selected; otherwise returns \c false.
 
@@ -3069,9 +3114,7 @@ void QTreeWidget::setItemWidget(QTreeWidgetItem *item, int column, QWidget *widg
 */
 bool QTreeWidget::isItemSelected(const QTreeWidgetItem *item) const
 {
-    if (!item)
-        return false;
-    return item->d->selected;
+    return ((item && item->treeWidget() == this) ? item->isSelected() : false);
 }
 
 /*!
@@ -3086,16 +3129,10 @@ bool QTreeWidget::isItemSelected(const QTreeWidgetItem *item) const
 */
 void QTreeWidget::setItemSelected(const QTreeWidgetItem *item, bool select)
 {
-    Q_D(QTreeWidget);
-
-    if (!item)
-        return;
-
-    selectionModel()->select(d->index(item), (select ? QItemSelectionModel::Select
-                                              : QItemSelectionModel::Deselect)
-                             |QItemSelectionModel::Rows);
-    item->d->selected = select;
+    if (item && item->treeWidget() == this)
+        const_cast<QTreeWidgetItem*>(item)->setSelected(select);
 }
+#endif
 
 /*!
   Returns a list of all selected non-hidden items.
@@ -3112,7 +3149,7 @@ QList<QTreeWidgetItem*> QTreeWidget::selectedItems() const
     seen.reserve(indexes.count());
     for (const auto &index : indexes) {
         QTreeWidgetItem *item = d->item(index);
-        if (isItemHidden(item) || seen.contains(item))
+        if (item->isHidden() || seen.contains(item))
             continue;
         seen.insert(item);
         items.append(item);
@@ -3136,6 +3173,7 @@ QList<QTreeWidgetItem*> QTreeWidget::findItems(const QString &text, Qt::MatchFla
     return items;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   Returns \c true if the \a item is explicitly hidden, otherwise returns \c false.
 
@@ -3145,13 +3183,7 @@ QList<QTreeWidgetItem*> QTreeWidget::findItems(const QString &text, Qt::MatchFla
 */
 bool QTreeWidget::isItemHidden(const QTreeWidgetItem *item) const
 {
-    Q_D(const QTreeWidget);
-    if (item == d->treeModel()->headerItem)
-        return header()->isHidden();
-    if (d->hiddenIndexes.isEmpty())
-        return false;
-    QTreeModel::SkipSorting skipSorting(d->treeModel());
-    return d->isRowHidden(d->index(item));
+    return ((item && item->treeWidget() == this) ? item->isHidden() : false);
 }
 
 /*!
@@ -3165,16 +3197,8 @@ bool QTreeWidget::isItemHidden(const QTreeWidgetItem *item) const
 */
 void QTreeWidget::setItemHidden(const QTreeWidgetItem *item, bool hide)
 {
-    if (!item)
-        return;
-    Q_D(QTreeWidget);
-    if (item == d->treeModel()->headerItem) {
-        header()->setHidden(hide);
-    } else {
-        const QModelIndex index = d->index(item);
-        setRowHidden(index.row(), index.parent(), hide);
-    }
-    item->d->hidden = hide;
+    if (item && item->treeWidget() == this)
+        const_cast<QTreeWidgetItem*>(item)->setHidden(hide);
 }
 
 /*!
@@ -3188,9 +3212,7 @@ void QTreeWidget::setItemHidden(const QTreeWidgetItem *item, bool hide)
 */
 bool QTreeWidget::isItemExpanded(const QTreeWidgetItem *item) const
 {
-    Q_D(const QTreeWidget);
-    QTreeModel::SkipSorting skipSorting(d->treeModel());
-    return isExpanded(d->index(item));
+    return ((item && item->treeWidget() == this) ? item->isExpanded() : false);
 }
 
 /*!
@@ -3205,10 +3227,10 @@ bool QTreeWidget::isItemExpanded(const QTreeWidgetItem *item) const
 */
 void QTreeWidget::setItemExpanded(const QTreeWidgetItem *item, bool expand)
 {
-    Q_D(QTreeWidget);
-    QTreeModel::SkipSorting skipSorting(d->treeModel());
-    setExpanded(d->index(item), expand);
+    if (item && item->treeWidget() == this)
+        const_cast<QTreeWidgetItem*>(item)->setExpanded(expand);
 }
+#endif
 
 /*!
   \since 4.3
diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h
index c9186de90c..145b61ff9d 100644
--- a/src/widgets/itemviews/qtreewidget.h
+++ b/src/widgets/itemviews/qtreewidget.h
@@ -79,14 +79,14 @@ public:
 
     inline QTreeWidget *treeWidget() const { return view; }
 
-    inline void setSelected(bool select);
-    inline bool isSelected() const;
+    void setSelected(bool select);
+    bool isSelected() const;
 
     void setHidden(bool hide);
     bool isHidden() const;
 
-    inline void setExpanded(bool expand);
-    inline bool isExpanded() const;
+    void setExpanded(bool expand);
+    bool isExpanded() const;
 
     inline void setFirstColumnSpanned(bool span);
     inline bool isFirstColumnSpanned() const;
@@ -315,17 +315,27 @@ public:
     void setItemWidget(QTreeWidgetItem *item, int column, QWidget *widget);
     inline void removeItemWidget(QTreeWidgetItem *item, int column);
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::isSelected() instead")
     bool isItemSelected(const QTreeWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::setSelected() instead")
     void setItemSelected(const QTreeWidgetItem *item, bool select);
+#endif
     QList<QTreeWidgetItem*> selectedItems() const;
     QList<QTreeWidgetItem*> findItems(const QString &text, Qt::MatchFlags flags,
                                       int column = 0) const;
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::isHidden() instead")
     bool isItemHidden(const QTreeWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::setHidden() instead")
     void setItemHidden(const QTreeWidgetItem *item, bool hide);
 
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::isExpanded() instead")
     bool isItemExpanded(const QTreeWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::setExpanded() instead")
     void setItemExpanded(const QTreeWidgetItem *item, bool expand);
+#endif
 
     bool isFirstItemColumnSpanned(const QTreeWidgetItem *item) const;
     void setFirstItemColumnSpanned(const QTreeWidgetItem *item, bool span);
@@ -413,18 +423,6 @@ inline QTreeWidgetItem *QTreeWidget::itemAt(int ax, int ay) const
 inline void QTreeWidget::setHeaderLabel(const QString &alabel)
 { setHeaderLabels(QStringList(alabel)); }
 
-inline void QTreeWidgetItem::setSelected(bool aselect)
-{ if (view) view->setItemSelected(this, aselect); }
-
-inline bool QTreeWidgetItem::isSelected() const
-{ return (view ? view->isItemSelected(this) : false); }
-
-inline void QTreeWidgetItem::setExpanded(bool aexpand)
-{ if (view) view->setItemExpanded(this, aexpand); }
-
-inline bool QTreeWidgetItem::isExpanded() const
-{ return (view ? view->isItemExpanded(this) : false); }
-
 inline void QTreeWidgetItem::setFirstColumnSpanned(bool aspan)
 { if (view) view->setFirstItemColumnSpanned(this, aspan); }