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

Remove uses of QRegularExpression::OptimizeOnFirstUsageOption

Browse Source 
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>
This commit is contained in:
hjk
2020-06-18 11:18:36 +02:00
parent 21b11236d0
commit b54d4e5f65
4 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/mimetypes/mimemagicrule.cpp
View File

@@ -316,7 +316,6 @@ MimeMagicRule::MimeMagicRule(MimeMagicRule::Type theType,
case RegExp: case RegExp:
d->regexp.setPatternOptions(QRegularExpression::MultilineOption d->regexp.setPatternOptions(QRegularExpression::MultilineOption
| QRegularExpression::DotMatchesEverythingOption | QRegularExpression::DotMatchesEverythingOption
| QRegularExpression::OptimizeOnFirstUsageOption
); );
d->regexp.setPattern(QString::fromUtf8(d->value)); d->regexp.setPattern(QString::fromUtf8(d->value));
if (!d->regexp.isValid()) { if (!d->regexp.isValid()) {

11
src/plugins/nim/project/nimblebuildstep.cpp
View File

@@ -48,14 +48,11 @@ class NimParser : public OutputTaskParser
Result handleLine(const QString &lne, Utils::OutputFormat) override Result handleLine(const QString &lne, Utils::OutputFormat) override
{ {
const QString line = lne.trimmed(); const QString line = lne.trimmed();
static QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)", static const QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)");
QRegularExpression::OptimizeOnFirstUsageOption); static const QRegularExpression warning("(Warning):(.*)");
static QRegularExpression warning("(Warning):(.*)", static const QRegularExpression error("(Error):(.*)");
QRegularExpression::OptimizeOnFirstUsageOption);
static QRegularExpression error("(Error):(.*)",
QRegularExpression::OptimizeOnFirstUsageOption);
QRegularExpressionMatch match = regex.match(line); const QRegularExpressionMatch match = regex.match(line);
if (!match.hasMatch()) if (!match.hasMatch())
return Status::NotHandled; return Status::NotHandled;
const QString filename = match.captured(1); const QString filename = match.captured(1);

11
src/plugins/nim/project/nimcompilerbuildstep.cpp
View File

@@ -50,14 +50,11 @@ class NimParser : public ProjectExplorer::OutputTaskParser
Result handleLine(const QString &lne, Utils::OutputFormat) override Result handleLine(const QString &lne, Utils::OutputFormat) override
{ {
const QString line = lne.trimmed(); const QString line = lne.trimmed();
static QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)", static const QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)");
QRegularExpression::OptimizeOnFirstUsageOption); static const QRegularExpression warning("(Warning):(.*)");
static QRegularExpression warning("(Warning):(.*)", static const QRegularExpression error("(Error):(.*)");
QRegularExpression::OptimizeOnFirstUsageOption);
static QRegularExpression error("(Error):(.*)",
QRegularExpression::OptimizeOnFirstUsageOption);
QRegularExpressionMatch match = regex.match(line); const QRegularExpressionMatch match = regex.match(line);
if (!match.hasMatch()) if (!match.hasMatch())
return Status::NotHandled; return Status::NotHandled;
const QString filename = match.captured(1); const QString filename = match.captured(1);

8
src/plugins/nim/tools/nimlexer.cpp
View File

@@ -199,16 +199,14 @@ NimLexer::Token NimLexer::readNumber()
bool NimLexer::matchIdentifierOrKeywordStart() bool NimLexer::matchIdentifierOrKeywordStart()
{ {
static QRegularExpression isLetter("[a-zA-Z\x80-\xFF]", static const QRegularExpression isLetter("[a-zA-Z\x80-\xFF]");
QRegularExpression::OptimizeOnFirstUsageOption);
return isLetter.match(m_stream.peek()).hasMatch(); return isLetter.match(m_stream.peek()).hasMatch();
} }
NimLexer::Token NimLexer::readIdentifierOrKeyword() NimLexer::Token NimLexer::readIdentifierOrKeyword()
{ {
static QRegularExpression isLetter("[a-zA-Z\x80-\xFF]", static const QRegularExpression isLetter("[a-zA-Z\x80-\xFF]");
QRegularExpression::OptimizeOnFirstUsageOption); static const QSet<QString> keywords = {
static QSet<QString> keywords = {
"addr", "and", "as", "asm", "atomic", "addr", "and", "as", "asm", "atomic",
"bind", "block", "break", "bind", "block", "break",
"case", "cast", "concept", "const", "continue", "converter", "case", "cast", "concept", "const", "continue", "converter",