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 /tests/auto | |
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 'tests/auto')
-rw-r--r-- | tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp index 5608d2479c..b38467af8d 100644 --- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp +++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp @@ -847,7 +847,7 @@ void tst_QUrlInternal::correctEncodedMistakes() QString dataTag = QTest::currentDataTag(); QString output = dataTag; - if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), { })) + if (!qt_urlRecode(output, input, { })) output += input; QCOMPARE(output, dataTag + expected); @@ -855,7 +855,7 @@ void tst_QUrlInternal::correctEncodedMistakes() output = dataTag; QString expected2 = QUrl::fromPercentEncoding(expected.toLatin1()); - if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), QUrl::FullyDecoded)) + if (!qt_urlRecode(output, input, QUrl::FullyDecoded)) output += input; QCOMPARE(output, dataTag + expected2); } @@ -1019,7 +1019,7 @@ void tst_QUrlInternal::encodingRecode() QString output = QTest::currentDataTag(); expected.prepend(output); - if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), encodingMode)) + if (!qt_urlRecode(output, input, encodingMode)) output += input; QCOMPARE(output, expected); } @@ -1047,19 +1047,19 @@ void tst_QUrlInternal::encodingRecodeInvalidUtf8() // prepend some data to be sure that it remains there QString output = QTest::currentDataTag(); - if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), QUrl::PrettyDecoded)) + if (!qt_urlRecode(output, input, QUrl::PrettyDecoded)) output += input; QCOMPARE(output, QTest::currentDataTag() + input); // this is just control output = QTest::currentDataTag(); - if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), QUrl::FullyEncoded)) + if (!qt_urlRecode(output, input, QUrl::FullyEncoded)) output += input; QCOMPARE(output, QTest::currentDataTag() + input); // verify for security reasons that all bad UTF-8 data got replaced by QChar::ReplacementCharacter output = QTest::currentDataTag(); - if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), QUrl::FullyEncoded)) + if (!qt_urlRecode(output, input, QUrl::FullyEncoded)) output += input; for (int i = int(strlen(QTest::currentDataTag())); i < output.length(); ++i) { QVERIFY2(output.at(i).unicode() < 0x80 || output.at(i) == QChar::ReplacementCharacter, |