diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-03-18 12:53:51 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-07 19:30:17 +0200 |
| commit | a885f28933896998cd363999b7825b95c365b3f5 (patch) | |
| tree | 98770f255ac2ef5d367e0eebe4a1d33d6464d2a0 /tests/auto/corelib/text/qlocale | |
| parent | f5174abec3720b7deec3157e482ca62c0d90fb19 (diff) | |
Replace uses of _qs with _s in tests
Task-number: QTBUG-101408
Change-Id: If092a68828a1e8056259cf90d035d9a87989244b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/corelib/text/qlocale')
| -rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index 09f034cb0e..01395a566c 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -56,6 +56,8 @@ # include <stdlib.h> #endif +using namespace Qt::StringLiterals; + Q_DECLARE_METATYPE(QLocale::FormatType) class tst_QLocale : public QObject @@ -2541,7 +2543,7 @@ void tst_QLocale::dayName_data() QTest::newRow("ru_RU short") << QString("ru_RU") << QString::fromUtf8("\320\262\321\201") << 7 << QLocale::ShortFormat; QTest::newRow("ru_RU narrow") - << QString("ru_RU") << u"\u0412"_qs << 7 << QLocale::NarrowFormat; + << QString("ru_RU") << u"\u0412"_s << 7 << QLocale::NarrowFormat; } void tst_QLocale::dayName() @@ -3589,18 +3591,18 @@ void tst_QLocale::lcsToCode() QCOMPARE(QLocale::languageToCode(QLocale::AnyLanguage), QString()); QCOMPARE(QLocale::languageToCode(QLocale::C), QString("C")); QCOMPARE(QLocale::languageToCode(QLocale::English), QString("en")); - QCOMPARE(QLocale::languageToCode(QLocale::Albanian), u"sq"_qs); - QCOMPARE(QLocale::languageToCode(QLocale::Albanian, QLocale::ISO639Part1), u"sq"_qs); - QCOMPARE(QLocale::languageToCode(QLocale::Albanian, QLocale::ISO639Part2B), u"alb"_qs); - QCOMPARE(QLocale::languageToCode(QLocale::Albanian, QLocale::ISO639Part2T), u"sqi"_qs); - QCOMPARE(QLocale::languageToCode(QLocale::Albanian, QLocale::ISO639Part3), u"sqi"_qs); + QCOMPARE(QLocale::languageToCode(QLocale::Albanian), u"sq"_s); + QCOMPARE(QLocale::languageToCode(QLocale::Albanian, QLocale::ISO639Part1), u"sq"_s); + QCOMPARE(QLocale::languageToCode(QLocale::Albanian, QLocale::ISO639Part2B), u"alb"_s); + QCOMPARE(QLocale::languageToCode(QLocale::Albanian, QLocale::ISO639Part2T), u"sqi"_s); + QCOMPARE(QLocale::languageToCode(QLocale::Albanian, QLocale::ISO639Part3), u"sqi"_s); - QCOMPARE(QLocale::languageToCode(QLocale::Taita), u"dav"_qs); + QCOMPARE(QLocale::languageToCode(QLocale::Taita), u"dav"_s); QCOMPARE(QLocale::languageToCode(QLocale::Taita, QLocale::ISO639Part1 | QLocale::ISO639Part2B | QLocale::ISO639Part2T), QString()); - QCOMPARE(QLocale::languageToCode(QLocale::Taita, QLocale::ISO639Part3), u"dav"_qs); + QCOMPARE(QLocale::languageToCode(QLocale::Taita, QLocale::ISO639Part3), u"dav"_s); QCOMPARE(QLocale::languageToCode(QLocale::English, QLocale::LanguageCodeTypes {}), QString()); // Legacy codes can only be used to convert them to Language values, not other way around. |