Streamline some translatable messages

Move some repeated messages as helper functions into private classes.

Pick-to: 6.2
Change-Id: Ief16110731d0534427e67b42d2672f02f265bba4
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

12 files changed, 48 insertions, 13 deletions

diff --git a/src/multimedia/camera/qimagecapture.cpp b/src/multimedia/camera/qimagecapture.cpp
index 7b1a34920..9dc2b3725 100644
--- a/src/multimedia/camera/qimagecapture.cpp
+++ b/src/multimedia/camera/qimagecapture.cpp
@@ -290,7 +290,7 @@ int QImageCapture::captureToFile(const QString &file)
     d->unsetError();
 
     if (!d->control) {
-        d->_q_error(-1, NotSupportedFeatureError, tr("Camera is not ready."));
+        d->_q_error(-1, NotSupportedFeatureError, QPlatformImageCapture::msgCameraNotReady());
         return -1;
     }
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
index e15a04cc6..900131b70 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
@@ -51,6 +51,7 @@
 #include <qguiapplication.h>
 #include <qdebug.h>
 #include <qvideoframe.h>
+#include <private/qplatformimagecapture_p.h>
 #include <private/qmemoryvideobuffer_p.h>
 #include <private/qcameradevice_p.h>
 
@@ -508,7 +509,7 @@ int QAndroidCameraSession::capture(const QString &fileName)
 
     if (!isReadyForCapture()) {
         emit imageCaptureError(m_lastImageCaptureId, QImageCapture::NotReadyError,
-                               tr("Camera not ready"));
+                               QPlatformImageCapture::msgCameraNotReady());
         return m_lastImageCaptureId;
     }
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp
index 25b17bdcc..988b480b2 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp
@@ -46,6 +46,7 @@
 #include "qandroidvideooutput_p.h"
 #include "qandroidglobal_p.h"
 #include <private/qplatformaudioinput_p.h>
+#include <private/qmediarecorder_p.h>
 #include <QtCore/qmimetype.h>
 
 #include <algorithm>
@@ -222,7 +223,8 @@ void QAndroidCaptureSession::start(const QUrl &outputLocation)
     }
 
     if (!m_mediaRecorder->start()) {
-        emit error(QMediaRecorder::FormatError, QLatin1String("Unable to start the media recorder."));
+        emit error(QMediaRecorder::FormatError,
+                   QMediaRecorderPrivate::msgFailedStartRecording());
         if (m_cameraSession)
             restartViewfinder();
         return;
diff --git a/src/multimedia/platform/darwin/camera/avfimagecapture.mm b/src/multimedia/platform/darwin/camera/avfimagecapture.mm
index 5bfe8e105..53ed2e4a0 100644
--- a/src/multimedia/platform/darwin/camera/avfimagecapture.mm
+++ b/src/multimedia/platform/darwin/camera/avfimagecapture.mm
@@ -44,6 +44,7 @@
 #include "avfcamera_p.h"
 #include "avfcamerasession_p.h"
 #include "avfcamerarenderer_p.h"
+#include <private/qplatformimagecapture_p.h>
 #include <private/qmemoryvideobuffer_p.h>
 
 #include <QtCore/qurl.h>
@@ -95,14 +96,14 @@ int AVFImageCapture::doCapture(const QString &actualFileName)
         QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                                 Q_ARG(int, m_lastCaptureId),
                                 Q_ARG(int, QImageCapture::ResourceError),
-                                Q_ARG(QString, tr("Image capture not set to capture session")));
+                                Q_ARG(QString, QPlatformImageCapture::msgImageCaptureNotSet()));
         return m_lastCaptureId;
     }
     if (!isReadyForCapture()) {
         QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                                   Q_ARG(int, m_lastCaptureId),
                                   Q_ARG(int, QImageCapture::NotReadyError),
-                                  Q_ARG(QString, tr("Camera not ready")));
+                                  Q_ARG(QString, QPlatformImageCapture::msgCameraNotReady()));
         return m_lastCaptureId;
     }
     m_lastCaptureId++;
diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm
index ac182fe00..b45f48335 100644
--- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm
+++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm
@@ -48,6 +48,7 @@
 
 #include "qaudiodevice.h"
 #include "qmediadevices.h"
+#include "private/qmediarecorder_p.h"
 #include "private/qdarwinformatsinfo_p.h"
 
 #include <QtCore/qmath.h>
@@ -480,7 +481,8 @@ void AVFMediaEncoder::record()
         AVFCamera *cameraControl = m_service->avfCameraControl();
         if (!cameraControl || !cameraControl->isActive()) {
             qDebugCamera() << Q_FUNC_INFO << "can not start record while camera is not active";
-            Q_EMIT error(QMediaRecorder::ResourceError, tr("Failed to start recording"));
+            Q_EMIT error(QMediaRecorder::ResourceError,
+                         QMediaRecorderPrivate::msgFailedStartRecording());
             return;
         }
 
@@ -555,7 +557,8 @@ void AVFMediaEncoder::record()
         [m_writer start];
     } else {
         [session startRunning];
-        Q_EMIT error(QMediaRecorder::FormatError, tr("Failed to start recording"));
+        Q_EMIT error(QMediaRecorder::FormatError,
+                     QMediaRecorderPrivate::msgFailedStartRecording());
     }
 }
 
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
index f0f2f16e9..4570f1d69 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
@@ -39,6 +39,7 @@
 
 #include "qgstreamerimagecapture_p.h"
 #include "qplatformcamera_p.h"
+#include <private/qplatformimagecapture_p.h>
 #include <private/qgstvideobuffer_p.h>
 #include <private/qgstutils_p.h>
 #include <private/qgstreamermetadata_p.h>
@@ -157,7 +158,7 @@ int QGstreamerImageCapture::doCapture(const QString &fileName)
         QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
                                   Q_ARG(int, -1),
                                   Q_ARG(int, QImageCapture::ResourceError),
-                                  Q_ARG(QString,tr("Image capture not set to a session.")));
+                                  Q_ARG(QString, QPlatformImageCapture::msgImageCaptureNotSet()));
 
         qCDebug(qLcImageCapture) << "error 1";
         return -1;
@@ -179,7 +180,7 @@ int QGstreamerImageCapture::doCapture(const QString &fileName)
         QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
                                   Q_ARG(int, -1),
                                   Q_ARG(int, QImageCapture::NotReadyError),
-                                  Q_ARG(QString,tr("Camera is not ready.")));
+                                  Q_ARG(QString, QPlatformImageCapture::msgCameraNotReady()));
 
         qCDebug(qLcImageCapture) << "error 3";
         return -1;
diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
index 9ce740d20..21b6c8d7e 100644
--- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
@@ -47,6 +47,8 @@
 #include <QUrl>
 #include <QVideoFrameFormat>
 #include <qmath.h>
+#include <private/qmediarecorder_p.h>
+#include <private/qplatformimagecapture_p.h>
 
 #include <algorithm>
 
@@ -349,7 +351,8 @@ int BbCameraSession::capture(const QString &fileName)
     m_lastImageCaptureId++;
 
     if (!isReadyForCapture()) {
-        emit imageCaptureError(m_lastImageCaptureId, QImageCapture::NotReadyError, tr("Camera not ready"));
+        emit imageCaptureError(m_lastImageCaptureId, QImageCapture::NotReadyError,
+                               QPlatformImageCapture::msgCameraNotReady());
         return m_lastImageCaptureId;
     }
 
@@ -959,7 +962,8 @@ void BbCameraSession::startVideoRecording(const QUrl &outputLocation)
     const camera_error_t result = camera_start_video(m_handle, QFile::encodeName(videoOutputLocation), 0, videoRecordingStatusCallback, this);
     if (result != CAMERA_EOK) {
         m_videoStatus = QMediaRecorder::StoppedStatus;
-        emit videoError(QMediaRecorder::ResourceError, tr("Unable to start video recording"));
+        emit videoError(QMediaRecorder::ResourceError,
+                        QMediaRecorderPrivate::msgFailedStartRecording());
     } else {
         m_videoState = QMediaRecorder::RecordingState;
     }
diff --git a/src/multimedia/platform/qplatformimagecapture.cpp b/src/multimedia/platform/qplatformimagecapture.cpp
index 04c3ed337..f4296c51a 100644
--- a/src/multimedia/platform/qplatformimagecapture.cpp
+++ b/src/multimedia/platform/qplatformimagecapture.cpp
@@ -54,6 +54,16 @@ QT_BEGIN_NAMESPACE
 
 */
 
+QString QPlatformImageCapture::msgCameraNotReady()
+{
+    return QImageCapture::tr("Camera is not ready.");
+}
+
+QString QPlatformImageCapture::msgImageCaptureNotSet()
+{
+    return QImageCapture::tr("No instance of QImageCapture set on QMediaCaptureSession.");
+}
+
 /*!
     Constructs a new image capture control object with the given \a parent
 */
diff --git a/src/multimedia/platform/qplatformimagecapture_p.h b/src/multimedia/platform/qplatformimagecapture_p.h
index 441848ed0..01842987d 100644
--- a/src/multimedia/platform/qplatformimagecapture_p.h
+++ b/src/multimedia/platform/qplatformimagecapture_p.h
@@ -104,6 +104,9 @@ public:
 
     QImageCapture *imageCapture() { return m_imageCapture; }
 
+    static QString msgCameraNotReady();
+    static QString msgImageCaptureNotSet();
+
 Q_SIGNALS:
     void readyForCaptureChanged(bool ready);
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
index 5fbc77c82..d845d9299 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
@@ -46,6 +46,7 @@
 #include <QtCore/QMimeType>
 #include <Mferror.h>
 #include <shobjidl.h>
+#include <private/qmediarecorder_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -107,7 +108,8 @@ void QWindowsMediaEncoder::setState(QMediaRecorder::RecorderState state)
         m_mediaDeviceSession->setActive(true);
 
         if (!m_mediaDeviceSession->isActive() && !m_mediaDeviceSession->isActivating()) {
-            error(QMediaRecorder::ResourceError, tr("Failed to start recording"));
+            error(QMediaRecorder::ResourceError,
+                  QMediaRecorderPrivate::msgFailedStartRecording());
             return;
         }
 
@@ -143,7 +145,8 @@ void QWindowsMediaEncoder::setState(QMediaRecorder::RecorderState state)
                 statusChanged(m_lastStatus);
 
             } else {
-                error(QMediaRecorder::FormatError, tr("Failed to start recording"));
+                error(QMediaRecorder::FormatError,
+                      QMediaRecorderPrivate::msgFailedStartRecording());
             }
         }
     } break;
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 2091980ac..b7b3125bd 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -87,6 +87,11 @@ void QMediaRecorderPrivate::_q_applySettings()
     }
 }
 
+QString QMediaRecorderPrivate::msgFailedStartRecording()
+{
+    return QMediaRecorder::tr("Failed to start recording");
+}
+
 /*!
     Constructs a media encoder which records the media produced by a microphone and camera.
 */
diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h
index c434b803b..6b25e38f3 100644
--- a/src/multimedia/recording/qmediarecorder_p.h
+++ b/src/multimedia/recording/qmediarecorder_p.h
@@ -74,6 +74,8 @@ public:
 
     void applySettingsLater();
 
+    static QString msgFailedStartRecording();
+
     QMediaCaptureSession *captureSession = nullptr;
     QPlatformMediaEncoder *control = nullptr;