AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate QItemSelectionModel::intersect().

Browse Source 
It is already obsolete since the beginning of time (Qt 4.5).

Change-Id: Ia2f9d934f0c0bd2038d693a29d1315867a526dfe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Stephen Kelly 2012-04-02 16:08:15 +02:00 committed by Qt by Nokia
parent beb7dd5f14
commit 6aded68111
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ bool QItemSelectionRange::intersects(const QItemSelectionRange &other) const
both the selection range and the \a other selection range.
*/
QItemSelectionRange QItemSelectionRange::intersect(const QItemSelectionRange &other) const
QItemSelectionRange QItemSelectionRange::intersected(const QItemSelectionRange &other) const
{
if (model() == other.model() && parent() == other.parent()) {
QModelIndex topLeft = model()->index(qMax(top(), other.top()),

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

@ -92,9 +92,12 @@ public:
}
bool intersects(const QItemSelectionRange &other) const;
QItemSelectionRange intersect(const QItemSelectionRange &other) const; // ### Qt 5: make QT4_SUPPORT
inline QItemSelectionRange intersected(const QItemSelectionRange &other) const
{ return intersect(other); }
#if QT_DEPRECATED_SINCE(5, 0)
inline QItemSelectionRange intersect(const QItemSelectionRange &other) const
{ return intersected(other); }
#endif
QItemSelectionRange intersected(const QItemSelectionRange &other) const;
inline bool operator==(const QItemSelectionRange &other) const
{ return (tl == other.tl && br == other.br); }