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

Utils: Replace QRegExp by QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I0e29d2a43de6ff29dfeb5c9c70ac18ed95ba2657
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2020-07-17 09:14:44 +02:00
parent 42ab5c84b9
commit f154b23c78
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/utils/filenamevalidatinglineedit.cpp
View File

@@ -26,7 +26,7 @@
#include "filenamevalidatinglineedit.h" #include "filenamevalidatinglineedit.h"
#include "qtcassert.h" #include "qtcassert.h"
#include <QRegExp> #include <QRegularExpression>
#include <QDebug> #include <QDebug>
/*! /*!
@@ -46,16 +46,18 @@ namespace Utils {
// Naming a file like a device name will break on Windows, even if it is // Naming a file like a device name will break on Windows, even if it is
// "com1.txt". Since we are cross-platform, we generally disallow such file // "com1.txt". Since we are cross-platform, we generally disallow such file
// names. // names.
static const QRegExp &windowsDeviceNoSubDirPattern() static const QRegularExpression &windowsDeviceNoSubDirPattern()
{ {
static const QRegExp rc(QLatin1String(WINDOWS_DEVICES_PATTERN), Qt::CaseInsensitive); static const QRegularExpression rc(QString("^" WINDOWS_DEVICES_PATTERN "$"),
QRegularExpression::CaseInsensitiveOption);
QTC_ASSERT(rc.isValid(), return rc); QTC_ASSERT(rc.isValid(), return rc);
return rc; return rc;
} }
static const QRegExp &windowsDeviceSubDirPattern() static const QRegularExpression &windowsDeviceSubDirPattern()
{ {
static const QRegExp rc(QLatin1String(".*[/\\\\]" WINDOWS_DEVICES_PATTERN), Qt::CaseInsensitive); static const QRegularExpression rc(QString("^.*[/\\\\]" WINDOWS_DEVICES_PATTERN "$"),
QRegularExpression::CaseInsensitiveOption);
QTC_ASSERT(rc.isValid(), return rc); QTC_ASSERT(rc.isValid(), return rc);
return rc; return rc;
} }
@@ -135,9 +137,9 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name,
} }
} }
// Windows devices // Windows devices
bool matchesWinDevice = windowsDeviceNoSubDirPattern().exactMatch(name); bool matchesWinDevice = name.contains(windowsDeviceNoSubDirPattern());
if (!matchesWinDevice && allowDirectories) if (!matchesWinDevice && allowDirectories)
matchesWinDevice = windowsDeviceSubDirPattern().exactMatch(name); matchesWinDevice = name.contains(windowsDeviceSubDirPattern());
if (matchesWinDevice) { if (matchesWinDevice) {
if (errorMessage) if (errorMessage)
*errorMessage = tr("Name matches MS Windows device" *errorMessage = tr("Name matches MS Windows device"

25
src/libs/utils/filesearch.cpp
View File

@@ -30,7 +30,6 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QMutex> #include <QMutex>
#include <QRegExp>
#include <QRegularExpression> #include <QRegularExpression>
#include <QTextCodec> #include <QTextCodec>
@@ -475,22 +474,24 @@ QString matchCaseReplacement(const QString &originalText, const QString &replace
} }
} // namespace } // namespace
static QList<QRegExp> filtersToRegExps(const QStringList &filters) static QList<QRegularExpression> filtersToRegExps(const QStringList &filters)
{ {
return Utils::transform(filters, [](const QString &filter) { return Utils::transform(filters, [](const QString &filter) {
return QRegExp(filter, Qt::CaseInsensitive, QRegExp::Wildcard); return QRegularExpression(QRegularExpression::wildcardToRegularExpression(filter),
QRegularExpression::CaseInsensitiveOption);
}); });
} }
static bool matches(const QList<QRegExp> &exprList, const QString &filePath) static bool matches(const QList<QRegularExpression> &exprList, const QString &filePath)
{ {
return Utils::anyOf(exprList, [&filePath](QRegExp reg) { return Utils::anyOf(exprList, [&filePath](const QRegularExpression &reg) {
return (reg.exactMatch(filePath) return (reg.match(filePath).hasMatch()
|| reg.exactMatch(FilePath::fromString(filePath).fileName())); || reg.match(FilePath::fromString(filePath).fileName()).hasMatch());
}); });
} }
static bool isFileIncluded(const QList<QRegExp> &filterRegs, const QList<QRegExp> &exclusionRegs, static bool isFileIncluded(const QList<QRegularExpression> &filterRegs,
const QList<QRegularExpression> &exclusionRegs,
const QString &filePath) const QString &filePath)
{ {
const bool isIncluded = filterRegs.isEmpty() || matches(filterRegs, filePath); const bool isIncluded = filterRegs.isEmpty() || matches(filterRegs, filePath);
@@ -500,8 +501,8 @@ static bool isFileIncluded(const QList<QRegExp> &filterRegs, const QList<QRegExp
std::function<bool(const QString &)> std::function<bool(const QString &)>
filterFileFunction(const QStringList &filters, const QStringList &exclusionFilters) filterFileFunction(const QStringList &filters, const QStringList &exclusionFilters)
{ {
const QList<QRegExp> filterRegs = filtersToRegExps(filters); const QList<QRegularExpression> filterRegs = filtersToRegExps(filters);
const QList<QRegExp> exclusionRegs = filtersToRegExps(exclusionFilters); const QList<QRegularExpression> exclusionRegs = filtersToRegExps(exclusionFilters);
return [filterRegs, exclusionRegs](const QString &filePath) { return [filterRegs, exclusionRegs](const QString &filePath) {
return isFileIncluded(filterRegs, exclusionRegs, filePath); return isFileIncluded(filterRegs, exclusionRegs, filePath);
}; };
@@ -510,8 +511,8 @@ filterFileFunction(const QStringList &filters, const QStringList &exclusionFilte
std::function<QStringList(const QStringList &)> std::function<QStringList(const QStringList &)>
filterFilesFunction(const QStringList &filters, const QStringList &exclusionFilters) filterFilesFunction(const QStringList &filters, const QStringList &exclusionFilters)
{ {
const QList<QRegExp> filterRegs = filtersToRegExps(filters); const QList<QRegularExpression> filterRegs = filtersToRegExps(filters);
const QList<QRegExp> exclusionRegs = filtersToRegExps(exclusionFilters); const QList<QRegularExpression> exclusionRegs = filtersToRegExps(exclusionFilters);
return [filterRegs, exclusionRegs](const QStringList &filePaths) { return [filterRegs, exclusionRegs](const QStringList &filePaths) {
return Utils::filtered(filePaths, [&filterRegs, &exclusionRegs](const QString &filePath) { return Utils::filtered(filePaths, [&filterRegs, &exclusionRegs](const QString &filePath) {
return isFileIncluded(filterRegs, exclusionRegs, filePath); return isFileIncluded(filterRegs, exclusionRegs, filePath);

7
src/libs/utils/mimetypes/mimeglobpattern.cpp
View File

@@ -39,7 +39,7 @@
#include "mimeglobpattern_p.h" #include "mimeglobpattern_p.h"
#include <QRegExp> #include <QRegularExpression>
#include <QStringList> #include <QStringList>
#include <QDebug> #include <QDebug>
@@ -138,8 +138,9 @@ bool MimeGlobPattern::matchFileName(const QString &inputFilename) const
return (m_pattern == filename); return (m_pattern == filename);
// Other (quite rare) patterns, like "*.anim[1-9j]": use slow but correct method // Other (quite rare) patterns, like "*.anim[1-9j]": use slow but correct method
QRegExp rx(m_pattern, Qt::CaseSensitive, QRegExp::WildcardUnix); const QRegularExpression rx(QRegularExpression::anchoredPattern(
return rx.exactMatch(filename); QRegularExpression::wildcardToRegularExpression(m_pattern)));
return rx.match(filename).hasMatch();
} }
static bool isFastPattern(const QString &pattern) static bool isFastPattern(const QString &pattern)