strings: use QStringLiteral instead of fromUtf8

This avoids run-time unicode conversions.

Pick-to: 6.5 6.6 6.7
Change-Id: Ief6aa32288b300ee05232e7372b6f701562194fc
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>

8 files changed, 20 insertions, 20 deletions

diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 8f6b581c9..527b14c25 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -173,7 +173,7 @@ void QCameraPrivate::init(const QCameraDevice &device)
     control = maybeControl.value();
     cameraDevice = !device.isNull() ? device : QMediaDevices::defaultVideoInput();
     if (cameraDevice.isNull())
-        _q_error(QCamera::CameraError, QString::fromUtf8("No camera detected"));
+        _q_error(QCamera::CameraError, QStringLiteral("No camera detected"));
     control->setCamera(cameraDevice);
     q->connect(control, SIGNAL(activeChanged(bool)), q, SIGNAL(activeChanged(bool)));
     q->connect(control, SIGNAL(error(int,QString)), q, SLOT(_q_error(int,QString)));
diff --git a/src/multimedia/pulseaudio/qaudioengine_pulse.cpp b/src/multimedia/pulseaudio/qaudioengine_pulse.cpp
index 8c3871b21..4116a772a 100644
--- a/src/multimedia/pulseaudio/qaudioengine_pulse.cpp
+++ b/src/multimedia/pulseaudio/qaudioengine_pulse.cpp
@@ -63,7 +63,7 @@ static bool updateDevicesMap(QReadWriteLock &lock, QByteArray defaultDeviceId,
 static void serverInfoCallback(pa_context *context, const pa_server_info *info, void *userdata)
 {
     if (!info) {
-        qWarning() << QString::fromLatin1("Failed to get server information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context))));
+        qWarning() << QStringLiteral("Failed to get server information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context))));
         return;
     }
 
@@ -73,7 +73,7 @@ static void serverInfoCallback(pa_context *context, const pa_server_info *info,
         pa_sample_spec_snprint(ss, sizeof(ss), &info->sample_spec);
         pa_channel_map_snprint(cm, sizeof(cm), &info->channel_map);
 
-        qCDebug(qLcPulseAudioEngine) << QString::fromLatin1("User name: %1\n"
+        qCDebug(qLcPulseAudioEngine) << QStringLiteral("User name: %1\n"
                             "Host Name: %2\n"
                             "Server Name: %3\n"
                             "Server Version: %4\n"
@@ -128,7 +128,7 @@ static void sinkInfoCallback(pa_context *context, const pa_sink_info *info, int
     QPulseAudioEngine *pulseEngine = static_cast<QPulseAudioEngine*>(userdata);
 
     if (isLast < 0) {
-        qWarning() << QString::fromLatin1("Failed to get sink information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context))));
+        qWarning() << QStringLiteral("Failed to get sink information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context))));
         return;
     }
 
@@ -146,7 +146,7 @@ static void sinkInfoCallback(pa_context *context, const pa_sink_info *info, int
             { PA_SINK_UNLINKED, "UNLINKED" },
         };
 
-        qCDebug(qLcPulseAudioEngine) << QString::fromUtf8("Sink #%1\n"
+        qCDebug(qLcPulseAudioEngine) << QStringLiteral("Sink #%1\n"
                             "\tState: %2\n"
                             "\tName: %3\n"
                             "\tDescription: %4\n"
@@ -180,7 +180,7 @@ static void sourceInfoCallback(pa_context *context, const pa_source_info *info,
             { PA_SOURCE_SUSPENDED, "SUSPENDED" },
             { PA_SOURCE_UNLINKED, "UNLINKED" } };
 
-        qCDebug(qLcPulseAudioEngine) << QString::fromLatin1("Source #%1\n"
+        qCDebug(qLcPulseAudioEngine) << QStringLiteral("Source #%1\n"
                             "\tState: %2\n"
                             "\tName: %3\n"
                             "\tDescription: %4\n"
@@ -375,7 +375,7 @@ void QPulseAudioEngine::prepare()
 
             case PA_CONTEXT_FAILED:
             default:
-                qCritical() << QString::fromLatin1("PulseAudioService: Connection failure: %1")
+                qCritical() << QStringLiteral("PulseAudioService: Connection failure: %1")
                                 .arg(QString::fromUtf8(pa_strerror(pa_context_errno(m_context))));
                 keepGoing = false;
                 ok = false;
diff --git a/src/multimedia/pulseaudio/qpulseaudiosink.cpp b/src/multimedia/pulseaudio/qpulseaudiosink.cpp
index 53d45e0c3..6aedd10de 100644
--- a/src/multimedia/pulseaudio/qpulseaudiosink.cpp
+++ b/src/multimedia/pulseaudio/qpulseaudiosink.cpp
@@ -42,7 +42,7 @@ static void outputStreamStateCallback(pa_stream *stream, void *userdata)
 
     case PA_STREAM_FAILED:
     default:
-        qWarning() << QString::fromLatin1("Stream error: %1")
+        qWarning() << QStringLiteral("Stream error: %1")
                               .arg(QString::fromUtf8(pa_strerror(
                                       pa_context_errno(pa_stream_get_context(stream)))));
         QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance();
diff --git a/src/multimedia/pulseaudio/qpulseaudiosource.cpp b/src/multimedia/pulseaudio/qpulseaudiosource.cpp
index fe65ce712..659c1d08e 100644
--- a/src/multimedia/pulseaudio/qpulseaudiosource.cpp
+++ b/src/multimedia/pulseaudio/qpulseaudiosource.cpp
@@ -56,7 +56,7 @@ static void inputStreamStateCallback(pa_stream *stream, void *userdata)
     case PA_STREAM_FAILED:
     default:
         const char *errorString = pa_strerror(pa_context_errno(pa_stream_get_context(stream)));
-        qWarning() << QString::fromLatin1("Stream error: %1").arg(QString::fromUtf8(errorString));
+        qWarning() << QStringLiteral("Stream error: %1").arg(QString::fromUtf8(errorString));
         QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance();
         pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0);
         break;
@@ -371,7 +371,7 @@ qint64 QPulseAudioSource::read(char *data, qint64 len)
         if (pa_stream_peek(m_stream, &audioBuffer, &readLength) < 0) {
             const char *errorString =
                     pa_strerror(pa_context_errno(pa_stream_get_context(m_stream)));
-            qWarning() << QString::fromLatin1("pa_stream_peek() failed: %1")
+            qWarning() << QStringLiteral("pa_stream_peek() failed: %1")
                                   .arg(QString::fromUtf8(errorString));
             pulseEngine->unlock();
             return 0;
diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp
index 9c2b1cf9d..dc238721f 100644
--- a/src/multimedia/qmediametadata.cpp
+++ b/src/multimedia/qmediametadata.cpp
@@ -402,7 +402,7 @@ QString QMediaMetaData::stringValue(QMediaMetaData::Key key) const
         return QMediaFormat::videoCodecName(value.value<QMediaFormat::VideoCodec>());
     case Resolution: {
         QSize size = value.toSize();
-        return QString::fromUtf8("%1 x %2").arg(size.width()).arg(size.height());
+        return QStringLiteral("%1 x %2").arg(size.width()).arg(size.height());
     }
     case ThumbnailImage:
     case CoverArtImage:
diff --git a/src/multimedia/qmediastoragelocation.cpp b/src/multimedia/qmediastoragelocation.cpp
index 26dce3a4c..ccf71b5fa 100644
--- a/src/multimedia/qmediastoragelocation.cpp
+++ b/src/multimedia/qmediastoragelocation.cpp
@@ -34,13 +34,13 @@ QDir QMediaStorageLocation::defaultDirectory(QStandardPaths::StandardLocation ty
 static QString generateFileName(const QDir &dir, const QString &prefix, const QString &extension)
 {
     auto lastMediaIndex = 0;
-    const auto list = dir.entryList({ QString::fromLatin1("%1*.%2").arg(prefix, extension) });
+    const auto list = dir.entryList({ QStringLiteral("%1*.%2").arg(prefix, extension) });
     for (const QString &fileName : list) {
         auto mediaIndex = QStringView{fileName}.mid(prefix.size(), fileName.size() - prefix.size() - extension.size() - 1).toInt();
         lastMediaIndex = qMax(lastMediaIndex, mediaIndex);
     }
 
-    const QString name = QString::fromLatin1("%1%2.%3")
+    const QString name = QStringLiteral("%1%2.%3")
             .arg(prefix)
             .arg(lastMediaIndex + 1, 4, 10, QLatin1Char('0'))
             .arg(extension);
diff --git a/src/multimedia/recording/qcapturablewindow.cpp b/src/multimedia/recording/qcapturablewindow.cpp
index e242cad9e..34b6a1f5d 100644
--- a/src/multimedia/recording/qcapturablewindow.cpp
+++ b/src/multimedia/recording/qcapturablewindow.cpp
@@ -145,7 +145,7 @@ QCapturableWindow::QCapturableWindow(QCapturableWindowPrivate *capturablePrivate
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QCapturableWindow &window)
 {
-    dbg << QString::fromUtf8("Capturable window '%1'").arg(window.description());
+    dbg << QStringLiteral("Capturable window '%1'").arg(window.description());
     return dbg;
 }
 #endif
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 0126af750..7efb4db36 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -796,12 +796,12 @@ static QString qFormatTimeStamps(qint64 start, qint64 end)
 
     if (onlyOne) {
         if (start > 0)
-            return QString::fromLatin1("@%1:%2:%3.%4")
+            return QStringLiteral("@%1:%2:%3.%4")
                     .arg(start, 1, 10, QLatin1Char('0'))
                     .arg(s_minutes, 2, 10, QLatin1Char('0'))
                     .arg(s_seconds, 2, 10, QLatin1Char('0'))
                     .arg(s_millis, 2, 10, QLatin1Char('0'));
-        return QString::fromLatin1("@%1:%2.%3")
+        return QStringLiteral("@%1:%2.%3")
                 .arg(s_minutes, 2, 10, QLatin1Char('0'))
                 .arg(s_seconds, 2, 10, QLatin1Char('0'))
                 .arg(s_millis, 2, 10, QLatin1Char('0'));
@@ -810,12 +810,12 @@ static QString qFormatTimeStamps(qint64 start, qint64 end)
     if (end == -1) {
         // Similar to start-start, except it means keep displaying it?
         if (start > 0)
-            return QString::fromLatin1("%1:%2:%3.%4 - forever")
+            return QStringLiteral("%1:%2:%3.%4 - forever")
                     .arg(start, 1, 10, QLatin1Char('0'))
                     .arg(s_minutes, 2, 10, QLatin1Char('0'))
                     .arg(s_seconds, 2, 10, QLatin1Char('0'))
                     .arg(s_millis, 2, 10, QLatin1Char('0'));
-        return QString::fromLatin1("%1:%2.%3 - forever")
+        return QStringLiteral("%1:%2.%3 - forever")
                 .arg(s_minutes, 2, 10, QLatin1Char('0'))
                 .arg(s_seconds, 2, 10, QLatin1Char('0'))
                 .arg(s_millis, 2, 10, QLatin1Char('0'));
@@ -829,7 +829,7 @@ static QString qFormatTimeStamps(qint64 start, qint64 end)
     end /= 60;
 
     if (start > 0 || end > 0)
-        return QString::fromLatin1("%1:%2:%3.%4 - %5:%6:%7.%8")
+        return QStringLiteral("%1:%2:%3.%4 - %5:%6:%7.%8")
                 .arg(start, 1, 10, QLatin1Char('0'))
                 .arg(s_minutes, 2, 10, QLatin1Char('0'))
                 .arg(s_seconds, 2, 10, QLatin1Char('0'))
@@ -838,7 +838,7 @@ static QString qFormatTimeStamps(qint64 start, qint64 end)
                 .arg(e_minutes, 2, 10, QLatin1Char('0'))
                 .arg(e_seconds, 2, 10, QLatin1Char('0'))
                 .arg(e_millis, 2, 10, QLatin1Char('0'));
-    return QString::fromLatin1("%1:%2.%3 - %4:%5.%6")
+    return QStringLiteral("%1:%2.%3 - %4:%5.%6")
             .arg(s_minutes, 2, 10, QLatin1Char('0'))
             .arg(s_seconds, 2, 10, QLatin1Char('0'))
             .arg(s_millis, 2, 10, QLatin1Char('0'))