1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port QUrl away from QStringRef

Browse Source 
Task-number: QTBUG-84319
Change-Id: I6167599ac86f17d37fbb6ea90d302641969b0f72
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Lars Knoll 2020-05-22 17:06:51 +02:00
parent 957b999683
commit 4ab3089a2c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/io/qurl.cpp
View File

@ -925,20 +925,20 @@ inline void QUrlPrivate::appendPath(QString &appendTo, QUrl::FormattingOptions o
thePath = qt_normalizePathSegments(path, isLocalFile() ? QDirPrivate::DefaultNormalization : QDirPrivate::RemotePath); thePath = qt_normalizePathSegments(path, isLocalFile() ? QDirPrivate::DefaultNormalization : QDirPrivate::RemotePath);
} }
QStringRef thePathRef(&thePath); QStringView thePathView(thePath);
if (options & QUrl::RemoveFilename) { if (options & QUrl::RemoveFilename) {
const int slash = path.lastIndexOf(QLatin1Char('/')); const int slash = path.lastIndexOf(QLatin1Char('/'));
if (slash == -1) if (slash == -1)
return; return;
thePathRef = path.leftRef(slash + 1); thePathView = QStringView{path}.left(slash + 1);
} }
// check if we need to remove trailing slashes // check if we need to remove trailing slashes
if (options & QUrl::StripTrailingSlash) { if (options & QUrl::StripTrailingSlash) {
while (thePathRef.length() > 1 && thePathRef.endsWith(QLatin1Char('/'))) while (thePathView.length() > 1 && thePathView.endsWith(QLatin1Char('/')))
thePathRef.chop(1); thePathView.chop(1);
} }
appendToUser(appendTo, thePathRef, options, appendToUser(appendTo, thePathView, options,
appendingTo == FullUrl || options & QUrl::EncodeDelimiters ? pathInUrl : pathInIsolation); appendingTo == FullUrl || options & QUrl::EncodeDelimiters ? pathInUrl : pathInIsolation);
} }
@ -1527,7 +1527,7 @@ inline QString QUrlPrivate::mergePaths(const QString &relativePath) const
if (!path.contains(QLatin1Char('/'))) if (!path.contains(QLatin1Char('/')))
newPath = relativePath; newPath = relativePath;
else else
newPath = path.leftRef(path.lastIndexOf(QLatin1Char('/')) + 1) + relativePath; newPath = QStringView{path}.left(path.lastIndexOf(QLatin1Char('/')) + 1) + relativePath;
return newPath; return newPath;
} }
@ -3813,7 +3813,7 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
} else if (deslashified.startsWith(QLatin1String("//"))) { } else if (deslashified.startsWith(QLatin1String("//"))) {
// magic for shared drive on windows // magic for shared drive on windows
int indexOfPath = deslashified.indexOf(QLatin1Char('/'), 2); int indexOfPath = deslashified.indexOf(QLatin1Char('/'), 2);
QStringRef hostSpec = deslashified.midRef(2, indexOfPath - 2); QStringView hostSpec = QStringView{deslashified}.mid(2, indexOfPath - 2);
// Check for Windows-specific WebDAV specification: "//host@SSL/path". // Check for Windows-specific WebDAV specification: "//host@SSL/path".
if (hostSpec.endsWith(webDavSslTag(), Qt::CaseInsensitive)) { if (hostSpec.endsWith(webDavSslTag(), Qt::CaseInsensitive)) {
hostSpec.truncate(hostSpec.size() - 4); hostSpec.truncate(hostSpec.size() - 4);
@ -4138,7 +4138,7 @@ static QUrl adjustFtpPath(QUrl url)
if (url.scheme() == ftpScheme()) { if (url.scheme() == ftpScheme()) {
QString path = url.path(QUrl::PrettyDecoded); QString path = url.path(QUrl::PrettyDecoded);
if (path.startsWith(QLatin1String("//"))) if (path.startsWith(QLatin1String("//")))
url.setPath(QLatin1String("/%2F") + path.midRef(2), QUrl::TolerantMode); url.setPath(QLatin1String("/%2F") + QStringView{path}.mid(2), QUrl::TolerantMode);
} }
return url; return url;
} }
@ -4262,7 +4262,7 @@ QUrl QUrl::fromUserInput(const QString &userInput)
if (urlPrepended.isValid() && (!urlPrepended.host().isEmpty() || !urlPrepended.path().isEmpty())) if (urlPrepended.isValid() && (!urlPrepended.host().isEmpty() || !urlPrepended.path().isEmpty()))
{ {
int dotIndex = trimmedString.indexOf(QLatin1Char('.')); int dotIndex = trimmedString.indexOf(QLatin1Char('.'));
const QStringRef hostscheme = trimmedString.leftRef(dotIndex); const QStringView hostscheme = QStringView{trimmedString}.left(dotIndex);
if (hostscheme.compare(ftpScheme(), Qt::CaseInsensitive) == 0) if (hostscheme.compare(ftpScheme(), Qt::CaseInsensitive) == 0)
urlPrepended.setScheme(ftpScheme()); urlPrepended.setScheme(ftpScheme());
return adjustFtpPath(urlPrepended); return adjustFtpPath(urlPrepended);