diff options
| author | hjk <hjk@qt.io> | 2020-06-18 11:18:36 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-06-18 11:19:54 +0000 |
| commit | b54d4e5f6568c188284d3cf165da552dacb0910b (patch) | |
| tree | 2bb13a020bcd9fce9f525de653526d50653493c5 /src/plugins/nim | |
| parent | 21b11236d0287b75182d48140b3357f53b618298 (diff) | |
Remove uses of QRegularExpression::OptimizeOnFirstUsageOption
Deprecated, and declared to have no effect for Qt >= 5.12.
Task-number: QTCREATORBUG-24098
Change-Id: I11067b8e2ae40ff1f1dd4de92a734a40d2eae556
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/nim')
| -rw-r--r-- | src/plugins/nim/project/nimblebuildstep.cpp | 13 | ||||
| -rw-r--r-- | src/plugins/nim/project/nimcompilerbuildstep.cpp | 13 | ||||
| -rw-r--r-- | src/plugins/nim/tools/nimlexer.cpp | 8 |
3 files changed, 13 insertions, 21 deletions
diff --git a/src/plugins/nim/project/nimblebuildstep.cpp b/src/plugins/nim/project/nimblebuildstep.cpp index 1d29fbb1aa..33fb0845b9 100644 --- a/src/plugins/nim/project/nimblebuildstep.cpp +++ b/src/plugins/nim/project/nimblebuildstep.cpp @@ -48,14 +48,11 @@ class NimParser : public OutputTaskParser Result handleLine(const QString &lne, Utils::OutputFormat) override { const QString line = lne.trimmed(); - static QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)", - QRegularExpression::OptimizeOnFirstUsageOption); - static QRegularExpression warning("(Warning):(.*)", - QRegularExpression::OptimizeOnFirstUsageOption); - static QRegularExpression error("(Error):(.*)", - QRegularExpression::OptimizeOnFirstUsageOption); - - QRegularExpressionMatch match = regex.match(line); + static const QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)"); + static const QRegularExpression warning("(Warning):(.*)"); + static const QRegularExpression error("(Error):(.*)"); + + const QRegularExpressionMatch match = regex.match(line); if (!match.hasMatch()) return Status::NotHandled; const QString filename = match.captured(1); diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index 9015a2002d..a04b440521 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -50,14 +50,11 @@ class NimParser : public ProjectExplorer::OutputTaskParser Result handleLine(const QString &lne, Utils::OutputFormat) override { const QString line = lne.trimmed(); - static QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)", - QRegularExpression::OptimizeOnFirstUsageOption); - static QRegularExpression warning("(Warning):(.*)", - QRegularExpression::OptimizeOnFirstUsageOption); - static QRegularExpression error("(Error):(.*)", - QRegularExpression::OptimizeOnFirstUsageOption); - - QRegularExpressionMatch match = regex.match(line); + static const QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)"); + static const QRegularExpression warning("(Warning):(.*)"); + static const QRegularExpression error("(Error):(.*)"); + + const QRegularExpressionMatch match = regex.match(line); if (!match.hasMatch()) return Status::NotHandled; const QString filename = match.captured(1); diff --git a/src/plugins/nim/tools/nimlexer.cpp b/src/plugins/nim/tools/nimlexer.cpp index d79e642671..40a67705dc 100644 --- a/src/plugins/nim/tools/nimlexer.cpp +++ b/src/plugins/nim/tools/nimlexer.cpp @@ -199,16 +199,14 @@ NimLexer::Token NimLexer::readNumber() bool NimLexer::matchIdentifierOrKeywordStart() { - static QRegularExpression isLetter("[a-zA-Z\x80-\xFF]", - QRegularExpression::OptimizeOnFirstUsageOption); + static const QRegularExpression isLetter("[a-zA-Z\x80-\xFF]"); return isLetter.match(m_stream.peek()).hasMatch(); } NimLexer::Token NimLexer::readIdentifierOrKeyword() { - static QRegularExpression isLetter("[a-zA-Z\x80-\xFF]", - QRegularExpression::OptimizeOnFirstUsageOption); - static QSet<QString> keywords = { + static const QRegularExpression isLetter("[a-zA-Z\x80-\xFF]"); + static const QSet<QString> keywords = { "addr", "and", "as", "asm", "atomic", "bind", "block", "break", "case", "cast", "concept", "const", "continue", "converter", |