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

Utils: Use QRegularExpression in fileutils

Browse Source 
Change-Id: I48b192630e52ff3825bcb401a19faef59e846da3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-05-27 11:07:43 +02:00
parent 2ba2a0d1d4
commit 13ad816308
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/fileutils.cpp
View File

@@ -35,7 +35,7 @@
#include <QDebug> #include <QDebug>
#include <QDateTime> #include <QDateTime>
#include <QOperatingSystemVersion> #include <QOperatingSystemVersion>
#include <QRegExp> #include <QRegularExpression>
#include <QTimer> #include <QTimer>
#include <QUrl> #include <QUrl>
#include <qplatformdefs.h> #include <qplatformdefs.h>
@@ -325,10 +325,10 @@ QString FilePath::shortNativePath() const
QString FileUtils::fileSystemFriendlyName(const QString &name) QString FileUtils::fileSystemFriendlyName(const QString &name)
{ {
QString result = name; QString result = name;
result.replace(QRegExp(QLatin1String("\\W")), QLatin1String("_")); result.replace(QRegularExpression(QLatin1String("\\W")), QLatin1String("_"));
result.replace(QRegExp(QLatin1String("_+")), QLatin1String("_")); // compact _ result.replace(QRegularExpression(QLatin1String("_+")), QLatin1String("_")); // compact _
result.remove(QRegExp(QLatin1String("^_*"))); // remove leading _ result.remove(QRegularExpression(QLatin1String("^_*"))); // remove leading _
result.remove(QRegExp(QLatin1String("_+$"))); // remove trailing _ result.remove(QRegularExpression(QLatin1String("_+$"))); // remove trailing _
if (result.isEmpty()) if (result.isEmpty())
result = QLatin1String("unknown"); result = QLatin1String("unknown");
return result; return result;
@@ -336,8 +336,8 @@ QString FileUtils::fileSystemFriendlyName(const QString &name)
int FileUtils::indexOfQmakeUnfriendly(const QString &name, int startpos) int FileUtils::indexOfQmakeUnfriendly(const QString &name, int startpos)
{ {
static QRegExp checkRegExp(QLatin1String("[^a-zA-Z0-9_.-]")); static const QRegularExpression checkRegExp(QLatin1String("[^a-zA-Z0-9_.-]"));
return checkRegExp.indexIn(name, startpos); return checkRegExp.match(name, startpos).capturedStart();
} }
QString FileUtils::qmakeFriendlyName(const QString &name) QString FileUtils::qmakeFriendlyName(const QString &name)