feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Port QtCreator over to use filterRegularExpression

Browse Source 
QSortFilterProxyModel::filterRegExp is going to go away in Qt6,
so port over to use QRegularExpression instead.

This required some changes where setFilterWildcard/FixedString()
was being used, as those would instantiate QRegExp based filters
in Qt 5, and will use QRegularExpression in Qt 6. Use the generic
setFilterRegularExpression here, to keep things portable between
5 and 6.

Change-Id: I6379be781aa3821b10ba783c088f82c1a0970911
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Lars Knoll
2020-03-27 11:56:25 +01:00
parent 553c3c2c74
commit 47e576528e
18 changed files with 48 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -554,7 +554,7 @@ void CallgrindToolPrivate::doClear(bool clearParseData)
m_proxyModel.setFilterBaseDir(QString());
if (m_searchFilter)
m_searchFilter->clear();
m_proxyModel.setFilterFixedString(QString());
m_proxyModel.setFilterRegularExpression(QRegularExpression());
}
void CallgrindToolPrivate::setBusyCursor(bool busy)
@@ -609,7 +609,7 @@ void CallgrindToolPrivate::stackBrowserChanged()
void CallgrindToolPrivate::updateFilterString()
{
m_proxyModel.setFilterFixedString(m_searchFilter->text());
m_proxyModel.setFilterRegularExpression(QRegularExpression::escape(m_searchFilter->text()));
}
void CallgrindToolPrivate::setCostFormat(CostDelegate::CostFormat format)