QtCore: replace QLatin1String/QLatin1Char with _L1/u'' where applicable

As a drive-by, did also minor refactorings/improvements.

Task-number: QTBUG-98434
Change-Id: I81964176ae2f07ea63674c96f47f9c6aa046854f
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>

6 files changed, 31 insertions, 21 deletions

diff --git a/src/corelib/doc/snippets/code/src_corelib_mimetype_qmimedatabase.cpp b/src/corelib/doc/snippets/code/src_corelib_mimetype_qmimedatabase.cpp
index 3092e32f6f..2c18b6e00d 100644
--- a/src/corelib/doc/snippets/code/src_corelib_mimetype_qmimedatabase.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_mimetype_qmimedatabase.cpp
@@ -48,6 +48,8 @@
 **
 ****************************************************************************/
 
+using namespace Qt::StringLiterals;
+
 //! [0]
 QMimeDatabase db;
 QMimeType mime = db.mimeTypeForFile(fileName);
@@ -57,7 +59,7 @@ if (mime.inherits("text/plain")) {
 //! [0]
 
 //! [1]
-QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("mime/packages"),
+QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "mime/packages"_L1,
                           QStandardPaths::LocateDirectory);
 //! [1]
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_serialization_qcborstream.cpp b/src/corelib/doc/snippets/code/src_corelib_serialization_qcborstream.cpp
index cb6928b129..7edc040073 100644
--- a/src/corelib/doc/snippets/code/src_corelib_serialization_qcborstream.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_serialization_qcborstream.cpp
@@ -48,6 +48,8 @@
 **
 ****************************************************************************/
 
+using namespace Qt::StringLiterals;
+
 //! [0]
    QCborValue(QCborTag(2), QByteArray("\x01\0\0\0\0\0\0\0\0", 9));
 //! [0]
@@ -55,18 +57,18 @@
 //! [1]
    writer.startMap(4);    // 4 elements in the map
 
-   writer.append(QLatin1String("label"));
-   writer.append(QLatin1String("journald"));
+   writer.append("label"_L1);
+   writer.append("journald"_L1);
 
-   writer.append(QLatin1String("autoDetect"));
+   writer.append("autoDetect"_L1);
    writer.append(false);
 
-   writer.append(QLatin1String("condition"));
-   writer.append(QLatin1String("libs.journald"));
+   writer.append("condition"_L1);
+   writer.append("libs.journald"_L1);
 
-   writer.append(QLatin1String("output"));
+   writer.append("output"_L1);
    writer.startArray(1);
-   writer.append(QLatin1String("privateFeature"));
+   writer.append("privateFeature"_L1);
    writer.endArray();
 
    writer.endMap();
@@ -118,7 +120,7 @@
 //! [7]
 
 //! [8]
-   writer.append(QLatin1String("Hello, World"));
+   writer.append("Hello, World"_L1);
 //! [8]
 
 //! [9]
diff --git a/src/corelib/doc/snippets/code/src_corelib_text_qstring.cpp b/src/corelib/doc/snippets/code/src_corelib_text_qstring.cpp
index fe44bee4a8..1f7f1835a7 100644
--- a/src/corelib/doc/snippets/code/src_corelib_text_qstring.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_text_qstring.cpp
@@ -48,8 +48,10 @@
 **
 ****************************************************************************/
 
+using namespace Qt::StringLiterals;
+
 //! [1]
-QString url = QLatin1String("https://www.unicode.org/");
+QString url = "https://www.unicode.org/"_L1;
 //! [1]
 
 
@@ -77,17 +79,17 @@ if (str == QString("auto") || str == QString("extern")
 
 
 //! [5]
-if (str == QLatin1String("auto")
-        || str == QLatin1String("extern")
-        || str == QLatin1String("static")
-        || str == QLatin1String("register") {
+if (str == "auto"_L1
+        || str == "extern"_L1
+        || str == "static"_L1
+        || str == "register"_L1 {
     ...
 }
 //! [5]
 
 
 //! [6]
-QLabel *label = new QLabel(QLatin1String("MOD"), this);
+QLabel *label = new QLabel("MOD"_L1, this);
 //! [6]
 
 
@@ -112,5 +114,5 @@ if (node.hasAttribute(QStringLiteral(u"http-contents-length"))) //...
 //! [10]
 
 //! [11]
-if (attribute.name() == QLatin1String("http-contents-length")) //...
+if (attribute.name() == "http-contents-length"_L1) //...
 //! [11]
diff --git a/src/corelib/doc/snippets/hellotrmain.cpp b/src/corelib/doc/snippets/hellotrmain.cpp
index 526da44701..975cacace0 100644
--- a/src/corelib/doc/snippets/hellotrmain.cpp
+++ b/src/corelib/doc/snippets/hellotrmain.cpp
@@ -48,6 +48,8 @@
 **
 ****************************************************************************/
 
+using namespace Qt::StringLiterals;
+
 //! [0]
 int main(int argc, char *argv[])
 {
@@ -55,7 +57,7 @@ int main(int argc, char *argv[])
 
     QTranslator translator;
     // look up e.g. :/i18n/myapp_de.qm
-    if (translator.load(QLocale(), QLatin1String("myapp"), QLatin1String("_"), QLatin1String(":/i18n")))
+    if (translator.load(QLocale(), "myapp"_L1, "_"_L1, ":/i18n"_L1))
         QCoreApplication::installTranslator(&translator);
 
     QPushButton hello(QCoreApplication::translate("main", "Hello world!"));
diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp
index d0a1b9c9ba..da6b3ad1fa 100644
--- a/src/corelib/doc/snippets/qstring/main.cpp
+++ b/src/corelib/doc/snippets/qstring/main.cpp
@@ -735,10 +735,10 @@ void Widget::splitCaseSensitiveFunction()
     //! [62]
     QString str = QStringLiteral("a,,b,c");
 
-    QStringList list1 = str.split(QLatin1Char(','));
+    QStringList list1 = str.split(u',');
     // list1: [ "a", "", "b", "c" ]
 
-    QStringList list2 = str.split(QLatin1Char(','), Qt::SkipEmptyParts);
+    QStringList list2 = str.split(u',', Qt::SkipEmptyParts);
     // list2: [ "a", "b", "c" ]
     //! [62]
 
@@ -750,7 +750,7 @@ void Widget::splitCaseSensitiveFunction()
 
     //! [62-slashes]
     QString str = "/a/b/c/";
-    auto parts = str.split(QLatin1Char('/'));
+    auto parts = str.split(u'/');
     // parts: {"", "a", "b", "c", ""}
     //! [62-slashes]
 }
diff --git a/src/corelib/doc/snippets/qstring/stringbuilder.cpp b/src/corelib/doc/snippets/qstring/stringbuilder.cpp
index b81b40e10e..10a3fe1945 100644
--- a/src/corelib/doc/snippets/qstring/stringbuilder.cpp
+++ b/src/corelib/doc/snippets/qstring/stringbuilder.cpp
@@ -48,11 +48,13 @@
 **
 ****************************************************************************/
 
+using namespace Qt::StringLiterals;
+
 //! [0]
     QString foo;
     QString type = "long";
 
-    foo = QLatin1String("vector<") + type + QLatin1String(">::iterator");
+    foo = "vector<"_L1 + type + ">::iterator"_L1;
 
     if (foo.startsWith("(" + type + ") 0x"))
         ...