whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <lars.knoll@qt.io>
bb10
Edward Welbourne 2020-10-26 14:39:54 +01:00
parent da1854c683
commit 29c113d912
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/itemmodels/qitemselectionmodel.cpp
View File

@ -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<const QAbstractItemModel *> less;
return less(tl.model(), other.tl.model());
}
#endif
/*!
\fn bool QItemSelectionRange::isValid() const

6
src/corelib/itemmodels/qitemselectionmodel.h
View File

@ -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
{

4
tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
View File

@ -82,8 +82,10 @@ private slots:
void layoutChangedWithAllSelected2();
void layoutChangedTreeSelection();
void deselectRemovedMiddleRange();
#if QT_DEPRECATED_SINCE(5, 15)
void rangeOperatorLessThan_data();
void rangeOperatorLessThan();
#endif
void setModel();
void testDifferentModels();
@ -2445,6 +2447,7 @@ static QStandardItemModel* getModel(QObject *parent)
return model;
}
#if QT_DEPRECATED_SINCE(5, 15)
enum Result {
LessThan,
NotLessThan,
@ -2579,6 +2582,7 @@ void tst_QItemSelectionModel::rangeOperatorLessThan()
if (!(r2 < r4))
QVERIFY(r4 < r2);
}
#endif
void tst_QItemSelectionModel::setModel()
{