diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-10 17:58:59 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-12 05:43:37 +0000 |
| commit | 23849826b490c07d9ba656bcb4ac46edd3040c0a (patch) | |
| tree | 5a96b82fda56c54b12eb6778839172b4853c2eef /tests/auto/corelib/io/qdebug/tst_qdebug.cpp | |
| parent | b62bff2ef3a6c846462e5381664651f49944261a (diff) | |
Sweep of int-ish → char-ish types near calls to QString::fromU*()
The fromUtf16(ushort*) and fromUcs4(uint*) overloads are going
to be deprecated. Use the newer fromUtf16(char16_t*) and
fromUcs4(char32_t*) overloads.
As a drive-by, use std::end()/std::size() where applicable.
Change-Id: I5a93e38cae4a2e33d49c90d06c5f14f7cb7ce90c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/io/qdebug/tst_qdebug.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qdebug/tst_qdebug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp index 4260accfd0..39897f3a58 100644 --- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp +++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp @@ -454,7 +454,7 @@ void tst_QDebug::qDebugQString() const QCOMPARE(s_msg, QString("\"\\U000E0001 \\U00100000\"")); // broken surrogate pairs - ushort utf16[] = { 0xDC00, 0xD800, 'x', 0xD800, 0 }; + char16_t utf16[] = { 0xDC00, 0xD800, 'x', 0xD800, 0 }; string = QString::fromUtf16(utf16); qDebug() << string; QCOMPARE(s_msg, QString("\"\\uDC00\\uD800x\\uD800\"")); |