uic: 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: I0d3c232a9fa95aea854445922f100b89c6d6f5a1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

3 files changed, 12 insertions, 12 deletions

diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp
index 995b99b692..9bdfc8ca5c 100644
--- a/src/tools/uic/cpp/cppwritedeclaration.cpp
+++ b/src/tools/uic/cpp/cppwritedeclaration.cpp
@@ -75,7 +75,7 @@ void WriteDeclaration::acceptUI(DomUI *node)
 
     QString exportMacro = node->elementExportMacro();
     if (!exportMacro.isEmpty())
-        exportMacro.append(QLatin1Char(' '));
+        exportMacro.append(u' ');
 
     QStringList namespaceList = qualifiedClassName.split(QLatin1String("::"));
     if (namespaceList.count()) {
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 809c78f700..9ead840c4d 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -47,7 +47,7 @@ enum { warnHeaderGeneration = 0 };
 static inline QString moduleHeader(const QString &module, const QString &header)
 {
     QString rc = module;
-    rc += QLatin1Char('/');
+    rc += u'/';
     rc += header;
     return rc;
 }
@@ -190,8 +190,8 @@ void WriteIncludes::insertInclude(const QString &header, bool global)
 
 void WriteIncludes::writeHeaders(const OrderedSet &headers, bool global)
 {
-    const QChar openingQuote = global ? QLatin1Char('<') : QLatin1Char('"');
-    const QChar closingQuote = global ? QLatin1Char('>') : QLatin1Char('"');
+    const QChar openingQuote = global ? u'<' : u'"';
+    const QChar closingQuote = global ? u'>' : u'"';
 
     // Check for the old headers 'qslider.h' and replace by 'QtGui/QSlider'
     for (const QString &header : headers) {
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 33aa48d308..89acd4b4c5 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -983,7 +983,7 @@ void WriteInitialization::acceptLayout(DomLayout *node)
     m_layoutChain.pop();
 
     // Stretch? (Unless we are compiling for UIC3)
-    const QString numberNull = QString(QLatin1Char('0'));
+    const QString numberNull(u'0');
     writePropertyList(varName, QLatin1String("setStretch"), node->attributeStretch(), numberNull);
     writePropertyList(varName, QLatin1String("setRowStretch"), node->attributeRowStretch(), numberNull);
     writePropertyList(varName, QLatin1String("setColumnStretch"), node->attributeColumnStretch(), numberNull);
@@ -999,7 +999,7 @@ void WriteInitialization::writePropertyList(const QString &varName,
 {
     if (value.isEmpty())
         return;
-    const QStringList list = value.split(QLatin1Char(','));
+    const QStringList list = value.split(u',');
     const int count =  list.count();
     for (int i = 0; i < count; i++) {
         if (list.at(i) != defaultValue) {
@@ -1375,7 +1375,7 @@ void WriteInitialization::writeProperties(const QString &varName,
             if (p->hasAttributeStdset() && !p->attributeStdset())
                 varNewName += language::derefPointer + QLatin1String("viewport()");
             propertyValue = QLatin1String("QCursor(Qt") + language::qualifier
-                + p->elementCursorShape() + QLatin1Char(')');
+                + p->elementCursorShape() + u')';
             break;
         case DomProperty::Enum:
             propertyValue = p->elementEnum();
@@ -1479,17 +1479,17 @@ void WriteInitialization::writeProperties(const QString &varName,
             break;
         case DomProperty::UInt:
             propertyValue = QString::number(p->elementUInt());
-            propertyValue += QLatin1Char('u');
+            propertyValue += u'u';
             break;
         case DomProperty::LongLong:
             propertyValue = QLatin1String("Q_INT64_C(");
             propertyValue += QString::number(p->elementLongLong());
-            propertyValue += QLatin1Char(')');;
+            propertyValue += u')';
             break;
         case DomProperty::ULongLong:
             propertyValue = QLatin1String("Q_UINT64_C(");
             propertyValue += QString::number(p->elementULongLong());
-            propertyValue += QLatin1Char(')');
+            propertyValue += u')';
             break;
         case DomProperty::Float:
             propertyValue = QString::number(p->elementFloat(), 'f', 8);
@@ -2227,10 +2227,10 @@ void WriteInitialization::addQtFlagsInitializer(Item *item,
         const DomPropertyMap &properties, const QString &name, int column) const
 {
     if (const DomProperty *p = properties.value(name)) {
-        const QString orOperator = QLatin1Char('|') + language::qtQualifier;
+        const QString orOperator = u'|' + language::qtQualifier;
         QString v = p->elementSet();
         if (!v.isEmpty()) {
-            v.replace(QLatin1Char('|'), orOperator);
+            v.replace(u'|', orOperator);
             addInitializer(item, name, column, language::qtQualifier + v);
         }
     }