1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSortFilterProxyModel: remove deprecated functions

Browse Source 
Change-Id: I1775fafc6cca88c0c65032a1fd126dc3b42975c9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Christian Ehrlicher 2020-06-18 20:02:13 +02:00
parent 6770e0b360
commit ef4bed7196
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -2856,17 +2856,6 @@ void QSortFilterProxyModel::setAutoAcceptChildRows(bool accept)
emit autoAcceptChildRowsChanged(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 \since 4.3
@ -2882,18 +2871,6 @@ void QSortFilterProxyModel::invalidate()
emit layoutChanged(); emit layoutChanged();
} }
#if QT_DEPRECATED_SINCE(5, 11)
/*!
\obsolete
This function is obsolete. Use invalidateFilter() instead.
*/
void QSortFilterProxyModel::filterChanged()
{
invalidateFilter();
}
#endif
/*! /*!
\since 4.3 \since 4.3

6
src/corelib/itemmodels/qsortfilterproxymodel.h
View File

@ -127,9 +127,6 @@ public Q_SLOTS:
#endif #endif
void setFilterWildcard(const QString &pattern); void setFilterWildcard(const QString &pattern);
void setFilterFixedString(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(); void invalidate();
protected: protected:
@ -137,9 +134,6 @@ protected:
virtual bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const; virtual bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const;
virtual bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) 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 invalidateFilter();
void invalidateRowsFilter(); void invalidateRowsFilter();
void invalidateColumnsFilter(); void invalidateColumnsFilter();