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

Core: Replace QRegExp by QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I7a492d262dba80a5249076678b4e0b237f7cf154
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2020-06-19 09:34:47 +02:00
parent 281ec36ad8
commit a285f773e3
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/find/findtoolbar.cpp
View File

@@ -515,7 +515,7 @@ void FindToolBar::setFindText(const QString &text)
disconnect(m_ui.findEdit, &Utils::FancyLineEdit::textChanged,
this, &FindToolBar::invokeFindIncremental);
if (hasFindFlag(FindRegularExpression))
m_ui.findEdit->setText(QRegExp::escape(text));
m_ui.findEdit->setText(QRegularExpression::escape(text));
else
m_ui.findEdit->setText(text);
connect(m_ui.findEdit, &Utils::FancyLineEdit::textChanged,

25
src/plugins/coreplugin/find/itemviewfind.cpp
View File

@@ -191,22 +191,21 @@ IFindSupport::Result ItemViewFind::find(const QString &searchTxt,
int currentRow = currentIndex.row();
bool sensitive = (findFlags & FindCaseSensitively);
QRegExp searchExpr;
QRegularExpression searchExpr;
if (findFlags & FindRegularExpression) {
searchExpr = QRegExp(searchTxt,
(sensitive ? Qt::CaseSensitive :
Qt::CaseInsensitive));
searchExpr = QRegularExpression(searchTxt,
(sensitive ? QRegularExpression::NoPatternOption :
QRegularExpression::CaseInsensitiveOption));
} else if (findFlags & FindWholeWords) {
const QString escapedSearchText = QRegExp::escape(searchTxt);
const QString escapedSearchText = QRegularExpression::escape(searchTxt);
const QString wordBoundary = QLatin1String("\b");
searchExpr = QRegExp(wordBoundary + escapedSearchText + wordBoundary,
(sensitive ? Qt::CaseSensitive :
Qt::CaseInsensitive));
searchExpr = QRegularExpression(wordBoundary + escapedSearchText + wordBoundary,
(sensitive ? QRegularExpression::NoPatternOption :
QRegularExpression::CaseInsensitiveOption));
} else {
searchExpr = QRegExp(searchTxt,
(sensitive ? Qt::CaseSensitive :
Qt::CaseInsensitive),
QRegExp::FixedString);
searchExpr = QRegularExpression(QRegularExpression::escape(searchTxt),
(sensitive ? QRegularExpression::NoPatternOption :
QRegularExpression::CaseInsensitiveOption));
}
@@ -226,7 +225,7 @@ IFindSupport::Result ItemViewFind::find(const QString &searchTxt,
index, d->m_role).toString();
if (d->m_view->model()->flags(index) & Qt::ItemIsSelectable
&& (index.row() != currentRow || index.parent() != currentIndex.parent())
&& searchExpr.indexIn(text) != -1)
&& text.indexOf(searchExpr) != -1)
resultIndex = index;
}
index = followingIndex(index, backward, &stepWrapped);