Port from QStringViewLiteral to u""

Now that all our supported compilers know char16_t, we no longer need
QStringViewLiteral, whose only purpose in life was to turn u"" into
L"" for MSVC < 2015.

Change-Id: I25a094fe7992d9d5dbeb4a524d9e99e043dcb8ce
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

3 files changed, 11 insertions, 11 deletions

diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index ec8f2fc047..676c66df3e 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -1459,8 +1459,8 @@ void tst_QLocale::dayOfWeek()
     QCOMPARE(QLocale::c().toString(date, "ddd"), shortName);
     QCOMPARE(QLocale::c().toString(date, "dddd"), longName);
 
-    QCOMPARE(QLocale::c().toString(date, QStringViewLiteral("ddd")), shortName);
-    QCOMPARE(QLocale::c().toString(date, QStringViewLiteral("dddd")), longName);
+    QCOMPARE(QLocale::c().toString(date, u"ddd"), shortName);
+    QCOMPARE(QLocale::c().toString(date, u"dddd"), longName);
 }
 
 void tst_QLocale::formatDate_data()
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
index e4aa00f500..cce3e601cd 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
@@ -4763,7 +4763,7 @@ void tst_QString::arg()
 
     QCOMPARE( s4.arg("foo"), QLatin1String("[foo]") );
     QCOMPARE( s5.arg(QLatin1String("foo")), QLatin1String("[foo]") );
-    QCOMPARE( s6.arg(QStringViewLiteral("foo")), QLatin1String("[foo]") );
+    QCOMPARE( s6.arg(u"foo"), QLatin1String("[foo]") );
     QCOMPARE( s7.arg("foo"), QLatin1String("[foo]") );
     QCOMPARE( s8.arg("foo"), QLatin1String("[foo %1]") );
     QCOMPARE( s8.arg("foo").arg("bar"), QLatin1String("[foo bar]") );
@@ -4825,10 +4825,10 @@ void tst_QString::arg()
 
     QCOMPARE( QString("%1").arg("hello", -10), QLatin1String("hello     ") );
     QCOMPARE( QString("%1").arg(QLatin1String("hello"), -5), QLatin1String("hello") );
-    QCOMPARE( QString("%1").arg(QStringViewLiteral("hello"), -2), QLatin1String("hello") );
+    QCOMPARE( QString("%1").arg(u"hello", -2), QLatin1String("hello") );
     QCOMPARE( QString("%1").arg("hello", 0), QLatin1String("hello") );
     QCOMPARE( QString("%1").arg(QLatin1String("hello"), 2), QLatin1String("hello") );
-    QCOMPARE( QString("%1").arg(QStringViewLiteral("hello"), 5), QLatin1String("hello") );
+    QCOMPARE( QString("%1").arg(u"hello", 5), QLatin1String("hello") );
     QCOMPARE( QString("%1").arg("hello", 10), QLatin1String("     hello") );
     QCOMPARE( QString("%1%1").arg("hello"), QLatin1String("hellohello") );
     QCOMPARE( QString("%2%1").arg("hello"), QLatin1String("%2hello") );
diff --git a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
index 794f39708a..5d95f43d6a 100644
--- a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
+++ b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
@@ -251,7 +251,7 @@ void tst_QStringView::constExpr() const
         Q_STATIC_ASSERT(sv2.empty());
     }
     {
-        constexpr QStringView sv = QStringViewLiteral("");
+        constexpr QStringView sv = u"";
         Q_STATIC_ASSERT(sv.size() == 0);
         Q_STATIC_ASSERT(!sv.isNull());
         Q_STATIC_ASSERT(sv.empty());
@@ -263,7 +263,7 @@ void tst_QStringView::constExpr() const
         Q_STATIC_ASSERT(sv2.empty());
     }
     {
-        constexpr QStringView sv = QStringViewLiteral("Hello");
+        constexpr QStringView sv = u"Hello";
         Q_STATIC_ASSERT(sv.size() == 5);
         Q_STATIC_ASSERT(!sv.empty());
         Q_STATIC_ASSERT(!sv.isEmpty());
@@ -465,7 +465,7 @@ void tst_QStringView::arg() const
 #undef CHECK2
 #undef CHECK1
 
-    QCOMPARE(QStringViewLiteral(" %2 %2 %1 %3 ").arg(QLatin1Char('c'), QChar::CarriageReturn, u'C'), " \r \r c C ");
+    QCOMPARE(QStringView(u" %2 %2 %1 %3 ").arg(QLatin1Char('c'), QChar::CarriageReturn, u'C'), " \r \r c C ");
 }
 
 void tst_QStringView::fromQString() const
@@ -662,9 +662,9 @@ void tst_QStringView::conversion_tests(String string) const
 
 void tst_QStringView::comparison()
 {
-    const QStringView aa = QStringViewLiteral("aa");
-    const QStringView upperAa = QStringViewLiteral("AA");
-    const QStringView bb = QStringViewLiteral("bb");
+    const QStringView aa = u"aa";
+    const QStringView upperAa = u"AA";
+    const QStringView bb = u"bb";
 
     QVERIFY(aa == aa);
     QVERIFY(aa != bb);