whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Christian Ehrlicher 2017-12-20 20:50:41 +01:00
parent 6df308c0d7
commit ec7e870e70
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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: