diff options
author | Christian Stenger <christian.stenger@qt.io> | 2020-06-16 08:02:59 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2020-06-16 07:40:18 +0000 |
commit | 29e60f07414f9dcb5c86cc5623d958b70ebd5798 (patch) | |
tree | 868a6256378ccd9e55491309f4a61056bdaa4e53 /src/plugins/texteditor/highlightersettings.cpp | |
parent | 816a1df45a059789d7a4dd079e44d2a130e8235a (diff) |
TextEditor: Replace QRegExp by QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: Id407154bd7d05bf5bbf07a804959e87452225c70
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/texteditor/highlightersettings.cpp')
-rw-r--r-- | src/plugins/texteditor/highlightersettings.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/texteditor/highlightersettings.cpp b/src/plugins/texteditor/highlightersettings.cpp index 9fe4744cf7..a048a69575 100644 --- a/src/plugins/texteditor/highlightersettings.cpp +++ b/src/plugins/texteditor/highlightersettings.cpp @@ -172,8 +172,8 @@ void HighlighterSettings::assignDefaultDefinitionsPath() bool HighlighterSettings::isIgnoredFilePattern(const QString &fileName) const { - for (const QRegExp ®Exp : m_ignoredFiles) - if (regExp.indexIn(fileName) != -1) + for (const QRegularExpression ®Exp : m_ignoredFiles) + if (fileName.indexOf(regExp) != -1) return true; return false; @@ -188,11 +188,10 @@ bool HighlighterSettings::equals(const HighlighterSettings &highlighterSettings) void HighlighterSettings::setExpressionsFromList(const QStringList &patterns) { m_ignoredFiles.clear(); - QRegExp regExp; - regExp.setCaseSensitivity(Qt::CaseInsensitive); - regExp.setPatternSyntax(QRegExp::Wildcard); + QRegularExpression regExp; + regExp.setPatternOptions(QRegularExpression::CaseInsensitiveOption); for (const QString &pattern : patterns) { - regExp.setPattern(pattern); + regExp.setPattern(QRegularExpression::wildcardToRegularExpression(pattern)); m_ignoredFiles.append(regExp); } } @@ -200,7 +199,7 @@ void HighlighterSettings::setExpressionsFromList(const QStringList &patterns) QStringList HighlighterSettings::listFromExpressions() const { QStringList patterns; - for (const QRegExp ®Exp : m_ignoredFiles) + for (const QRegularExpression ®Exp : m_ignoredFiles) patterns.append(regExp.pattern()); return patterns; } |