From a285f773e30017898c47ee197291ee77f2575995 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 19 Jun 2020 09:34:47 +0200 Subject: [PATCH] Core: Replace QRegExp by QRegularExpression Task-number: QTCREATORBUG-24098 Change-Id: I7a492d262dba80a5249076678b4e0b237f7cf154 Reviewed-by: hjk --- src/plugins/coreplugin/find/findtoolbar.cpp | 2 +- src/plugins/coreplugin/find/itemviewfind.cpp | 25 ++++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 2db0ff5d34a..e2fe1038efb 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -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, diff --git a/src/plugins/coreplugin/find/itemviewfind.cpp b/src/plugins/coreplugin/find/itemviewfind.cpp index ae1103a165f..031864e9c20 100644 --- a/src/plugins/coreplugin/find/itemviewfind.cpp +++ b/src/plugins/coreplugin/find/itemviewfind.cpp @@ -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);