From 17e06afdc3a783ec9c9e317e6f160e82db0bd5cd Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 29 Apr 2022 14:09:38 +0200 Subject: [PATCH] Replace remaining uses of deprecated _qs with _s Task-number: QTBUG-101408 Change-Id: I1fda67c07e948af5017f0b99b67f8c20d7052033 Reviewed-by: Edward Welbourne --- src/corelib/text/qlocale_unix.cpp | 2 +- src/gui/image/qimagereader.cpp | 3 ++- tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 6 +++--- tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 6 ++++-- tests/auto/xml/dom/qdom/tst_qdom.cpp | 4 +++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/corelib/text/qlocale_unix.cpp b/src/corelib/text/qlocale_unix.cpp index eec718ae9b4..c5a60210cf8 100644 --- a/src/corelib/text/qlocale_unix.cpp +++ b/src/corelib/text/qlocale_unix.cpp @@ -283,7 +283,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const for (int i = 0; i < lst.size(); ++i) { QStringView language, script, territory; if (qt_splitLocaleName(lst.at(i), &language, &script, &territory)) { - QString joined = language.isEmpty() ? u"und"_qs : language.toString(); + QString joined = language.isEmpty() ? u"und"_s : language.toString(); if (!script.isEmpty()) joined += u'-' + script; if (!territory.isEmpty()) diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index c927848ff51..3eb7135ac41 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -172,6 +172,7 @@ QT_BEGIN_NAMESPACE using namespace QImageReaderWriterHelpers; +using namespace Qt::StringLiterals; static QImageIOHandler *createReadHandlerHelper(QIODevice *device, const QByteArray &format, @@ -1248,7 +1249,7 @@ bool QImageReader::read(QImage *image) // read the image QString filename = fileName(); if (Q_TRACE_ENABLED(QImageReader_read_before_reading)) { - Q_TRACE(QImageReader_read_before_reading, this, filename.isEmpty() ? u"unknown"_qs : filename); + Q_TRACE(QImageReader_read_before_reading, this, filename.isEmpty() ? u"unknown"_s : filename); } const bool result = d->handler->read(image); diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index 9c69e9fe4a0..4aab8304ba8 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 334d3088393..2bc9b8f2d23 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -36,6 +36,8 @@ # include #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") diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp index cc0eef3d02f..786a24f35a5 100644 --- a/tests/auto/xml/dom/qdom/tst_qdom.cpp +++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp @@ -43,6 +43,8 @@ QT_FORWARD_DECLARE_CLASS(QDomDocument) QT_FORWARD_DECLARE_CLASS(QDomNode) +using namespace Qt::StringLiterals; + class tst_QDom : public QObject { Q_OBJECT @@ -1445,7 +1447,7 @@ void tst_QDom::roundTripAttributes() const void tst_QDom::roundTripCDATA() const { const QString input = u"\n" - "\n"_qs; + "\n"_s; QString errorMsg; QDomDocument doc; QVERIFY(doc.setContent(input, false, &errorMsg));