From 29c113d912fdf96f99503c9635bf89c4cabcc6fb Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 26 Oct 2020 14:39:54 +0100 Subject: Deprecate ordering on QItemSelectionRange Ready for removal at Qt 6, as advocated in a ### comment. It was never done consistently with operator==(), apparently, and should not be needed in any case. [ChangeLog][QtCore][QItemSelectionRange] Ordering of QItemSelectionRange is now deprecated. It was not consistent with equality and should not be needed. Task-number: QTBUG-85700 Pick-to: 5.15 5.15.2 Change-Id: Ie99294bd7fc18f2a497598ae08840886b0a6d62d Reviewed-by: Lars Knoll --- src/corelib/itemmodels/qitemselectionmodel.cpp | 4 +++- src/corelib/itemmodels/qitemselectionmodel.h | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index b0708a1074..a47d760e97 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -260,6 +260,7 @@ QItemSelectionRange QItemSelectionRange::intersected(const QItemSelectionRange & */ +#if QT_DEPRECATED_SINCE(5, 15) /*! Returns \c true if the selection range is less than the \a other range given; otherwise returns \c false. @@ -298,6 +299,7 @@ bool QItemSelectionRange::operator<(const QItemSelectionRange &other) const std::less less; return less(tl.model(), other.tl.model()); } +#endif /*! \fn bool QItemSelectionRange::isValid() const diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index 8b3560435c..f2545bf93c 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -98,7 +98,9 @@ public: { return (tl == other.tl && br == other.br); } inline bool operator!=(const QItemSelectionRange &other) const { return !operator==(other); } - bool operator<(const QItemSelectionRange &other) const; +#if QT_DEPRECATED_SINCE(5, 15) + QT_DEPRECATED bool operator<(const QItemSelectionRange &other) const; +#endif inline bool isValid() const { -- cgit v1.2.3