QtGui: use _L1 for for creating Latin-1 string literals

Task-number: QTBUG-98434
Change-Id: Idcb71c1d27125333a53b6bdd3e1af0d4c66617fa
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

9 files changed, 67 insertions, 58 deletions

diff --git a/src/gui/image/qabstractfileiconengine.cpp b/src/gui/image/qabstractfileiconengine.cpp
index 97f547359e..1eefc6bd6b 100644
--- a/src/gui/image/qabstractfileiconengine.cpp
+++ b/src/gui/image/qabstractfileiconengine.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \class QAbstractFileIconEngine
     \brief Helper base class for retrieving icons for files for usage by QFileIconProvider and related.
@@ -128,7 +130,7 @@ QString QAbstractFileIconEngine::cacheKey() const
         return QString();
 
     const QString &suffix = m_fileInfo.suffix();
-    return QLatin1String("qt_.")
+    return "qt_."_L1
         + (suffix.isEmpty() ? m_fileInfo.fileName() : suffix); // handle "Makefile"                                    ;)
 }
 
diff --git a/src/gui/image/qabstractfileiconprovider.cpp b/src/gui/image/qabstractfileiconprovider.cpp
index d79e49832b..78e3a268f0 100644
--- a/src/gui/image/qabstractfileiconprovider.cpp
+++ b/src/gui/image/qabstractfileiconprovider.cpp
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QAbstractFileIconProviderPrivate::QAbstractFileIconProviderPrivate(QAbstractFileIconProvider *q)
     : q_ptr(q)
 {}
@@ -114,22 +116,22 @@ QIcon QAbstractFileIconProviderPrivate::getIconThemeIcon(QAbstractFileIconProvid
 {
     switch (type) {
     case QAbstractFileIconProvider::Computer:
-        return QIcon::fromTheme(QLatin1String("computer"));
+        return QIcon::fromTheme("computer"_L1);
     case QAbstractFileIconProvider::Desktop:
-        return QIcon::fromTheme(QLatin1String("user-desktop"));
+        return QIcon::fromTheme("user-desktop"_L1);
     case QAbstractFileIconProvider::Trashcan:
-        return QIcon::fromTheme(QLatin1String("user-trash"));
+        return QIcon::fromTheme("user-trash"_L1);
     case QAbstractFileIconProvider::Network:
-        return QIcon::fromTheme(QLatin1String("network-workgroup"));
+        return QIcon::fromTheme("network-workgroup"_L1);
     case QAbstractFileIconProvider::Drive:
-        return QIcon::fromTheme(QLatin1String("drive-harddisk"));
+        return QIcon::fromTheme("drive-harddisk"_L1);
     case QAbstractFileIconProvider::Folder:
-        return QIcon::fromTheme(QLatin1String("folder"));
+        return QIcon::fromTheme("folder"_L1);
     case QAbstractFileIconProvider::File:
-        return QIcon::fromTheme(QLatin1String("text-x-generic"));
+        return QIcon::fromTheme("text-x-generic"_L1);
         // no default on purpose; we want warnings when the type enum is extended
     }
-    return QIcon::fromTheme(QLatin1String("text-x-generic"));
+    return QIcon::fromTheme("text-x-generic"_L1);
 }
 
 static inline QPlatformTheme::IconOptions toThemeIconOptions(QAbstractFileIconProvider::Options options)
@@ -156,7 +158,7 @@ QIcon QAbstractFileIconProviderPrivate::getIconThemeIcon(const QFileInfo &info)
 #if QT_CONFIG(mimetype)
     return QIcon::fromTheme(mimeDatabase.mimeTypeForFile(info).iconName());
 #else
-    return QIcon::fromTheme(QLatin1String("text-x-generic"));
+    return QIcon::fromTheme("text-x-generic"_L1);
 #endif
 }
 
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index c27fd0f835..27271d9bd6 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -66,6 +66,8 @@
 #ifndef QT_NO_ICON
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \enum QIcon::Mode
 
@@ -320,7 +322,7 @@ QPixmap QPixmapIconEngine::scaledPixmap(const QSize &size, QIcon::Mode mode, QIc
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
-    QString key = QLatin1String("qt_")
+    QString key = "qt_"_L1
                   % HexString<quint64>(pm.cacheKey())
                   % HexString<uint>(pe ? pe->mode : QIcon::Normal)
                   % HexString<quint64>(QGuiApplication::palette().cacheKey())
@@ -493,7 +495,7 @@ void QPixmapIconEngine::addFile(const QString &fileName, const QSize &size, QIco
 
 QString QPixmapIconEngine::key() const
 {
-    return QLatin1String("QPixmapIconEngine");
+    return "QPixmapIconEngine"_L1;
 }
 
 QIconEngine *QPixmapIconEngine::clone() const
@@ -550,7 +552,7 @@ bool QPixmapIconEngine::write(QDataStream &out) const
 }
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
-    (QIconEngineFactoryInterface_iid, QLatin1String("/iconengines"), Qt::CaseInsensitive))
+    (QIconEngineFactoryInterface_iid, "/iconengines"_L1, Qt::CaseInsensitive))
 
 QFactoryLoader *qt_iconEngineFactoryLoader()
 {
@@ -1457,10 +1459,10 @@ QDataStream &operator>>(QDataStream &s, QIcon &icon)
         icon = QIcon();
         QString key;
         s >> key;
-        if (key == QLatin1String("QPixmapIconEngine")) {
+        if (key == "QPixmapIconEngine"_L1) {
             icon.d = new QIconPrivate(new QPixmapIconEngine);
             icon.d->engine->read(s);
-        } else if (key == QLatin1String("QIconLoaderEngine")) {
+        } else if (key == "QIconLoaderEngine"_L1) {
             icon.d = new QIconPrivate(new QIconLoaderEngine());
             icon.d->engine->read(s);
         } else {
@@ -1567,7 +1569,7 @@ QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRati
     }
 
     QString atNxfileName = baseFileName;
-    atNxfileName.insert(dotIndex, QLatin1String("@2x"));
+    atNxfileName.insert(dotIndex, "@2x"_L1);
     // Check for @Nx, ..., @3x, @2x file versions,
     for (int n = qMin(qCeil(targetDevicePixelRatio), 9); n > 1; --n) {
         atNxfileName[dotIndex + 1] = QLatin1Char('0' + n);
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 7d7aaced95..09f1a16de1 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -59,6 +59,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_GLOBAL_STATIC(QIconLoader, iconLoaderInstance)
 
 /* Theme to use in last resort, if the theme does not have the icon, neither the parents  */
@@ -122,7 +124,7 @@ void QIconLoader::ensureInitialized()
 
         if (m_systemTheme.isEmpty())
             m_systemTheme = systemFallbackThemeName();
-        if (qt_iconEngineFactoryLoader()->keyMap().key(QLatin1String("svg"), -1) != -1)
+        if (qt_iconEngineFactoryLoader()->keyMap().key("svg"_L1, -1) != -1)
             m_supportsSvg = true;
     }
 }
@@ -187,7 +189,7 @@ QStringList QIconLoader::themeSearchPaths() const
     if (m_iconDirs.isEmpty()) {
         m_iconDirs = systemIconSearchPaths();
         // Always add resource directory as search path
-        m_iconDirs.append(QLatin1String(":/icons"));
+        m_iconDirs.append(":/icons"_L1);
     }
     return m_iconDirs;
 }
@@ -248,7 +250,7 @@ private:
 QIconCacheGtkReader::QIconCacheGtkReader(const QString &dirName)
     : m_isValid(false)
 {
-    QFileInfo info(dirName + QLatin1String("/icon-theme.cache"));
+    QFileInfo info(dirName + "/icon-theme.cache"_L1);
     if (!info.exists() || info.lastModified() < QFileInfo(dirName).lastModified())
         return;
     m_file.setFileName(info.absoluteFilePath());
@@ -357,7 +359,7 @@ QIconTheme::QIconTheme(const QString &themeName)
         }
 
         if (!m_valid) {
-            themeIndex.setFileName(themeDir + QLatin1String("/index.theme"));
+            themeIndex.setFileName(themeDir + "/index.theme"_L1);
             if (themeIndex.exists())
                 m_valid = true;
         }
@@ -367,47 +369,38 @@ QIconTheme::QIconTheme(const QString &themeName)
         const QSettings indexReader(themeIndex.fileName(), QSettings::IniFormat);
         const QStringList keys = indexReader.allKeys();
         for (const QString &key : keys) {
-            if (key.endsWith(QLatin1String("/Size"))) {
+            if (key.endsWith("/Size"_L1)) {
                 // Note the QSettings ini-format does not accept
                 // slashes in key names, hence we have to cheat
                 if (int size = indexReader.value(key).toInt()) {
                     QString directoryKey = key.left(key.size() - 5);
                     QIconDirInfo dirInfo(directoryKey);
                     dirInfo.size = size;
-                    QString type = indexReader.value(directoryKey +
-                                                     QLatin1String("/Type")
-                                                     ).toString();
+                    QString type = indexReader.value(directoryKey + "/Type"_L1).toString();
 
-                    if (type == QLatin1String("Fixed"))
+                    if (type == "Fixed"_L1)
                         dirInfo.type = QIconDirInfo::Fixed;
-                    else if (type == QLatin1String("Scalable"))
+                    else if (type == "Scalable"_L1)
                         dirInfo.type = QIconDirInfo::Scalable;
                     else
                         dirInfo.type = QIconDirInfo::Threshold;
 
                     dirInfo.threshold = indexReader.value(directoryKey +
-                                                        QLatin1String("/Threshold"),
-                                                        2).toInt();
+                                                          "/Threshold"_L1,
+                                                          2).toInt();
 
-                    dirInfo.minSize = indexReader.value(directoryKey +
-                                                         QLatin1String("/MinSize"),
-                                                         size).toInt();
+                    dirInfo.minSize = indexReader.value(directoryKey + "/MinSize"_L1, size).toInt();
 
-                    dirInfo.maxSize = indexReader.value(directoryKey +
-                                                        QLatin1String("/MaxSize"),
-                                                        size).toInt();
+                    dirInfo.maxSize = indexReader.value(directoryKey + "/MaxSize"_L1, size).toInt();
 
-                    dirInfo.scale = indexReader.value(directoryKey +
-                                                      QLatin1String("/Scale"),
-                                                      1).toInt();
+                    dirInfo.scale = indexReader.value(directoryKey + "/Scale"_L1, 1).toInt();
                     m_keyList.append(dirInfo);
                 }
             }
         }
 
         // Parent themes provide fallbacks for missing icons
-        m_parents = indexReader.value(
-                QLatin1String("Icon Theme/Inherits")).toStringList();
+        m_parents = indexReader.value("Icon Theme/Inherits"_L1).toStringList();
         m_parents.removeAll(QString());
 
         // Ensure a default platform fallback for all themes
@@ -418,8 +411,8 @@ QIconTheme::QIconTheme(const QString &themeName)
         }
 
         // Ensure that all themes fall back to hicolor
-        if (!m_parents.contains(QLatin1String("hicolor")))
-            m_parents.append(QLatin1String("hicolor"));
+        if (!m_parents.contains("hicolor"_L1))
+            m_parents.append("hicolor"_L1);
     }
 #endif // settings
 }
@@ -447,8 +440,8 @@ QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName,
 
     // Iterate through all icon's fallbacks in current theme
     while (info.entries.empty()) {
-        const QString svgIconName = iconNameFallback + QLatin1String(".svg");
-        const QString pngIconName = iconNameFallback + QLatin1String(".png");
+        const QString svgIconName = iconNameFallback + ".svg"_L1;
+        const QString pngIconName = iconNameFallback + ".png"_L1;
 
         // Add all relevant files
         for (int i = 0; i < contentDirs.size(); ++i) {
@@ -533,9 +526,9 @@ QThemeIconInfo QIconLoader::lookupFallbackIcon(const QString &iconName) const
 {
     QThemeIconInfo info;
 
-    const QString pngIconName = iconName + QLatin1String(".png");
-    const QString xpmIconName = iconName + QLatin1String(".xpm");
-    const QString svgIconName = iconName + QLatin1String(".svg");
+    const QString pngIconName = iconName + ".png"_L1;
+    const QString xpmIconName = iconName + ".xpm"_L1;
+    const QString svgIconName = iconName + ".svg"_L1;
 
     const auto searchPaths = QIcon::fallbackSearchPaths();
     for (const QString &iconDir: searchPaths) {
@@ -766,7 +759,7 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
-    QString key = QLatin1String("$qt_theme_")
+    QString key = "$qt_theme_"_L1
                   % HexString<qint64>(basePixmap.cacheKey())
                   % HexString<int>(mode)
                   % HexString<qint64>(QGuiApplication::palette().cacheKey())
@@ -815,7 +808,7 @@ QPixmap QIconLoaderEngine::pixmap(const QSize &size, QIcon::Mode mode,
 
 QString QIconLoaderEngine::key() const
 {
-    return QLatin1String("QIconLoaderEngine");
+    return "QIconLoaderEngine"_L1;
 }
 
 QString QIconLoaderEngine::iconName()
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 887480b873..7fd0dc424f 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -81,6 +81,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 // MSVC 19.28 does show spurious warning "C4723: potential divide by 0" for code that divides
 // by height() in release builds. Anyhow, all the code paths in this file are only executed
 // for valid QImage's, where height() cannot be 0. Therefore disable the warning.
@@ -4182,7 +4184,7 @@ QString QImage::text(const QString &key) const
 
     QString tmp;
     for (auto it = d->text.begin(), end = d->text.end(); it != end; ++it)
-        tmp += it.key() + QLatin1String(": ") + it.value().simplified() + QLatin1String("\n\n");
+        tmp += it.key() + ": "_L1 + it.value().simplified() + "\n\n"_L1;
     if (!tmp.isEmpty())
         tmp.chop(2); // remove final \n\n
     return tmp;
@@ -5707,7 +5709,7 @@ QMap<QString, QString> qt_getImageTextFromDescription(const QString &description
         int index = pair.indexOf(u':');
         if (index >= 0 && pair.indexOf(u' ') < index) {
             if (!pair.trimmed().isEmpty())
-                text.insert(QLatin1String("Description"), pair.toString().simplified());
+                text.insert("Description"_L1, pair.toString().simplified());
         } else {
             const auto key = pair.left(index);
             if (!key.trimmed().isEmpty())
diff --git a/src/gui/image/qimagereaderwriterhelpers.cpp b/src/gui/image/qimagereaderwriterhelpers.cpp
index dd4886b412..ef47fe15d0 100644
--- a/src/gui/image/qimagereaderwriterhelpers.cpp
+++ b/src/gui/image/qimagereaderwriterhelpers.cpp
@@ -45,12 +45,14 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace QImageReaderWriterHelpers {
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
-                          (QImageIOHandlerFactoryInterface_iid, QLatin1String("/imageformats")))
+                          (QImageIOHandlerFactoryInterface_iid, "/imageformats"_L1))
 Q_GLOBAL_STATIC(QMutex, loaderMutex)
 
 static void appendImagePluginFormats(QFactoryLoader *loader,
@@ -85,8 +87,8 @@ static void appendImagePluginMimeTypes(QFactoryLoader *loader,
     const int pluginCount = metaDataList.size();
     for (int i = 0; i < pluginCount; ++i) {
         const QCborMap metaData = metaDataList.at(i).value(QtPluginMetaDataKeys::MetaData).toMap();
-        const QCborArray keys = metaData.value(QLatin1String("Keys")).toArray();
-        const QCborArray mimeTypes = metaData.value(QLatin1String("MimeTypes")).toArray();
+        const QCborArray keys = metaData.value("Keys"_L1).toArray();
+        const QCborArray mimeTypes = metaData.value("MimeTypes"_L1).toArray();
         QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(loader->instance(i));
         const int keyCount = keys.size();
         for (int k = 0; k < keyCount; ++k) {
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 668d366208..49a0b9669a 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -133,6 +133,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static QImageIOHandler *createWriteHandlerHelper(QIODevice *device,
     const QByteArray &format)
 {
@@ -646,8 +648,8 @@ QImageIOHandler::Transformations QImageWriter::transformation() const
 void QImageWriter::setText(const QString &key, const QString &text)
 {
     if (!d->description.isEmpty())
-        d->description += QLatin1String("\n\n");
-    d->description += key.simplified() + QLatin1String(": ") + text.simplified();
+        d->description += "\n\n"_L1;
+    d->description += key.simplified() + ": "_L1 + text.simplified();
 }
 
 /*!
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 89fd62305b..678deb7315 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -72,6 +72,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 // MSVC 19.28 does show spurious warning "C4723: potential divide by 0" for code that divides
 // by height() in release builds. Anyhow, all the code paths in this file are only executed
 // for valid QPixmap's, where height() cannot be 0. Therefore disable the warning.
@@ -744,7 +746,7 @@ bool QPixmap::load(const QString &fileName, const char *format, Qt::ImageConvers
         if (info.completeSuffix().isEmpty() || info.exists()) {
             const bool inGuiThread = qApp->thread() == QThread::currentThread();
 
-            QString key = QLatin1String("qt_pixmap")
+            QString key = "qt_pixmap"_L1
                     % info.absoluteFilePath()
                     % HexString<uint>(info.lastModified().toSecsSinceEpoch())
                     % HexString<quint64>(info.size())
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index e5c2b044a8..647a395d89 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -81,6 +81,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_DECLARE_LOGGING_CATEGORY(lcImageIo)
 
 // avoid going through QImage::scanLine() which calls detach
@@ -525,8 +527,8 @@ void QPngHandlerPrivate::readPngTexts(png_info *info)
             value = QString::fromLatin1(text_ptr->text, int(text_ptr->text_length));
         }
         if (!description.isEmpty())
-            description += QLatin1String("\n\n");
-        description += key + QLatin1String(": ") + value.simplified();
+            description += "\n\n"_L1;
+        description += key + ": "_L1 + value.simplified();
         readTexts.append(key);
         readTexts.append(value);
         text_ptr++;