Android: stop using QLatin1Char constructor for creating char literals

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

As a drive-by, fix qsizetype -> int narrowing conversion warnings for
the touched lines.

Change-Id: Iebcbdbd7cecac09d0a7039e3ef6a4509d33039ba
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

8 files changed, 30 insertions, 30 deletions

diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp
index c5ead186c9..2be5614eaf 100644
--- a/src/plugins/platforms/android/androidcontentfileengine.cpp
+++ b/src/plugins/platforms/android/androidcontentfileengine.cpp
@@ -60,15 +60,15 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode,
     Q_UNUSED(permissions);
     QString openModeStr;
     if (openMode & QFileDevice::ReadOnly) {
-        openModeStr += QLatin1Char('r');
+        openModeStr += u'r';
     }
     if (openMode & QFileDevice::WriteOnly) {
-        openModeStr += QLatin1Char('w');
+        openModeStr += u'w';
     }
     if (openMode & QFileDevice::Truncate) {
-        openModeStr += QLatin1Char('t');
+        openModeStr += u't';
     } else if (openMode & QFileDevice::Append) {
-        openModeStr += QLatin1Char('a');
+        openModeStr += u'a';
     }
 
     m_pfd = QJniObject::callStaticObjectMethod("org/qtproject/qt/android/QtNative",
@@ -152,7 +152,7 @@ QString AndroidContentFileEngine::fileName(FileName f) const
             return m_file;
         case BaseName:
         {
-            const int pos = m_file.lastIndexOf(QChar(QLatin1Char('/')));
+            const qsizetype pos = m_file.lastIndexOf(u'/');
             return m_file.mid(pos);
         }
         default:
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index aa24c7d775..ff27f77090 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -328,7 +328,7 @@ namespace QtAndroid
         QString manufacturer = QJniObject::getStaticObjectField("android/os/Build", "MANUFACTURER", "Ljava/lang/String;").toString();
         QString model = QJniObject::getStaticObjectField("android/os/Build", "MODEL", "Ljava/lang/String;").toString();
 
-        return manufacturer + QLatin1Char(' ') + model;
+        return manufacturer + u' ' + model;
     }
 
     jint generateViewId()
diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp
index 9b49140335..cfca712e44 100644
--- a/src/plugins/platforms/android/androidjnimenu.cpp
+++ b/src/plugins/platforms/android/androidjnimenu.cpp
@@ -181,12 +181,12 @@ namespace QtAndroidMenu
 
     static QString removeAmpersandEscapes(QString s)
     {
-        int i = 0;
+        qsizetype i = 0;
         while (i < s.size()) {
             ++i;
-            if (s.at(i-1) != QLatin1Char('&'))
+            if (s.at(i - 1) != u'&')
                 continue;
-            if (i < s.size() && s.at(i) == QLatin1Char('&'))
+            if (i < s.size() && s.at(i) == u'&')
                 ++i;
             s.remove(i-1,1);
         }
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
index 0c6fb92ffb..21feb91339 100644
--- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
+++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
@@ -57,16 +57,16 @@ static inline QString cleanedAssetPath(QString file)
     if (file.startsWith(assetsPrefix))
         file.remove(0, prefixSize);
     file.replace(QLatin1String("//"), QLatin1String("/"));
-    if (file.startsWith(QLatin1Char('/')))
+    if (file.startsWith(u'/'))
         file.remove(0, 1);
-    if (file.endsWith(QLatin1Char('/')))
+    if (file.endsWith(u'/'))
         file.chop(1);
     return file;
 }
 
 static inline QString prefixedPath(QString path)
 {
-    path = assetsPrefix + QLatin1Char('/') + path;
+    path = assetsPrefix + u'/' + path;
     path.replace(QLatin1String("//"), QLatin1String("/"));
     return path;
 }
@@ -81,7 +81,7 @@ struct AssetItem {
     AssetItem (const QString &rawName)
         : name(rawName)
     {
-        if (name.endsWith(QLatin1Char('/'))) {
+        if (name.endsWith(u'/')) {
             type = Type::Folder;
             name.chop(1);
         }
@@ -114,7 +114,7 @@ public:
     {
         if (filePath.isEmpty())
             return AssetItem::Type::Folder;
-        const QStringList paths = filePath.split(QLatin1Char('/'));
+        const QStringList paths = filePath.split(u'/');
         QString fullPath;
         AssetItem::Type res = AssetItem::Type::Invalid;
         for (const auto &path: paths) {
@@ -125,7 +125,7 @@ public:
             if (it == folder->end() || it->name != path)
                 return AssetItem::Type::Invalid;
             if (!fullPath.isEmpty())
-                fullPath.append(QLatin1Char('/'));
+                fullPath.append(u'/');
             fullPath += path;
             res = it->type;
         }
@@ -156,7 +156,7 @@ public:
                 }), item);
             }
         }
-        m_path = assetsPrefix + QLatin1Char('/') + m_path + QLatin1Char('/');
+        m_path = assetsPrefix + u'/' + m_path + u'/';
         m_path.replace(QLatin1String("//"), QLatin1String("/"));
     }
 
@@ -329,21 +329,21 @@ public:
 
     QString fileName(FileName file = DefaultName) const override
     {
-        int pos;
+        qsizetype pos;
         switch (file) {
         case DefaultName:
         case AbsoluteName:
         case CanonicalName:
                 return prefixedPath(m_fileName);
         case BaseName:
-            if ((pos = m_fileName.lastIndexOf(QChar(QLatin1Char('/')))) != -1)
+            if ((pos = m_fileName.lastIndexOf(u'/')) != -1)
                 return prefixedPath(m_fileName.mid(pos));
             else
                 return prefixedPath(m_fileName);
         case PathName:
         case AbsolutePathName:
         case CanonicalPathName:
-            if ((pos = m_fileName.lastIndexOf(QChar(QLatin1Char('/')))) != -1)
+            if ((pos = m_fileName.lastIndexOf(u'/')) != -1)
                 return prefixedPath(m_fileName.left(pos));
             else
                 return prefixedPath(m_fileName);
@@ -401,9 +401,9 @@ QAbstractFileEngine * AndroidAssetsFileEngineHandler::create(const QString &file
 
     QString path = fileName.mid(prefixSize);
     path.replace(QLatin1String("//"), QLatin1String("/"));
-    if (path.startsWith(QLatin1Char('/')))
+    if (path.startsWith(u'/'))
         path.remove(0, 1);
-    if (path.endsWith(QLatin1Char('/')))
+    if (path.endsWith(u'/'))
         path.chop(1);
     return new AndroidAbstractFileEngine(m_assetManager, path);
 }
diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index a6418e94d3..0cce19534b 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/qandroidinputcontext.cpp
@@ -1147,7 +1147,7 @@ void QAndroidInputContext::focusObjectStartComposing()
         return;
 
     // Composing strings containing newline characters are rare and may cause problems
-    if (m_composingText.contains(QLatin1Char('\n')))
+    if (m_composingText.contains(u'\n'))
         return;
 
     QSharedPointer<QInputMethodQueryEvent> query = focusObjectInputMethodQuery();
@@ -1230,7 +1230,7 @@ jint QAndroidInputContext::getCursorCapsMode(jint /*reqModes*/)
         if (focusObjectIsComposing())
             surroundingText += QStringView{m_composingText}.left(m_composingCursor - m_composingTextStart);
         // Add a character to see if it is at the end of the sentence or not
-        QTextBoundaryFinder finder(QTextBoundaryFinder::Sentence, surroundingText + QLatin1Char('A'));
+        QTextBoundaryFinder finder(QTextBoundaryFinder::Sentence, surroundingText + u'A');
         finder.setPosition(surroundingText.length());
         if (finder.isAtBoundary())
             atWordBoundary = finder.isAtBoundary();
@@ -1450,7 +1450,7 @@ jboolean QAndroidInputContext::setComposingText(const QString &text, jint newCur
     const bool focusObjectWasComposing = focusObjectIsComposing();
 
     // Same checks as in focusObjectStartComposing()
-    if (!m_composingText.isEmpty() && !m_composingText.contains(QLatin1Char('\n'))
+    if (!m_composingText.isEmpty() && !m_composingText.contains(u'\n')
             && newAbsoluteCursorPos >= m_composingTextStart
             && newAbsoluteCursorPos <= m_composingTextStart + m_composingText.length())
         m_composingCursor = newAbsoluteCursorPos;
diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
index ddf58e095b..03f19c5f87 100644
--- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
+++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
@@ -73,8 +73,8 @@ static QString htmlText(QString text)
 {
     if (Qt::mightBeRichText(text))
         return text;
-    text.remove(QLatin1Char('\r'));
-    return text.toHtmlEscaped().replace(QLatin1Char('\n'), QLatin1String("<br />"));
+    text.remove(u'\r');
+    return text.toHtmlEscaped().replace(u'\n', QLatin1String("<br />"));
 }
 
 bool QAndroidPlatformMessageDialogHelper::show(Qt::WindowFlags windowFlags,
diff --git a/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp b/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp
index 925d1b34af..c603213793 100644
--- a/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp
+++ b/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp
@@ -82,11 +82,11 @@ QStringList QAndroidPlatformFontDatabase::fallbacksForFamily(const QString &fami
 {
     QStringList result;
     if (styleHint == QFont::Monospace || styleHint == QFont::Courier)
-        result.append(QString(qgetenv("QT_ANDROID_FONTS_MONOSPACE")).split(QLatin1Char(';')));
+        result.append(QString(qgetenv("QT_ANDROID_FONTS_MONOSPACE")).split(u';'));
     else if (styleHint == QFont::Serif)
-        result.append(QString(qgetenv("QT_ANDROID_FONTS_SERIF")).split(QLatin1Char(';')));
+        result.append(QString(qgetenv("QT_ANDROID_FONTS_SERIF")).split(u';'));
     else
-        result.append(QString(qgetenv("QT_ANDROID_FONTS")).split(QLatin1Char(';')));
+        result.append(QString(qgetenv("QT_ANDROID_FONTS")).split(u';'));
     result.append(QFreeTypeFontDatabase::fallbacksForFamily(family, style, styleHint, script));
 
     return result;
diff --git a/src/plugins/platforms/android/qandroidsystemlocale.cpp b/src/plugins/platforms/android/qandroidsystemlocale.cpp
index 74a549454d..2748b26945 100644
--- a/src/plugins/platforms/android/qandroidsystemlocale.cpp
+++ b/src/plugins/platforms/android/qandroidsystemlocale.cpp
@@ -72,7 +72,7 @@ void QAndroidSystemLocale::getLocaleFromJava() const
     QString languageCode = javaLocaleObject.callObjectMethod("getLanguage", "()Ljava/lang/String;").toString();
     QString countryCode = javaLocaleObject.callObjectMethod("getCountry", "()Ljava/lang/String;").toString();
 
-    m_locale = QLocale(languageCode + QLatin1Char('_') + countryCode);
+    m_locale = QLocale(languageCode + u'_' + countryCode);
 }
 
 QVariant QAndroidSystemLocale::query(QueryType type, QVariant in) const