diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-11 14:02:17 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-12 23:04:42 +0200 |
| commit | 548dcef08976649c820054f3db1ad108c72439cd (patch) | |
| tree | a2d9a199fcedf3c0aff3e0bf61ee23ed73aa4f3d /src/corelib/io/qurlquery.cpp | |
| parent | cf52a36994db45d6eba72e9c17c641abd8d789a3 (diff) | |
Port qt_urlRecode() to QStringView
It's about time :)
Change-Id: I27e597516318382850d4c193fd5b66a35fb9c316
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io/qurlquery.cpp')
| -rw-r--r-- | src/corelib/io/qurlquery.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp index b8a0d913323..b889eb131b9 100644 --- a/src/corelib/io/qurlquery.cpp +++ b/src/corelib/io/qurlquery.cpp @@ -240,7 +240,7 @@ inline QString QUrlQueryPrivate::recodeFromUser(const QString &input) const decode('#'), 0 }; - if (qt_urlRecode(output, input.constData(), input.constData() + input.length(), + if (qt_urlRecode(output, input, QUrl::DecodeReserved, prettyDecodedActions)) return output; @@ -261,7 +261,7 @@ inline QString QUrlQueryPrivate::recodeToUser(const QString &input, QUrl::Compon if (!(encoding & QUrl::EncodeDelimiters)) { QString output; - if (qt_urlRecode(output, input.constData(), input.constData() + input.length(), + if (qt_urlRecode(output, input, encoding, nullptr)) return output; return input; @@ -271,7 +271,7 @@ inline QString QUrlQueryPrivate::recodeToUser(const QString &input, QUrl::Compon ushort actions[] = { encode(pairDelimiter.unicode()), encode(valueDelimiter.unicode()), encode('#'), 0 }; QString output; - if (qt_urlRecode(output, input.constData(), input.constData() + input.length(), encoding, actions)) + if (qt_urlRecode(output, input, encoding, actions)) return output; return input; } @@ -306,7 +306,7 @@ void QUrlQueryPrivate::setQuery(const QString &query) // delimiter points to the value delimiter or to the end of this pair QString key; - if (!qt_urlRecode(key, begin, delimiter, + if (!qt_urlRecode(key, QStringView{begin, delimiter}, QUrl::DecodeReserved, prettyDecodedActions)) key = QString(begin, delimiter - begin); @@ -319,7 +319,7 @@ void QUrlQueryPrivate::setQuery(const QString &query) itemList.append(qMakePair(key, QString(0, Qt::Uninitialized))); } else { QString value; - if (!qt_urlRecode(value, delimiter + 1, pos, + if (!qt_urlRecode(value, QStringView{delimiter + 1, pos}, QUrl::DecodeReserved, prettyDecodedActions)) value = QString(delimiter + 1, pos - delimiter - 1); @@ -492,7 +492,7 @@ void QUrlQuery::setQuery(const QString &queryString) static void recodeAndAppend(QString &to, const QString &input, QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications) { - if (!qt_urlRecode(to, input.constData(), input.constData() + input.length(), encoding, tableModifications)) + if (!qt_urlRecode(to, input, encoding, tableModifications)) to += input; } |