QtGui: stop using QLatin1Char constructor for creating char literals

Required for porting away from QLatin1Char/QLatin1String in scope of
QTBUG-98434.

Change-Id: I308d86cefcbfd126929b68f9a853d420840c965f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

2 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp
index 4fb8d2dce3..35acf86671 100644
--- a/src/gui/text/windows/qwindowsfontdatabase.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabase.cpp
@@ -430,7 +430,7 @@ QString qt_getEnglishName(const QString &familyName, bool includeStyle)
         const QFontNames names = qt_getCanonicalFontNames(table, bytes);
         i18n_name = names.name;
         if (includeStyle)
-            i18n_name += QLatin1Char(' ') + names.style;
+            i18n_name += u' ' + names.style;
     }
 error:
     delete [] table;
@@ -509,7 +509,7 @@ static bool addFontToDatabase(QString familyName,
                               StoreFontPayload *sfp)
 {
     // the "@family" fonts are just the same as "family". Ignore them.
-    if (familyName.isEmpty() || familyName.at(0) == QLatin1Char('@') || familyName.startsWith(QLatin1String("WST_")))
+    if (familyName.isEmpty() || familyName.at(0) == u'@' || familyName.startsWith(QLatin1String("WST_")))
         return false;
 
     uchar charSet = logFont.lfCharSet;
@@ -782,10 +782,10 @@ QFontEngine *QWindowsFontDatabase::fontEngine(const QByteArray &fontData, qreal
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Wstrict-aliasing")
-        QString uniqueFamilyName = QLatin1Char('f')
-                + QString::number(guid.Data1, 36) + QLatin1Char('-')
-                + QString::number(guid.Data2, 36) + QLatin1Char('-')
-                + QString::number(guid.Data3, 36) + QLatin1Char('-')
+        QString uniqueFamilyName = u'f'
+                + QString::number(guid.Data1, 36) + u'-'
+                + QString::number(guid.Data2, 36) + u'-'
+                + QString::number(guid.Data3, 36) + u'-'
                 + QString::number(*reinterpret_cast<quint64 *>(guid.Data4), 36);
 QT_WARNING_POP
 
diff --git a/src/gui/text/windows/qwindowsfontdatabase_ft.cpp b/src/gui/text/windows/qwindowsfontdatabase_ft.cpp
index b149701de5..6258535ac7 100644
--- a/src/gui/text/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabase_ft.cpp
@@ -140,7 +140,7 @@ static FontKeys &fontKeys()
 #if QT_CONFIG(regularexpression)
                 realKey.remove(sizeListMatch);
 #endif
-                const auto fontNames = QStringView(realKey).trimmed().split(QLatin1Char('&'));
+                const auto fontNames = QStringView(realKey).trimmed().split(u'&');
                 fontKey.fontNames.reserve(fontNames.size());
                 for (const auto &fontName : fontNames)
                     fontKey.fontNames.append(fontName.trimmed().toString());
@@ -176,7 +176,7 @@ static bool addFontToDatabase(QString familyName,
                               int type)
 {
     // the "@family" fonts are just the same as "family". Ignore them.
-    if (familyName.isEmpty() || familyName.at(0) == QLatin1Char('@') || familyName.startsWith(QLatin1String("WST_")))
+    if (familyName.isEmpty() || familyName.at(0) == u'@' || familyName.startsWith(QLatin1String("WST_")))
         return false;
 
     uchar charSet = logFont.lfCharSet;