diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-11-26 09:56:42 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-12-07 10:15:58 +0000 |
| commit | 0023948f831f0303618fdb94935de9a560de5553 (patch) | |
| tree | 600376b20df8d7a0629c5beadf92e0e9272d87f7 /src/widgets/itemviews | |
| parent | 4da0c669d3b942003d6d6b88b8cebcf5d8df1967 (diff) | |
Remove the model pointer from QPersistentModelIndexData
It can be just as well received from the QModelIndex member.
Change-Id: I72f930206ca2afed730009778ded0e56e4e6f278
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'src/widgets/itemviews')
| -rw-r--r-- | src/widgets/itemviews/qdirmodel.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp index 78fc623fb5..b94c31fb42 100644 --- a/src/widgets/itemviews/qdirmodel.cpp +++ b/src/widgets/itemviews/qdirmodel.cpp @@ -1252,11 +1252,10 @@ void QDirModelPrivate::restorePersistentIndexes() for (const SavedPersistent &sp : qAsConst(savedPersistent)) { QPersistentModelIndexData *data = sp.data; QModelIndex idx = q->index(sp.path, sp.column); - if (idx != data->index || data->model == 0) { + if (idx != data->index || data->index.model() == nullptr) { //data->model may be equal to 0 if the model is getting destroyed persistent.indexes.remove(data->index); data->index = idx; - data->model = q; if (idx.isValid()) persistent.indexes.insert(idx, data); } |