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

TextEditor: Replace QRegExp by QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: Id407154bd7d05bf5bbf07a804959e87452225c70
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2020-06-16 08:02:59 +02:00
parent 816a1df45a
commit 29e60f0741
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/texteditor/highlightersettings.cpp
View File

@@ -172,8 +172,8 @@ void HighlighterSettings::assignDefaultDefinitionsPath()
bool HighlighterSettings::isIgnoredFilePattern(const QString &fileName) const
{
for (const QRegExp &regExp : m_ignoredFiles)
if (regExp.indexIn(fileName) != -1)
for (const QRegularExpression &regExp : 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 &regExp : m_ignoredFiles)
for (const QRegularExpression &regExp : m_ignoredFiles)
patterns.append(regExp.pattern());
return patterns;
}