1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QStringConverter: fix some deprecation warnings

Browse Source 
QString's fromUtf16() prefers char16_t data over ushort.

Change-Id: Ib20c5afa09ceabb4e91fe434b6a057edb4739a53
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Edward Welbourne 2020-07-16 13:57:37 +02:00
parent 74a35a509c
commit 7ce27430a7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
View File

@ -1274,24 +1274,24 @@ void tst_QStringConverter::utf8bom_data()
<< QString::fromLatin1("\240"); << QString::fromLatin1("\240");
{ {
static const ushort data[] = { 0x201d }; static const char16_t data[] = { 0x201d };
QTest::newRow("nobom 2") QTest::newRow("nobom 2")
<< QByteArray("\342\200\235", 3) << QByteArray("\342\200\235", 3)
<< QString::fromUtf16(data, sizeof(data)/sizeof(short)); << QString::fromUtf16(data, std::size(data));
} }
{ {
static const ushort data[] = { 0xf000 }; static const char16_t data[] = { 0xf000 };
QTest::newRow("bom1") QTest::newRow("bom1")
<< QByteArray("\357\200\200", 3) << QByteArray("\357\200\200", 3)
<< QString::fromUtf16(data, sizeof(data)/sizeof(short)); << QString::fromUtf16(data, std::size(data));
} }
{ {
static const ushort data[] = { 0xfec0 }; static const char16_t data[] = { 0xfec0 };
QTest::newRow("bom2") QTest::newRow("bom2")
<< QByteArray("\357\273\200", 3) << QByteArray("\357\273\200", 3)
<< QString::fromUtf16(data, sizeof(data)/sizeof(short)); << QString::fromUtf16(data, std::size(data));
} }
{ {
@ -1301,17 +1301,18 @@ void tst_QStringConverter::utf8bom_data()
} }
{ // test the non-SIMD code-path { // test the non-SIMD code-path
static const ushort data[] = { 0x61, 0xfeff, 0x62 }; static const char16_t data[] = { 0x61, 0xfeff, 0x62 };
QTest::newRow("middle-bom (non SIMD)") QTest::newRow("middle-bom (non SIMD)")
<< QByteArray("a\357\273\277b") << QByteArray("a\357\273\277b")
<< QString::fromUtf16(data, sizeof(data)/sizeof(short)); << QString::fromUtf16(data, std::size(data));
} }
{ // test the SIMD code-path { // test the SIMD code-path
static const ushort data[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0xfeff, 0x6d }; static const char16_t data[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0xfeff, 0x6d };
QTest::newRow("middle-bom (SIMD)") QTest::newRow("middle-bom (SIMD)")
<< QByteArray("abcdefghijkl\357\273\277m") << QByteArray("abcdefghijkl\357\273\277m")
<< QString::fromUtf16(data, sizeof(data)/sizeof(short)); << QString::fromUtf16(data, std::size(data));
} }
} }
QT_WARNING_POP QT_WARNING_POP