From 6e24bef57683b26f7cc1c4cddacace413d181d00 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen@kdab.com>
Date: Thu, 19 Aug 2010 18:41:40 +0200
Subject: Make the QItemSelectionRange and QItemSelectionModel ensure that the
 model is correct.

Merge-request: 720
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
---
 src/gui/itemviews/qitemselectionmodel.cpp          |  3 ++-
 .../tst_qitemselectionmodel.cpp                    | 28 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp
index 4979db6..7156b87 100644
--- a/src/gui/itemviews/qitemselectionmodel.cpp
+++ b/src/gui/itemviews/qitemselectionmodel.cpp
@@ -212,6 +212,7 @@ bool QItemSelectionRange::intersects(const QItemSelectionRange &other) const
 {
     return (isValid() && other.isValid()
             && parent() == other.parent()
+            && model() == other.model()
             && ((top() <= other.top() && bottom() >= other.top())
                 || (top() >= other.top() && top() <= other.bottom()))
             && ((left() <= other.left() && right() >= other.left())
@@ -508,7 +509,7 @@ void QItemSelection::merge(const QItemSelection &other, QItemSelectionModel::Sel
 void QItemSelection::split(const QItemSelectionRange &range,
                            const QItemSelectionRange &other, QItemSelection *result)
 {
-    if (range.parent() != other.parent())
+    if (range.parent() != other.parent() || range.model() != other.model())
         return;
 
     QModelIndex parent = other.parent();
diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
index 46bd4a2..69b1390 100644
--- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -98,6 +98,8 @@ private slots:
     void rangeOperatorLessThan_data();
     void rangeOperatorLessThan();
 
+    void testDifferentModels();
+
 private:
     QAbstractItemModel *model;
     QItemSelectionModel *selection;
@@ -2561,5 +2563,31 @@ void tst_QItemSelectionModel::rangeOperatorLessThan()
     QVERIFY(r4 < r2);
 }
 
+void tst_QItemSelectionModel::testDifferentModels()
+{
+    QStandardItemModel model1;
+    QStandardItemModel model2;
+    QStandardItem top11("Child1"), top12("Child2"), top13("Child3");
+    QStandardItem top21("Child1"), top22("Child2"), top23("Child3");
+
+    model1.appendColumn(QList<QStandardItem*>() << &top11 << &top12 << &top13);
+    model2.appendColumn(QList<QStandardItem*>() << &top21 << &top22 << &top23);
+
+
+    QModelIndex topIndex1 = model1.index(0, 0);
+    QModelIndex bottomIndex1 = model1.index(2, 0);
+    QModelIndex topIndex2 = model2.index(0, 0);
+
+    QItemSelectionRange range(topIndex1, bottomIndex1);
+
+    QVERIFY(range.intersects(QItemSelectionRange(topIndex1, topIndex1)));
+    QVERIFY(!range.intersects(QItemSelectionRange(topIndex2, topIndex2)));
+
+    QItemSelection newSelection;
+    QItemSelection::split(range, QItemSelectionRange(topIndex2, topIndex2), &newSelection);
+
+    QVERIFY(newSelection.isEmpty());
+}
+
 QTEST_MAIN(tst_QItemSelectionModel)
 #include "tst_qitemselectionmodel.moc"
-- 
cgit v0.12