diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2017-12-20 20:50:41 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-01-17 18:16:00 +0000 |
| commit | ec7e870e70bd83fbb22e5cf563fb7824f1a1fc44 (patch) | |
| tree | adbf473bf5b3459f11371aa6d603629efabeb39b /src/corelib | |
| parent | 6df308c0d7170aec34423dfc129f6a13b425e960 (diff) | |
QSortFilterProxyModel: annotate some deprecated functions as deprecated
QSortFilterProxyModel::clear() and filterChanged() are deprecated since
Qt4.3 but not annotated with QT_DEPRECATED.
Change-Id: Ia468203802b6be0596f0a48d51f1da3fa55b724b
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp | 13 | ||||
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.h | 8 |
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: |