From ef4bed7196afd889eb984f2653900171258cf6fd Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 18 Jun 2020 20:02:13 +0200 Subject: QSortFilterProxyModel: remove deprecated functions Change-Id: I1775fafc6cca88c0c65032a1fd126dc3b42975c9 Reviewed-by: Volker Hilsheimer --- src/corelib/itemmodels/qsortfilterproxymodel.cpp | 23 ----------------------- src/corelib/itemmodels/qsortfilterproxymodel.h | 6 ------ 2 files changed, 29 deletions(-) diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 2c494aeec8..03db159618 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -2856,17 +2856,6 @@ void QSortFilterProxyModel::setAutoAcceptChildRows(bool accept) emit autoAcceptChildRowsChanged(accept); } -#if QT_DEPRECATED_SINCE(5, 11) -/*! - \obsolete - - This function is obsolete. Use invalidate() instead. -*/ -void QSortFilterProxyModel::clear() -{ - invalidate(); -} -#endif /*! \since 4.3 @@ -2882,18 +2871,6 @@ void QSortFilterProxyModel::invalidate() emit layoutChanged(); } -#if QT_DEPRECATED_SINCE(5, 11) -/*! - \obsolete - - This function is obsolete. Use invalidateFilter() instead. -*/ -void QSortFilterProxyModel::filterChanged() -{ - invalidateFilter(); -} -#endif - /*! \since 4.3 diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index 647b1616ce..10853b2040 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -127,9 +127,6 @@ public Q_SLOTS: #endif void setFilterWildcard(const QString &pattern); void setFilterFixedString(const QString &pattern); -#if QT_DEPRECATED_SINCE(5, 11) - QT_DEPRECATED_X("Use QSortFilterProxyModel::invalidate") void clear(); -#endif void invalidate(); protected: @@ -137,9 +134,6 @@ protected: virtual bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const; virtual bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const; -#if QT_DEPRECATED_SINCE(5, 11) - QT_DEPRECATED_X("Use QSortFilterProxyModel::invalidateFilter") void filterChanged(); -#endif void invalidateFilter(); void invalidateRowsFilter(); void invalidateColumnsFilter(); -- cgit v1.2.3