summaryrefslogtreecommitdiffstats
path: root/src/corelib/itemmodels
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/itemmodels')
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.cpp9
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.h9
2 files changed, 10 insertions, 8 deletions
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index 50a63e28da..a6446b2bb5 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -2927,19 +2927,14 @@ void QAbstractItemModel::endMoveColumns()
}
/*!
+ \obsolete
+
Resets the model to its original state in any attached views.
\note Use beginResetModel() and endResetModel() instead whenever possible.
Use this method only if there is no way to call beginResetModel() before invalidating the model.
Otherwise it could lead to unexpected behaviour, especially when used with proxy models.
*/
-void QAbstractItemModel::reset()
-{
- Q_D(QAbstractItemModel);
- emit modelAboutToBeReset();
- d->invalidatePersistentIndexes();
- emit modelReset();
-}
/*!
Begins a model reset operation.
diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index e5e6d26e93..36de591b8a 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -306,7 +306,14 @@ protected:
bool beginMoveColumns(const QModelIndex &sourceParent, int sourceFirst, int sourceLast, const QModelIndex &destinationParent, int destinationColumn);
void endMoveColumns();
- void reset();
+
+#if QT_DEPRECATED_SINCE(5,0)
+ QT_DEPRECATED void reset()
+ {
+ beginResetModel();
+ endResetModel();
+ }
+#endif
void beginResetModel();
void endResetModel();