diff options
| -rw-r--r-- | src/libs/utils/mimetypes/mimemagicrule.cpp | 1 | ||||
| -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 |
4 files changed, 13 insertions, 22 deletions
diff --git a/src/libs/utils/mimetypes/mimemagicrule.cpp b/src/libs/utils/mimetypes/mimemagicrule.cpp index c425417426..0aa0a6ad48 100644 --- a/src/libs/utils/mimetypes/mimemagicrule.cpp +++ b/src/libs/utils/mimetypes/mimemagicrule.cpp @@ -316,7 +316,6 @@ MimeMagicRule::MimeMagicRule(MimeMagicRule::Type theType, case RegExp: d->regexp.setPatternOptions(QRegularExpression::MultilineOption | QRegularExpression::DotMatchesEverythingOption - | QRegularExpression::OptimizeOnFirstUsageOption ); d->regexp.setPattern(QString::fromUtf8(d->value)); if (!d->regexp.isValid()) { 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", |