From d7ccd8cb4565c8643b158891c9de3187c1586dc9 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 17 Jun 2020 22:53:53 +0200 Subject: Remove QByteArray's methods taking QString and their uses [ChangeLog][QtCore][QByteArray] Remove method overloads taking QString as argument, all of which were equivalent to passing the toUtf8() of the string instead. Change-Id: I9251733a9b3711153b2faddbbc907672a7cba190 Reviewed-by: Edward Welbourne Reviewed-by: Lars Knoll --- tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 2 -- tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 2 +- tests/auto/corelib/text/qstring/tst_qstring.cpp | 8 -------- .../corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp | 1 - .../corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp | 6 ------ tests/auto/gui/image/qimage/tst_qimage.cpp | 2 +- tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 4 ++-- tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp | 2 +- tests/auto/testlib/selftests/tst_selftests.cpp | 2 +- tests/auto/tools/rcc/tst_rcc.cpp | 2 +- tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp | 2 +- 11 files changed, 8 insertions(+), 25 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index d5f2da06d2..ae1506e848 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -2816,8 +2816,6 @@ void tst_QSettings::testEscapes() testVariant(QString("Hello, World!"), QString("Hello, World!"), toString); testVariant(QString("@Hello World!"), QString("@@Hello World!"), toString); testVariant(QString("@@Hello World!"), QString("@@@Hello World!"), toString); - testVariant(QByteArray("Hello World!"), QString("@ByteArray(Hello World!)"), toString); - testVariant(QByteArray("@Hello World!"), QString("@ByteArray(@Hello World!)"), toString); testVariant(QVariant(100), QString("100"), toString); testVariant(QStringList() << "ene" << "due" << "rike", QString::fromLatin1("@Variant(\x0\x0\x0\xb\x0\x0\x0\x3\x0\x0\x0\x6\x0\x65\x0n\x0\x65\x0\x0\x0\x6\x0\x64\x0u\x0\x65\x0\x0\x0\x8\x0r\x0i\x0k\x0\x65)", 50), toStringList); testVariant(QRect(1, 2, 3, 4), QString("@Rect(1 2 3 4)"), toRect); diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index fdd39cb0a4..c9a60c44e6 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -1404,7 +1404,7 @@ void tst_QVariant::checkDataStream() QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type")); QByteArray settingsHex("000000"); - settingsHex.append(QString::number(typeId, 16)); + settingsHex.append(QByteArray::number(typeId, 16)); settingsHex.append("ffffffffff"); const QByteArray settings = QByteArray::fromHex(settingsHex); QDataStream in(settings); diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index 61f775f4d8..81a08eb59e 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -5226,14 +5226,6 @@ void tst_QString::operator_smaller() QVERIFY(QString("b") >= QByteArray("a")); QVERIFY(QString("b") > QByteArray("a")); - QVERIFY(QByteArray("a") < QString("b")); - QVERIFY(QByteArray("a") <= QString("b")); - QVERIFY(QByteArray("a") <= QString("a")); - QVERIFY(QByteArray("a") == QString("a")); - QVERIFY(QByteArray("a") >= QString("a")); - QVERIFY(QByteArray("b") >= QString("a")); - QVERIFY(QByteArray("b") > QString("a")); - QVERIFY(QLatin1String("a") < QString("b")); QVERIFY(QLatin1String("a") <= QString("b")); QVERIFY(QLatin1String("a") <= QString("a")); diff --git a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp index a870597ef2..d363c01f68 100644 --- a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp +++ b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp @@ -233,7 +233,6 @@ private Q_SLOTS: void compare_QByteArray_QStringRef_data() { compare_data(); } void compare_QByteArray_QStringRef() { compare_impl(); } void compare_QByteArray_QString_data() { compare_data(); } - void compare_QByteArray_QString() { compare_impl(); } void compare_QByteArray_QLatin1String_data() { compare_data(); } void compare_QByteArray_QLatin1String() { compare_impl(); } void compare_QByteArray_QByteArray_data() { compare_data(); } diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp index e31708ad72..5903c7066b 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp @@ -358,12 +358,6 @@ void runScenario() QByteArray ba2 = withZero; ba2 += ba2 P withZero; QCOMPARE(ba2, QByteArray(withZero + withZero + withZero)); -#ifndef QT_NO_CAST_TO_ASCII - ba = UTF8_LITERAL; - ba2 = (ba += QLatin1String(LITERAL) + QString::fromUtf8(UTF8_LITERAL)); - QCOMPARE(ba2, ba); - QCOMPARE(ba, QByteArray(UTF8_LITERAL LITERAL UTF8_LITERAL)); -#endif } } diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 38b3d28901..f9e94d826c 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -452,7 +452,7 @@ void tst_QImage::formatHandlersInput() bool formatSupported = false; for (QList::Iterator it = formats.begin(); it != formats.end(); ++it) { - if (*it == testFormat.toLower()) { + if (*it == testFormat.toLower().toUtf8()) { formatSupported = true; break; } diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 6001829854..bea7d610b8 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -1803,7 +1803,7 @@ static QByteArray msgIgnoreFormatAndExtensionFail(const QString &sourceFileName, QByteArray result = "Failure for '"; result += sourceFileName.toLocal8Bit(); result += "' as '"; - result += targetFileName; + result += targetFileName.toLocal8Bit(); result += "', detected as: '"; result += detectedFormat.toLocal8Bit(); result += '\''; @@ -1825,7 +1825,7 @@ void tst_QImageReader::testIgnoresFormatAndExtension() tempPath += QLatin1Char('/'); foreach (const QByteArray &f, formats) { - if (f == extension) + if (f == extension.toLocal8Bit()) continue; QFile tmp(tempPath + name + QLatin1Char('_') + expected + QLatin1Char('.') + f); diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index c4364aeb4e..835e279ac3 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -433,7 +433,7 @@ static QStringList reverseLookupHelper(const QString &ip) name = line.mid(line.lastIndexOf(" ")).trimmed(); } else if (line.startsWith(addressMarkerWin)) { QByteArray address = line.mid(addressMarkerWin.length()).trimmed(); - if (address == ip) { + if (address == ip.toUtf8()) { results << name; } } diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index b4294e6a09..6659525fec 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -804,7 +804,7 @@ QByteArray sanitizeOutput(const QString &test, const QByteArray &output) if (test == "crashes") { #if !defined(Q_OS_WIN) // Remove digits of times - const QLatin1String timePattern("Function time:"); + const QByteArray timePattern("Function time:"); int timePos = actual.indexOf(timePattern); if (timePos >= 0) { timePos += timePattern.size(); diff --git a/tests/auto/tools/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp index 9388b63d0f..a4dbbfb657 100644 --- a/tests/auto/tools/rcc/tst_rcc.cpp +++ b/tests/auto/tools/rcc/tst_rcc.cpp @@ -152,7 +152,7 @@ static QString doCompare(const QStringList &actual, const QStringList &expected, if (expectedLine != actual.at(i)) { qDebug() << "LINES" << (i + 1) << "DIFFER"; ba.append( - "\n<<<<<< actual\n" + actual.at(i) + "\n======\n" + expectedLine + "\n<<<<<< actual\n" + actual.at(i).toUtf8() + "\n======\n" + expectedLine.toUtf8() + "\n>>>>>> expected\n" ); } diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp index afdcc825d8..8b437103de 100644 --- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp +++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp @@ -175,7 +175,7 @@ private slots: if (isBody) { - body.append(line); + body.append(line.toUtf8()); bodyBytesRead += line.length(); } else if (line == "\r\n") -- cgit v1.2.3