From 4d31ddf5730ad3eed59331811218b26284438cef Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 22 May 2020 16:49:01 +0200 Subject: Port QDir, QFile from QStringRef to QStringView Task-number: QTBUG-84319 Change-Id: I7feb5c12eb5a8504c34292e0da75332b5ba9ef20 Reviewed-by: Edward Welbourne --- src/corelib/io/qdir.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/corelib/io/qdir.cpp') diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 647f6746a5..026e93b418 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -177,7 +177,7 @@ inline QStringList QDirPrivate::splitFilters(const QString &nameFilter, QChar se { if (sep.isNull()) sep = getFilterSepChar(nameFilter); - const QVector split = nameFilter.splitRef(sep); + const auto split = QStringView{nameFilter}.split(sep); QStringList ret; ret.reserve(split.size()); for (const auto &e : split) @@ -777,7 +777,7 @@ QString QDir::filePath(const QString &fileName) const if (fileName.startsWith(QLatin1Char('/')) || fileName.startsWith(QLatin1Char('\\'))) { // Handle the "absolute except for drive" case (i.e. \blah not c:\blah): const int drive = drivePrefixLength(ret); - return drive > 0 ? ret.leftRef(drive) % fileName : fileName; + return drive > 0 ? QStringView{ret}.left(drive) % fileName : fileName; } #endif // Q_OS_WIN @@ -810,7 +810,7 @@ QString QDir::absoluteFilePath(const QString &fileName) const // Combine absoluteDirPath's drive with fileName const int drive = drivePrefixLength(absoluteDirPath); if (Q_LIKELY(drive)) - return absoluteDirPath.leftRef(drive) % fileName; + return QStringView{absoluteDirPath}.left(drive) % fileName; qWarning("Base directory's drive is not a letter: %s", qUtf8Printable(QDir::toNativeSeparators(absoluteDirPath))); @@ -861,7 +861,6 @@ QString QDir::relativeFilePath(const QString &fileName) const const auto dirElts = dir.tokenize(QLatin1Char('/'), Qt::SkipEmptyParts); const auto fileElts = file.tokenize(QLatin1Char('/'), Qt::SkipEmptyParts); - const auto dend = dirElts.end(); const auto fend = fileElts.end(); auto dit = dirElts.begin(); -- cgit v1.2.3