diff options
| author | hjk <hjk@qt.io> | 2020-05-27 11:07:43 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-05-27 12:01:38 +0000 |
| commit | 13ad8163080153cb5d1ea39238069b5cca8f9651 (patch) | |
| tree | c547316172dd11ae5594439bea1b14e998ab391a | |
| parent | 2ba2a0d1d49f1c60b63c5b8df0d151b6afb83726 (diff) | |
Utils: Use QRegularExpression in fileutils
Change-Id: I48b192630e52ff3825bcb401a19faef59e846da3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/libs/utils/fileutils.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 5901a60803..6b7b0b2a09 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -35,7 +35,7 @@ #include <QDebug> #include <QDateTime> #include <QOperatingSystemVersion> -#include <QRegExp> +#include <QRegularExpression> #include <QTimer> #include <QUrl> #include <qplatformdefs.h> @@ -325,10 +325,10 @@ QString FilePath::shortNativePath() const QString FileUtils::fileSystemFriendlyName(const QString &name) { QString result = name; - result.replace(QRegExp(QLatin1String("\\W")), QLatin1String("_")); - result.replace(QRegExp(QLatin1String("_+")), QLatin1String("_")); // compact _ - result.remove(QRegExp(QLatin1String("^_*"))); // remove leading _ - result.remove(QRegExp(QLatin1String("_+$"))); // remove trailing _ + result.replace(QRegularExpression(QLatin1String("\\W")), QLatin1String("_")); + result.replace(QRegularExpression(QLatin1String("_+")), QLatin1String("_")); // compact _ + result.remove(QRegularExpression(QLatin1String("^_*"))); // remove leading _ + result.remove(QRegularExpression(QLatin1String("_+$"))); // remove trailing _ if (result.isEmpty()) result = QLatin1String("unknown"); return result; @@ -336,8 +336,8 @@ QString FileUtils::fileSystemFriendlyName(const QString &name) int FileUtils::indexOfQmakeUnfriendly(const QString &name, int startpos) { - static QRegExp checkRegExp(QLatin1String("[^a-zA-Z0-9_.-]")); - return checkRegExp.indexIn(name, startpos); + static const QRegularExpression checkRegExp(QLatin1String("[^a-zA-Z0-9_.-]")); + return checkRegExp.match(name, startpos).capturedStart(); } QString FileUtils::qmakeFriendlyName(const QString &name) |