Deprecate QByteArray's methods taking QString

Change-Id: I5aba5a91f288173c2d4f1bd3538191757abd3202
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

13 files changed, 25 insertions, 13 deletions

diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 57bab115bb..59a01c81aa 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -2932,8 +2932,10 @@ 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);
+#if QT_DEPRECATED_SINCE(5, 15)
     testVariant(QByteArray("Hello World!"), QString("@ByteArray(Hello World!)"), toString);
     testVariant(QByteArray("@Hello World!"), QString("@ByteArray(@Hello World!)"), toString);
+#endif
     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 86c61cba12..556018edff 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -1440,11 +1440,11 @@ void tst_QVariant::checkDataStream()
     QVERIFY(!QMetaType::isRegistered(typeId));
 
     QByteArray errorMessage("Trying to construct an instance of an invalid type, type id: ");
-    errorMessage.append(QString::number(typeId, 10));
+    errorMessage.append(QString::number(typeId, 10).toUtf8());
 
     QTest::ignoreMessage(QtWarningMsg, errorMessage.constData());
     QByteArray settingsHex("000000");
-    settingsHex.append(QString::number(typeId, 16));
+    settingsHex.append(QString::number(typeId, 16).toUtf8());
     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 4f2afe3295..e8e578ac25 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
@@ -5327,6 +5327,9 @@ void tst_QString::operator_smaller()
     QVERIFY(QString("b") >= QByteArray("a"));
     QVERIFY(QString("b") > QByteArray("a"));
 
+#if QT_DEPRECATED_SINCE(5, 15)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     QVERIFY(QByteArray("a") < QString("b"));
     QVERIFY(QByteArray("a") <= QString("b"));
     QVERIFY(QByteArray("a") <= QString("a"));
@@ -5334,6 +5337,8 @@ void tst_QString::operator_smaller()
     QVERIFY(QByteArray("a") >= QString("a"));
     QVERIFY(QByteArray("b") >= QString("a"));
     QVERIFY(QByteArray("b") > QString("a"));
+QT_WARNING_POP
+#endif
 
     QVERIFY(QLatin1String("a") < QString("b"));
     QVERIFY(QLatin1String("a") <= QString("b"));
diff --git a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
index 35546c2968..63d6635130 100644
--- a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
+++ b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
@@ -232,7 +232,9 @@ private Q_SLOTS:
     void compare_QByteArray_QStringRef_data() { compare_data(); }
     void compare_QByteArray_QStringRef() { compare_impl<QByteArray, QStringRef>(); }
     void compare_QByteArray_QString_data() { compare_data(); }
+#if QT_DEPRECATED_SINCE(5, 15)
     void compare_QByteArray_QString() { compare_impl<QByteArray, QString>(); }
+#endif
     void compare_QByteArray_QLatin1String_data() { compare_data(); }
     void compare_QByteArray_QLatin1String() { compare_impl<QByteArray, QLatin1String>(); }
     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 ac7f439248..1b93249d74 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp
@@ -358,11 +358,14 @@ void runScenario()
         QByteArray ba2 = withZero;
         ba2 += ba2 P withZero;
         QCOMPARE(ba2, QByteArray(withZero + withZero + withZero));
-#ifndef QT_NO_CAST_TO_ASCII
+#if !defined(QT_NO_CAST_TO_ASCII) && QT_DEPRECATED_SINCE(5, 15)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         ba = UTF8_LITERAL;
         ba2 = (ba += QLatin1String(LITERAL) + QString::fromUtf8(UTF8_LITERAL));
         QCOMPARE(ba2, ba);
         QCOMPARE(ba, QByteArray(UTF8_LITERAL LITERAL UTF8_LITERAL));
+QT_WARNING_POP
 #endif
     }
 
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index fe998c7d92..d5c5752f95 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -454,7 +454,7 @@ void tst_QImage::formatHandlersInput()
 
     bool formatSupported = false;
     for (QList<QByteArray>::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 a603b2d879..cc17c9f05b 100644
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -455,7 +455,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 84090c22ca..95b759edc2 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -735,7 +735,7 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge
             QByteArray &actual = actualOutputs[0];
 #ifndef Q_OS_WIN
              // Remove digits of times to match the expected file.
-            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 0b8a84028f..bfcb40451e 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")
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
index 6ee8b4e93b..762c8de70b 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
@@ -323,7 +323,7 @@ bool QFileSystemIteratorPrivate::advanceHelper()
     if (m_entry->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
         QByteArray ba = m_dirPaths.top();
         ba += '\\';
-        ba += QString::fromWCharArray(m_entry->cFileName);
+        ba += QString::fromWCharArray(m_entry->cFileName).toUtf8();
         pushSubDirectory(ba);
     }
 #else
@@ -643,7 +643,7 @@ QString QFileSystemIterator::filePath() const
     else if (d->m_entry) {
         ba += '/';
 #ifdef Q_OS_WIN
-        ba += QString::fromWCharArray(d->m_entry->cFileName);
+        ba += QString::fromWCharArray(d->m_entry->cFileName).toUtf8();
 #else
         ba += d->m_entry->d_name;
 #endif
diff --git a/tests/benchmarks/network/access/qnetworkreply_from_cache/tst_qnetworkreply_from_cache.cpp b/tests/benchmarks/network/access/qnetworkreply_from_cache/tst_qnetworkreply_from_cache.cpp
index 4dc4cecbf7..ff8e49a9a8 100644
--- a/tests/benchmarks/network/access/qnetworkreply_from_cache/tst_qnetworkreply_from_cache.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply_from_cache/tst_qnetworkreply_from_cache.cpp
@@ -148,7 +148,7 @@ tst_qnetworkreply_from_cache::tst_qnetworkreply_from_cache()
 void tst_qnetworkreply_from_cache::timeReadAll(const QString &headers, const QByteArray &data)
 {
     QByteArray reply;
-    reply.append(headers);
+    reply.append(headers.toUtf8());
     reply.append(data);
 
     m_replyData.reserve(data.size());