From 4a6d3fcab6af36ae160e2dae3c82fdfa4612b33c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 23 Apr 2012 16:38:17 +0200 Subject: Wrap all Latin 1 strings with QString::fromLatin1 or QLatin1Strings Change-Id: I1a1891b9126a2546c1872ec25aba9581cc84bb2f Reviewed-by: Lars Knoll --- .../corelib/codecs/qtextcodec/tst_qtextcodec.cpp | 8 ++-- .../corelib/io/qtextstream/tst_qtextstream.cpp | 46 +++++++++++----------- .../auto/corelib/kernel/qvariant/tst_qvariant.cpp | 2 +- 3 files changed, 29 insertions(+), 27 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index 4144e82a29..719e29e412 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -528,8 +528,10 @@ void tst_QTextCodec::utf8Codec_data() QTest::newRow("str0") << QByteArray("abcdefgh") << QString("abcdefgh") << -1; QTest::newRow("str0-len") << QByteArray("abcdefgh") << QString("abc") << 3; - QTest::newRow("str1") << QByteArray("\303\266\303\244\303\274\303\226\303\204\303\234\303\270\303\246\303\245\303\230\303\206\303\205") << QString("\366\344\374\326\304\334\370\346\345\330\306\305") << -1; - QTest::newRow("str1-len") << QByteArray("\303\266\303\244\303\274\303\226\303\204\303\234\303\270\303\246\303\245\303\230\303\206\303\205") << QString("\366\344\374\326\304") << 10; + QTest::newRow("str1") << QByteArray("\303\266\303\244\303\274\303\226\303\204\303\234\303\270\303\246\303\245\303\230\303\206\303\205") + << QString::fromLatin1("\366\344\374\326\304\334\370\346\345\330\306\305") << -1; + QTest::newRow("str1-len") << QByteArray("\303\266\303\244\303\274\303\226\303\204\303\234\303\270\303\246\303\245\303\230\303\206\303\205") + << QString::fromLatin1("\366\344\374\326\304") << 10; str += QChar(0x05e9); str += QChar(0x05d3); @@ -1565,7 +1567,7 @@ void tst_QTextCodec::utf8bom_data() QTest::newRow("nobom") << QByteArray("\302\240", 2) - << QString("\240"); + << QString::fromLatin1("\240"); { static const ushort data[] = { 0x201d }; diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp index 37a1556cf9..6e330faa85 100644 --- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp @@ -419,28 +419,28 @@ void tst_QTextStream::generateLineData(bool for_QString) // one line QTest::newRow("utf16-BE/nothing") << QByteArray("\xfe\xff" - "\x00\xe5\x00\x67\x00\x65", 8) << (QStringList() << "\345ge"); + "\x00\xe5\x00\x67\x00\x65", 8) << (QStringList() << QLatin1String("\345ge")); QTest::newRow("utf16-LE/nothing") << QByteArray("\xff\xfe" - "\xe5\x00\x67\x00\x65\x00", 8) << (QStringList() << "\345ge"); + "\xe5\x00\x67\x00\x65\x00", 8) << (QStringList() << QLatin1String("\345ge")); QTest::newRow("utf16-BE/lf") << QByteArray("\xfe\xff" - "\x00\xe5\x00\x67\x00\x65\x00\x0a", 10) << (QStringList() << "\345ge"); + "\x00\xe5\x00\x67\x00\x65\x00\x0a", 10) << (QStringList() << QLatin1String("\345ge")); QTest::newRow("utf16-LE/lf") << QByteArray("\xff\xfe" - "\xe5\x00\x67\x00\x65\x00\x0a\x00", 10) << (QStringList() << "\345ge"); + "\xe5\x00\x67\x00\x65\x00\x0a\x00", 10) << (QStringList() << QLatin1String("\345ge")); // two lines QTest::newRow("utf16-BE/twolines") << QByteArray("\xfe\xff" "\x00\xe5\x00\x67\x00\x65\x00\x0a" "\x00\xe5\x00\x67\x00\x65\x00\x0a", 18) - << (QStringList() << "\345ge" << "\345ge"); + << (QStringList() << QLatin1String("\345ge") << QLatin1String("\345ge")); QTest::newRow("utf16-LE/twolines") << QByteArray("\xff\xfe" "\xe5\x00\x67\x00\x65\x00\x0a\x00" "\xe5\x00\x67\x00\x65\x00\x0a\x00", 18) - << (QStringList() << "\345ge" << "\345ge"); + << (QStringList() << QLatin1String("\345ge") << QLatin1String("\345ge")); // three lines QTest::newRow("utf16-BE/threelines") @@ -448,32 +448,32 @@ void tst_QTextStream::generateLineData(bool for_QString) "\x00\xe5\x00\x67\x00\x65\x00\x0a" "\x00\xe5\x00\x67\x00\x65\x00\x0a" "\x00\xe5\x00\x67\x00\x65\x00\x0a", 26) - << (QStringList() << "\345ge" << "\345ge" << "\345ge"); + << (QStringList() << QLatin1String("\345ge") << QLatin1String("\345ge") << QLatin1String("\345ge")); QTest::newRow("utf16-LE/threelines") << QByteArray("\xff\xfe" "\xe5\x00\x67\x00\x65\x00\x0a\x00" "\xe5\x00\x67\x00\x65\x00\x0a\x00" "\xe5\x00\x67\x00\x65\x00\x0a\x00", 26) - << (QStringList() << "\345ge" << "\345ge" << "\345ge"); + << (QStringList() << QLatin1String("\345ge") << QLatin1String("\345ge") << QLatin1String("\345ge")); // utf-32 QTest::newRow("utf32-BE/twolines") << QByteArray("\x00\x00\xfe\xff" "\x00\x00\x00\xe5\x00\x00\x00\x67\x00\x00\x00\x65\x00\x00\x00\x0a" "\x00\x00\x00\xe5\x00\x00\x00\x67\x00\x00\x00\x65\x00\x00\x00\x0a", 36) - << (QStringList() << "\345ge" << "\345ge"); + << (QStringList() << QLatin1String("\345ge") << QLatin1String("\345ge")); QTest::newRow("utf32-LE/twolines") << QByteArray("\xff\xfe\x00\x00" "\xe5\x00\x00\x00\x67\x00\x00\x00\x65\x00\x00\x00\x0a\x00\x00\x00" "\xe5\x00\x00\x00\x67\x00\x00\x00\x65\x00\x00\x00\x0a\x00\x00\x00", 36) - << (QStringList() << "\345ge" << "\345ge"); + << (QStringList() << QLatin1String("\345ge") << QLatin1String("\345ge")); } // partials QTest::newRow("cr") << QByteArray("\r") << (QStringList() << ""); QTest::newRow("oneline/cr") << QByteArray("ole\r") << (QStringList() << "ole"); if (!for_QString) - QTest::newRow("utf16-BE/cr") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65\x00\x0d", 10) << (QStringList() << "\345ge"); + QTest::newRow("utf16-BE/cr") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65\x00\x0d", 10) << (QStringList() << QLatin1String("\345ge")); } // ------------------------------------------------------------------------------ @@ -702,34 +702,34 @@ void tst_QTextStream::generateAllData(bool for_QString) // one line QTest::newRow("utf16-BE/nothing") << QByteArray("\xfe\xff" - "\x00\xe5\x00\x67\x00\x65", 8) << QString("\345ge"); + "\x00\xe5\x00\x67\x00\x65", 8) << QString::fromLatin1("\345ge"); QTest::newRow("utf16-LE/nothing") << QByteArray("\xff\xfe" - "\xe5\x00\x67\x00\x65\x00", 8) << QString("\345ge"); + "\xe5\x00\x67\x00\x65\x00", 8) << QString::fromLatin1("\345ge"); QTest::newRow("utf16-BE/lf") << QByteArray("\xfe\xff" - "\x00\xe5\x00\x67\x00\x65\x00\x0a", 10) << QString("\345ge\n"); + "\x00\xe5\x00\x67\x00\x65\x00\x0a", 10) << QString::fromLatin1("\345ge\n"); QTest::newRow("utf16-LE/lf") << QByteArray("\xff\xfe" - "\xe5\x00\x67\x00\x65\x00\x0a\x00", 10) << QString("\345ge\n"); + "\xe5\x00\x67\x00\x65\x00\x0a\x00", 10) << QString::fromLatin1("\345ge\n"); QTest::newRow("utf16-BE/crlf") << QByteArray("\xfe\xff" - "\x00\xe5\x00\x67\x00\x65\x00\x0d\x00\x0a", 12) << QString("\345ge\r\n"); + "\x00\xe5\x00\x67\x00\x65\x00\x0d\x00\x0a", 12) << QString::fromLatin1("\345ge\r\n"); QTest::newRow("utf16-LE/crlf") << QByteArray("\xff\xfe" - "\xe5\x00\x67\x00\x65\x00\x0d\x00\x0a\x00", 12) << QString("\345ge\r\n"); + "\xe5\x00\x67\x00\x65\x00\x0d\x00\x0a\x00", 12) << QString::fromLatin1("\345ge\r\n"); // two lines QTest::newRow("utf16-BE/twolines") << QByteArray("\xfe\xff" "\x00\xe5\x00\x67\x00\x65\x00\x0a" "\x00\xe5\x00\x67\x00\x65\x00\x0a", 18) - << QString("\345ge\n\345ge\n"); + << QString::fromLatin1("\345ge\n\345ge\n"); QTest::newRow("utf16-LE/twolines") << QByteArray("\xff\xfe" "\xe5\x00\x67\x00\x65\x00\x0a\x00" "\xe5\x00\x67\x00\x65\x00\x0a\x00", 18) - << QString("\345ge\n\345ge\n"); + << QString::fromLatin1("\345ge\n\345ge\n"); // three lines QTest::newRow("utf16-BE/threelines") @@ -737,13 +737,13 @@ void tst_QTextStream::generateAllData(bool for_QString) "\x00\xe5\x00\x67\x00\x65\x00\x0a" "\x00\xe5\x00\x67\x00\x65\x00\x0a" "\x00\xe5\x00\x67\x00\x65\x00\x0a", 26) - << QString("\345ge\n\345ge\n\345ge\n"); + << QString::fromLatin1("\345ge\n\345ge\n\345ge\n"); QTest::newRow("utf16-LE/threelines") << QByteArray("\xff\xfe" "\xe5\x00\x67\x00\x65\x00\x0a\x00" "\xe5\x00\x67\x00\x65\x00\x0a\x00" "\xe5\x00\x67\x00\x65\x00\x0a\x00", 26) - << QString("\345ge\n\345ge\n\345ge\n"); + << QString::fromLatin1("\345ge\n\345ge\n\345ge\n"); } } @@ -2042,9 +2042,9 @@ void tst_QTextStream::generateStringData(bool for_QString) if (!for_QString) { QTest::newRow("utf16-BE (empty)") << QByteArray("\xff\xfe", 2) << QByteArray() << QString(); - QTest::newRow("utf16-BE (corrupt)") << QByteArray("\xff", 1) << QByteArray("\xff") << QString("\xff"); + QTest::newRow("utf16-BE (corrupt)") << QByteArray("\xff", 1) << QByteArray("\xff") << QString::fromLatin1("\xff"); QTest::newRow("utf16-LE (empty)") << QByteArray("\xfe\xff", 2) << QByteArray() << QString(); - QTest::newRow("utf16-LE (corrupt)") << QByteArray("\xfe", 1) << QByteArray("\xfe") << QString("\xfe"); + QTest::newRow("utf16-LE (corrupt)") << QByteArray("\xfe", 1) << QByteArray("\xfe") << QString::fromLatin1("\xfe"); } } diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 3a4d1ea773..3824b5cc25 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -3419,7 +3419,7 @@ void tst_QVariant::moreCustomTypes() PLAY_WITH_VARIANT( qint32(17), false, "17", 17, true); PLAY_WITH_VARIANT(quint64(18), false, "18", 18, true); PLAY_WITH_VARIANT( qint64(19), false, "19", 19, true); - PLAY_WITH_VARIANT( qint8(-12), false, "\xf4", -12, true); + PLAY_WITH_VARIANT( qint8(-12), false, QLatin1String("\xf4"), -12, true); // qint8 is char, so it gets converted via QChar PLAY_WITH_VARIANT( qint16(-13), false, "-13", -13, true); PLAY_WITH_VARIANT( qint32(-14), false, "-14", -14, true); PLAY_WITH_VARIANT( qint64(-15), false, "-15", -15, true); -- cgit v1.2.3