Use QStringLiteral more judiciously

Replace it with QL1S in QStringBuilder expressions
and in overloaded functions.

Replace patterns 'QString::number() + QStringLiteral'
and 'QStringLiteral + QString::number()' with
QString::asprintf.

Saves some text size.

Change-Id: Ib39b2332264dfc3df04e77f2c101b47a1030cef4
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

5 files changed, 19 insertions, 19 deletions

diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index fda3f51a48..1cc992dda6 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -509,28 +509,29 @@ QString QWindowsContext::registerWindowClass(const QWindow *w)
         break;
     }
     // Create a unique name for the flag combination
-    QString cname = QStringLiteral("Qt5QWindow");
+    QString cname;
+    cname += QLatin1String("Qt5QWindow");
     switch (type) {
     case Qt::Tool:
-        cname += QStringLiteral("Tool");
+        cname += QLatin1String("Tool");
         break;
     case Qt::ToolTip:
-        cname += QStringLiteral("ToolTip");
+        cname += QLatin1String("ToolTip");
         break;
     case Qt::Popup:
-        cname += QStringLiteral("Popup");
+        cname += QLatin1String("Popup");
         break;
     default:
         break;
     }
     if (style & CS_DROPSHADOW)
-        cname += QStringLiteral("DropShadow");
+        cname += QLatin1String("DropShadow");
     if (style & CS_SAVEBITS)
-        cname += QStringLiteral("SaveBits");
+        cname += QLatin1String("SaveBits");
     if (style & CS_OWNDC)
-        cname += QStringLiteral("OwnDC");
+        cname += QLatin1String("OwnDC");
     if (icon)
-        cname += QStringLiteral("Icon");
+        cname += QLatin1String("Icon");
 
     return registerWindowClass(cname, qWindowsWndProc, style, GetSysColorBrush(COLOR_WINDOW), icon);
 }
@@ -828,8 +829,8 @@ static inline QString errorMessageFromComError(const _com_error &comError)
          return result;
      }
      if (const WORD wCode = comError.WCode())
-         return QStringLiteral("IDispatch error #") + QString::number(wCode);
-     return QStringLiteral("Unknown error 0x0") + QString::number(comError.Error(), 16);
+         return QString::asprintf("IDispatch error #%u", uint(wCode));
+     return QString::asprintf("Unknown error 0x0%x", uint(comError.Error()));
 }
 #endif // !Q_OS_WINCE
 
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index cb112446fc..b86972996c 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -698,7 +698,7 @@ QVariant QWindowsMimeText::convertToMime(const QString &mime, LPDATAOBJECT pData
         QByteArray data = getData(CF_UNICODETEXT, pDataObj);
         if (!data.isEmpty()) {
             str = QString::fromWCharArray(reinterpret_cast<const wchar_t *>(data.constData()));
-            str.replace(QStringLiteral("\r\n"), QStringLiteral("\n"));
+            str.replace(QLatin1String("\r\n"), QLatin1String("\n"));
         } else {
             data = getData(CF_TEXT, pDataObj);
             if (!data.isEmpty()) {
diff --git a/src/plugins/platforms/windows/qwindowsservices.cpp b/src/plugins/platforms/windows/qwindowsservices.cpp
index 3c99e3507e..1fee56aeca 100644
--- a/src/plugins/platforms/windows/qwindowsservices.cpp
+++ b/src/plugins/platforms/windows/qwindowsservices.cpp
@@ -94,9 +94,8 @@ static inline QString mailCommand()
             keyName = QString::fromWCharArray(command);
         RegCloseKey(handle);
     }
-    if (keyName.isEmpty())
-        keyName = QStringLiteral("mailto");
-    keyName += QStringLiteral("\\Shell\\Open\\Command");
+    const QLatin1String mailto = keyName.isEmpty() ? QLatin1String("mailto") : QLatin1String();
+    keyName += mailto + QLatin1String("\\Shell\\Open\\Command");
     if (debug)
         qDebug() << __FUNCTION__ << "keyName=" << keyName;
     command[0] = 0;
@@ -134,7 +133,7 @@ static inline bool launchMail(const QUrl &url)
     }
     // Pass the url as the parameter. Should use QProcess::startDetached(),
     // but that cannot handle a Windows command line [yet].
-    command.replace(QStringLiteral("%1"), url.toString(QUrl::FullyEncoded));
+    command.replace(QLatin1String("%1"), url.toString(QUrl::FullyEncoded));
     if (debug)
         qDebug() << __FUNCTION__ << "Launching" << command;
     //start the process
diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp
index 3689978b41..dbc0b0a77a 100644
--- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp
+++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp
@@ -246,11 +246,11 @@ QString QWindowsTabletSupport::description() const
         .arg(implementationVersion >> 8).arg(implementationVersion & 0xFF)
         .arg(opts, 0, 16);
     if (opts & CXO_MESSAGES)
-        result += QStringLiteral(" CXO_MESSAGES");
+        result += QLatin1String(" CXO_MESSAGES");
     if (opts & CXO_CSRMESSAGES)
-        result += QStringLiteral(" CXO_CSRMESSAGES");
+        result += QLatin1String(" CXO_CSRMESSAGES");
     if (m_tiltSupport)
-        result += QStringLiteral(" tilt");
+        result += QLatin1String(" tilt");
     return result;
 }
 
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
index 4bf424f5f6..3947f823d6 100644
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
@@ -346,7 +346,7 @@ QWindowsTheme::~QWindowsTheme()
 
 static inline QStringList iconThemeSearchPaths()
 {
-    const QFileInfo appDir(QCoreApplication::applicationDirPath() + QStringLiteral("/icons"));
+    const QFileInfo appDir(QCoreApplication::applicationDirPath() + QLatin1String("/icons"));
     return appDir.isDir() ? QStringList(appDir.absoluteFilePath()) : QStringList();
 }