summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/itemmodels/qsortfilterproxymodel.cpp13
-rw-r--r--src/corelib/itemmodels/qsortfilterproxymodel.h8
2 files changed, 12 insertions, 9 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index c70fbaf63b..220c6be79e 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -2685,6 +2685,7 @@ void QSortFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
d->filter_changed();
}
+#if QT_DEPRECATED_SINCE(5, 11)
/*!
\obsolete
@@ -2692,12 +2693,9 @@ void QSortFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
*/
void QSortFilterProxyModel::clear()
{
- Q_D(QSortFilterProxyModel);
- emit layoutAboutToBeChanged();
- d->_q_clearMapping();
- emit layoutChanged();
+ invalidate();
}
-
+#endif
/*!
\since 4.3
@@ -2713,6 +2711,7 @@ void QSortFilterProxyModel::invalidate()
emit layoutChanged();
}
+#if QT_DEPRECATED_SINCE(5, 11)
/*!
\obsolete
@@ -2720,9 +2719,9 @@ void QSortFilterProxyModel::invalidate()
*/
void QSortFilterProxyModel::filterChanged()
{
- Q_D(QSortFilterProxyModel);
- d->filter_changed();
+ invalidateFilter();
}
+#endif
/*!
\since 4.3
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h
index 6c620f4812..196dab2770 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.h
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.h
@@ -115,7 +115,9 @@ public Q_SLOTS:
void setFilterRegExp(const QString &pattern);
void setFilterWildcard(const QString &pattern);
void setFilterFixedString(const QString &pattern);
- void clear();
+#if QT_DEPRECATED_SINCE(5, 11)
+ QT_DEPRECATED_X("Use QSortFilterProxyModel::invalidate") void clear();
+#endif
void invalidate();
protected:
@@ -123,7 +125,9 @@ protected:
virtual bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const;
virtual bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
- void filterChanged();
+#if QT_DEPRECATED_SINCE(5, 11)
+ QT_DEPRECATED_X("Use QSortFilterProxyModel::invalidateFilter") void filterChanged();
+#endif
void invalidateFilter();
public: