diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-29 14:09:38 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-05-02 12:23:44 +0200 |
| commit | 17e06afdc3a783ec9c9e317e6f160e82db0bd5cd (patch) | |
| tree | c156386ebe8eabc037c113f7e53ac9f9ba4d17c9 /tests/auto/corelib | |
| parent | 40ba4b24375686ae419c7b579a497ac83246e0dc (diff) | |
Replace remaining uses of deprecated _qs with _s
Task-number: QTBUG-101408
Change-Id: I1fda67c07e948af5017f0b99b67f8c20d7052033
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index 9c69e9fe4a..4aab8304ba 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -2024,15 +2024,15 @@ void tst_QLocale::toDateTime_data() QTest::newRow("short-ss") // QTBUG-102199: trips over an assert in CET << "C" << QDateTime() // Single-digit seconds does not match ss format. - << u"ddd, d MMM yyyy HH:mm:ss"_qs << u"Sun, 29 Mar 2020 02:26:3"_qs << true; + << u"ddd, d MMM yyyy HH:mm:ss"_s << u"Sun, 29 Mar 2020 02:26:3"_s << true; QTest::newRow("short-ss-Z") // Same, but with a valid date-time: << "C" << QDateTime() - << u"ddd, d MMM yyyy HH:mm:ss t"_qs << u"Sun, 29 Mar 2020 02:26:3 Z"_qs << false; + << u"ddd, d MMM yyyy HH:mm:ss t"_s << u"Sun, 29 Mar 2020 02:26:3 Z"_s << false; QTest::newRow("s-Z") // Same, but with a format that accepts the single digit: << "C" << QDateTime(QDate(2020, 3, 29), QTime(2, 26, 3), Qt::UTC) - << u"ddd, d MMM yyyy HH:mm:s t"_qs << u"Sun, 29 Mar 2020 02:26:3 Z"_qs << false; + << u"ddd, d MMM yyyy HH:mm:s t"_s << u"Sun, 29 Mar 2020 02:26:3 Z"_s << false; QTest::newRow("RFC-1123") << "C" << QDateTime(QDate(2007, 11, 1), QTime(18, 8, 30)) diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 334d308839..2bc9b8f2d2 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -36,6 +36,8 @@ # include <qt_windows.h> #endif +using namespace Qt::StringLiterals; + class tst_QDateTime : public QObject { Q_OBJECT @@ -2943,9 +2945,9 @@ void tst_QDateTime::fromStringStringFormat_data() // Two tests derived from malformed ASN.1 strings (QTBUG-84349): QTest::newRow("ASN.1:UTC") - << u"22+221102233Z"_qs << u"yyMMddHHmmsst"_qs << QDateTime(); + << u"22+221102233Z"_s << u"yyMMddHHmmsst"_s << QDateTime(); QTest::newRow("ASN.1:Generalized") - << u"9922+221102233Z"_qs << u"yyyyMMddHHmmsst"_qs << QDateTime(); + << u"9922+221102233Z"_s << u"yyyyMMddHHmmsst"_s << QDateTime(); // fuzzer test QTest::newRow("integer overflow found by fuzzer") |