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/qurlrecode.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/qurlrecode.cpp')
-rw-r--r-- | src/corelib/io/qurlrecode.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qurlrecode.cpp b/src/corelib/io/qurlrecode.cpp index 52dfbc12f9..1c9d0d1d4b 100644 --- a/src/corelib/io/qurlrecode.cpp +++ b/src/corelib/io/qurlrecode.cpp @@ -671,13 +671,13 @@ static void maskTable(uchar (&table)[N], const uchar (&mask)[N]) meaning "%25" (all percents in the same content). */ -Q_AUTOTEST_EXPORT int -qt_urlRecode(QString &appendTo, const QChar *begin, const QChar *end, +Q_AUTOTEST_EXPORT qsizetype +qt_urlRecode(QString &appendTo, QStringView in, QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications) { uchar actionTable[sizeof defaultActionTable]; if (encoding == QUrl::FullyDecoded) { - return int(decode(appendTo, QStringView{begin, end})); + return int(decode(appendTo, in)); } memcpy(actionTable, defaultActionTable, sizeof actionTable); @@ -691,7 +691,7 @@ qt_urlRecode(QString &appendTo, const QChar *begin, const QChar *end, actionTable[uchar(*p) - ' '] = *p >> 8; } - return recode(appendTo, reinterpret_cast<const ushort *>(begin), reinterpret_cast<const ushort *>(end), + return recode(appendTo, reinterpret_cast<const ushort *>(in.begin()), reinterpret_cast<const ushort *>(in.end()), encoding, actionTable, false); } |