Deselect the current selection when the QItemSelectionModel::model is reset.

Merge-request: 639
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>

3 files changed, 24 insertions, 5 deletions

diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp
index f848321..fc99439 100644
--- a/src/gui/itemviews/qitemselectionmodel.cpp
+++ b/src/gui/itemviews/qitemselectionmodel.cpp
@@ -566,6 +566,8 @@ void QItemSelectionModelPrivate::initModel(QAbstractItemModel *model)
                 q, SLOT(_q_layoutAboutToBeChanged()));
         QObject::connect(model, SIGNAL(layoutChanged()),
                 q, SLOT(_q_layoutChanged()));
+        QObject::connect(model, SIGNAL(modelAboutToBeReset()),
+                q, SLOT(_q_modelAboutToBeReset()));
     }
 }
 
@@ -896,6 +898,13 @@ void QItemSelectionModelPrivate::_q_layoutChanged()
     savedPersistentCurrentIndexes.clear();
 }
 
+void QItemSelectionModelPrivate::_q_modelAboutToBeReset()
+{
+    Q_Q(QItemSelectionModel);
+    q->clearSelection();
+    clearCurrentIndex();
+}
+
 /*!
     \class QItemSelectionModel
 
@@ -1095,12 +1104,18 @@ void QItemSelectionModel::clear()
 {
     Q_D(QItemSelectionModel);
     clearSelection();
-    QModelIndex previous = d->currentIndex;
-    d->currentIndex = QModelIndex();
+    d->clearCurrentIndex();
+}
+
+void QItemSelectionModelPrivate::clearCurrentIndex()
+{
+    Q_Q(QItemSelectionModel);
+    QModelIndex previous = currentIndex;
+    currentIndex = QModelIndex();
     if (previous.isValid()) {
-        emit currentChanged(d->currentIndex, previous);
-        emit currentRowChanged(d->currentIndex, previous);
-        emit currentColumnChanged(d->currentIndex, previous);
+        emit q->currentChanged(currentIndex, previous);
+        emit q->currentRowChanged(currentIndex, previous);
+        emit q->currentColumnChanged(currentIndex, previous);
     }
 }
 
diff --git a/src/gui/itemviews/qitemselectionmodel.h b/src/gui/itemviews/qitemselectionmodel.h
index 436514f..8682109 100644
--- a/src/gui/itemviews/qitemselectionmodel.h
+++ b/src/gui/itemviews/qitemselectionmodel.h
@@ -197,6 +197,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_rowsAboutToBeInserted(const QModelIndex&, int, int))
     Q_PRIVATE_SLOT(d_func(), void _q_layoutAboutToBeChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_layoutChanged())
+    Q_PRIVATE_SLOT(d_func(), void _q_modelAboutToBeReset())
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QItemSelectionModel::SelectionFlags)
diff --git a/src/gui/itemviews/qitemselectionmodel_p.h b/src/gui/itemviews/qitemselectionmodel_p.h
index 5afa90d..c2fe976 100644
--- a/src/gui/itemviews/qitemselectionmodel_p.h
+++ b/src/gui/itemviews/qitemselectionmodel_p.h
@@ -78,6 +78,7 @@ public:
     void _q_columnsAboutToBeInserted(const QModelIndex &parent, int start, int end);
     void _q_layoutAboutToBeChanged();
     void _q_layoutChanged();
+    void _q_modelAboutToBeReset();
 
     inline void remove(QList<QItemSelectionRange> &r)
     {
@@ -93,6 +94,8 @@ public:
             currentSelection.clear();
     }
 
+    void clearCurrentIndex();
+
     QPointer<QAbstractItemModel> model;
     QItemSelection ranges;
     QItemSelection currentSelection;