diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-11-02 21:48:52 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-12-11 06:46:42 +0000 |
commit | e56c79dc9d71e84cfb1affd407c512189a549063 (patch) | |
tree | 2f291448399caa92252baa8b7baf7d6041768baf /src/widgets/itemviews/qtreewidget.h | |
parent | f56ca2c4f6c802236414b78cb517481a82df00ce (diff) |
QTreeWidget: mark is/setFirstItemColumnSpanned() as deprecated
Deprecate the QTreeWidget functions is/setFirstItemColumnSpanned() to
stay in sync with the other deprecated functions
(selected/expanded/hidden) so they can get removed in Qt6.
Also add a small unit test for them.
Change-Id: Ie1cb5d7163c2d56d653c21e841ccaf7d38569787
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/itemviews/qtreewidget.h')
-rw-r--r-- | src/widgets/itemviews/qtreewidget.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 145b61ff9d..bed77b336d 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -88,8 +88,8 @@ public: void setExpanded(bool expand); bool isExpanded() const; - inline void setFirstColumnSpanned(bool span); - inline bool isFirstColumnSpanned() const; + void setFirstColumnSpanned(bool span); + bool isFirstColumnSpanned() const; inline void setDisabled(bool disabled); inline bool isDisabled() const; @@ -335,10 +335,12 @@ public: bool isItemExpanded(const QTreeWidgetItem *item) const; QT_DEPRECATED_X ("Use QTreeWidgetItem::setExpanded() instead") void setItemExpanded(const QTreeWidgetItem *item, bool expand); -#endif + QT_DEPRECATED_X ("Use QTreeWidgetItem::isFirstColumnSpanned() instead") bool isFirstItemColumnSpanned(const QTreeWidgetItem *item) const; + QT_DEPRECATED_X ("Use QTreeWidgetItem::setFirstColumnSpanned() instead") void setFirstItemColumnSpanned(const QTreeWidgetItem *item, bool span); +#endif QTreeWidgetItem *itemAbove(const QTreeWidgetItem *item) const; QTreeWidgetItem *itemBelow(const QTreeWidgetItem *item) const; @@ -423,12 +425,6 @@ inline QTreeWidgetItem *QTreeWidget::itemAt(int ax, int ay) const inline void QTreeWidget::setHeaderLabel(const QString &alabel) { setHeaderLabels(QStringList(alabel)); } -inline void QTreeWidgetItem::setFirstColumnSpanned(bool aspan) -{ if (view) view->setFirstItemColumnSpanned(this, aspan); } - -inline bool QTreeWidgetItem::isFirstColumnSpanned() const -{ return (view ? view->isFirstItemColumnSpanned(this) : false); } - inline void QTreeWidgetItem::setDisabled(bool disabled) { setFlags(disabled ? (flags() & ~Qt::ItemIsEnabled) : flags() | Qt::ItemIsEnabled); } |