diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-04-02 16:08:15 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-02 20:29:23 +0200 |
| commit | 6aded68111885d4df3d17a1d5f12e538c632af60 (patch) | |
| tree | b0e0dab836fb129bc1658aea320d972990f446f9 /src | |
| parent | beb7dd5f14bf683f89f087acd182c73cad288ee7 (diff) | |
Deprecate QItemSelectionModel::intersect().
It is already obsolete since the beginning of time (Qt 4.5).
Change-Id: Ia2f9d934f0c0bd2038d693a29d1315867a526dfe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel.h | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index c6c1f6f3cf..fa34acdd18 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -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()), diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index 6f438d8c68..7a8c238184 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -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); } |