From 555970eeb0a31e41ed867e8f64fb1fd1b18a77d4 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 16 Jun 2020 07:52:56 +0200 Subject: [PATCH] Todo: Replace QRegExp by QRegularExpression Task-number: QTCREATORBUG-24098 Change-Id: I30d06f78106760ca3ad434b3f89603fd7bab2d71 Reviewed-by: hjk --- src/plugins/todo/todoitemsprovider.cpp | 6 +++--- src/plugins/todo/todoprojectsettingswidget.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp index de83d31d4ea..c76dd6b53f8 100644 --- a/src/plugins/todo/todoitemsprovider.cpp +++ b/src/plugins/todo/todoitemsprovider.cpp @@ -41,7 +41,7 @@ #include -#include +#include #include using namespace ProjectExplorer; @@ -131,8 +131,8 @@ void TodoItemsProvider::setItemsListWithinStartupProject() if (filePaths.contains(filePath)) { bool skip = false; for (const QVariant &pattern : settings[Constants::EXCLUDES_LIST_KEY].toList()) { - QRegExp re(pattern.toString()); - if (re.indexIn(filePath.toString()) != -1) { + QRegularExpression re(pattern.toString()); + if (filePath.toString().indexOf(re) != -1) { skip = true; break; } diff --git a/src/plugins/todo/todoprojectsettingswidget.cpp b/src/plugins/todo/todoprojectsettingswidget.cpp index 5f2c427e8d1..d2dbbd5aa58 100644 --- a/src/plugins/todo/todoprojectsettingswidget.cpp +++ b/src/plugins/todo/todoprojectsettingswidget.cpp @@ -95,7 +95,7 @@ void TodoProjectSettingsWidget::saveSettings() void TodoProjectSettingsWidget::prepareItem(QListWidgetItem *item) const { - if (QRegExp(item->text()).isValid()) + if (QRegularExpression(item->text()).isValid()) item->setForeground(QBrush(ui->excludedPatternsList->palette().color(QPalette::Active, QPalette::Text))); else item->setForeground(QBrush(Qt::red));