Rename QMediaEncoder to QMediaRecorder

As per API review, this is the better name. Since we removed
the old QMediaRecorder class, the name is free as well.

Change-Id: I1ec9af3876af8b6957e20c13f9e225bf1e5032d5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

8 files changed, 52 insertions, 52 deletions

diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 9286cf987..4983fa97c 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -53,10 +53,10 @@
 
 #include "ui_audiorecorder.h"
 
-#include <QMediaEncoder>
+#include <QMediaRecorder>
 #include <QDir>
 #include <QFileDialog>
-#include <QMediaEncoder>
+#include <QMediaRecorder>
 #include <QStandardPaths>
 #include <qmediadevices.h>
 #include <qaudiodevice.h>
@@ -71,7 +71,7 @@ AudioRecorder::AudioRecorder()
 {
     ui->setupUi(this);
 
-    m_audioEncoder = new QMediaEncoder(this);
+    m_audioEncoder = new QMediaRecorder(this);
     m_captureSession.setEncoder(m_audioEncoder);
     m_captureSession.setAudioInput(new QAudioInput(this));
     // ### replace with a monitoring output once we have it.
@@ -123,61 +123,61 @@ AudioRecorder::AudioRecorder()
     ui->bitrateBox->addItem(QStringLiteral("96000"), QVariant(96000));
     ui->bitrateBox->addItem(QStringLiteral("128000"), QVariant(128000));
 
-    connect(m_audioEncoder, &QMediaEncoder::durationChanged, this, &AudioRecorder::updateProgress);
-    connect(m_audioEncoder, &QMediaEncoder::statusChanged, this, &AudioRecorder::updateStatus);
-    connect(m_audioEncoder, &QMediaEncoder::recorderStateChanged, this, &AudioRecorder::onStateChanged);
-    connect(m_audioEncoder, &QMediaEncoder::errorChanged, this, &AudioRecorder::displayErrorMessage);
+    connect(m_audioEncoder, &QMediaRecorder::durationChanged, this, &AudioRecorder::updateProgress);
+    connect(m_audioEncoder, &QMediaRecorder::statusChanged, this, &AudioRecorder::updateStatus);
+    connect(m_audioEncoder, &QMediaRecorder::recorderStateChanged, this, &AudioRecorder::onStateChanged);
+    connect(m_audioEncoder, &QMediaRecorder::errorChanged, this, &AudioRecorder::displayErrorMessage);
 }
 
 void AudioRecorder::updateProgress(qint64 duration)
 {
-    if (m_audioEncoder->error() != QMediaEncoder::NoError || duration < 2000)
+    if (m_audioEncoder->error() != QMediaRecorder::NoError || duration < 2000)
         return;
 
     ui->statusbar->showMessage(tr("Recorded %1 sec").arg(duration / 1000));
 }
 
-void AudioRecorder::updateStatus(QMediaEncoder::Status status)
+void AudioRecorder::updateStatus(QMediaRecorder::Status status)
 {
     QString statusMessage;
 
     switch (status) {
-    case QMediaEncoder::RecordingStatus:
+    case QMediaRecorder::RecordingStatus:
         statusMessage = tr("Recording to %1").arg(m_audioEncoder->actualLocation().toString());
         break;
-    case QMediaEncoder::PausedStatus:
+    case QMediaRecorder::PausedStatus:
         clearAudioLevels();
         statusMessage = tr("Paused");
         break;
-    case QMediaEncoder::StoppedStatus:
+    case QMediaRecorder::StoppedStatus:
         clearAudioLevels();
         statusMessage = tr("Stopped");
     default:
         break;
     }
 
-    if (m_audioEncoder->error() == QMediaEncoder::NoError)
+    if (m_audioEncoder->error() == QMediaRecorder::NoError)
         ui->statusbar->showMessage(statusMessage);
 }
 
-void AudioRecorder::onStateChanged(QMediaEncoder::RecorderState state)
+void AudioRecorder::onStateChanged(QMediaRecorder::RecorderState state)
 {
     switch (state) {
-    case QMediaEncoder::RecordingState:
+    case QMediaRecorder::RecordingState:
         ui->recordButton->setText(tr("Stop"));
         ui->pauseButton->setText(tr("Pause"));
         break;
-    case QMediaEncoder::PausedState:
+    case QMediaRecorder::PausedState:
         ui->recordButton->setText(tr("Stop"));
         ui->pauseButton->setText(tr("Resume"));
         break;
-    case QMediaEncoder::StoppedState:
+    case QMediaRecorder::StoppedState:
         ui->recordButton->setText(tr("Record"));
         ui->pauseButton->setText(tr("Pause"));
         break;
     }
 
-    ui->pauseButton->setEnabled(m_audioEncoder->recorderState() != QMediaEncoder::StoppedState);
+    ui->pauseButton->setEnabled(m_audioEncoder->recorderState() != QMediaRecorder::StoppedState);
 }
 
 static QVariant boxValue(const QComboBox *box)
@@ -191,7 +191,7 @@ static QVariant boxValue(const QComboBox *box)
 
 void AudioRecorder::toggleRecord()
 {
-    if (m_audioEncoder->recorderState() == QMediaEncoder::StoppedState) {
+    if (m_audioEncoder->recorderState() == QMediaRecorder::StoppedState) {
         m_captureSession.audioInput()->setDevice(boxValue(ui->audioDeviceBox).value<QAudioDevice>());
 
         QMediaEncoderSettings settings;
@@ -215,7 +215,7 @@ void AudioRecorder::toggleRecord()
 
 void AudioRecorder::togglePause()
 {
-    if (m_audioEncoder->recorderState() != QMediaEncoder::PausedState)
+    if (m_audioEncoder->recorderState() != QMediaRecorder::PausedState)
         m_audioEncoder->pause();
     else
         m_audioEncoder->record();
diff --git a/examples/multimedia/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h
index 61cbd17f5..55dd37a8d 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.h
+++ b/examples/multimedia/audiorecorder/audiorecorder.h
@@ -52,7 +52,7 @@
 #define AUDIORECORDER_H
 
 #include <QMainWindow>
-#include <QMediaEncoder>
+#include <QMediaRecorder>
 #include <QMediaCaptureSession>
 #include <QUrl>
 
@@ -78,8 +78,8 @@ private slots:
     void togglePause();
     void toggleRecord();
 
-    void updateStatus(QMediaEncoder::Status);
-    void onStateChanged(QMediaEncoder::RecorderState);
+    void updateStatus(QMediaRecorder::Status);
+    void onStateChanged(QMediaRecorder::RecorderState);
     void updateProgress(qint64 pos);
     void displayErrorMessage();
 
@@ -89,7 +89,7 @@ private:
     Ui::AudioRecorder *ui = nullptr;
 
     QMediaCaptureSession m_captureSession;
-    QMediaEncoder *m_audioEncoder = nullptr;
+    QMediaRecorder *m_audioEncoder = nullptr;
     QList<AudioLevel*> m_audioLevels;
     bool m_outputLocationSet = false;
 
diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
index 2ec189c42..d5d49e723 100644
--- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
+++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
@@ -64,11 +64,11 @@
     \endcode
 
     And setup the lists as described above. The text on the record and pause
-    buttons are toggled depending on the \l{QMediaEncoder::RecorderState}{state} of
+    buttons are toggled depending on the \l{QMediaRecorder::RecorderState}{state} of
     the \c audioRecorder object. This means that if the state is
-    \l{QMediaEncoder::StoppedState} then the button text will be "Record" and
-    "Pause". In \l{QMediaEncoder::RecordingState} the record button will have
-    the text "Stop", and in \l{QMediaEncoder::PausedState} the pause button
+    \l{QMediaRecorder::StoppedState} then the button text will be "Record" and
+    "Pause". In \l{QMediaRecorder::RecordingState} the record button will have
+    the text "Stop", and in \l{QMediaRecorder::PausedState} the pause button
     will have the text "Resume".
 
     Pressing the buttons will also result in a toggle based on the state. If
@@ -76,7 +76,7 @@
     \l{QAudioEncoderSettings} based on the values of the selection lists,
     will set the encoding settings and container on the \c audioRecorder
     object, and start recording using the
-    \l{QMediaEncoder::record()}{record()} method.
+    \l{QMediaRecorder::record()}{record()} method.
 
     \code
         QAudioEncoderSettings settings;
@@ -95,7 +95,7 @@
     \endcode
 
     While recording, the status bar of the application is updated with duration information
-    from the \l{QMediaEncoder::durationChanged()}{durationChanged} signal from the
+    from the \l{QMediaRecorder::durationChanged()}{durationChanged} signal from the
     \c audioRecorder object.
 
     \code
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 796f37f42..f45971e9f 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -54,7 +54,7 @@
 #include "imagesettings.h"
 #include "metadatadialog.h"
 
-#include <QMediaEncoder>
+#include <QMediaRecorder>
 #include <QVideoWidget>
 #include <QCameraDevice>
 #include <QMediaMetaData>
@@ -101,15 +101,15 @@ void Camera::setCamera(const QCameraDevice &cameraInfo)
     connect(m_camera.data(), &QCamera::activeChanged, this, &Camera::updateCameraActive);
     connect(m_camera.data(), &QCamera::errorOccurred, this, &Camera::displayCameraError);
 
-    m_mediaEncoder.reset(new QMediaEncoder);
+    m_mediaEncoder.reset(new QMediaRecorder);
     m_captureSession.setEncoder(m_mediaEncoder.data());
-    connect(m_mediaEncoder.data(), &QMediaEncoder::recorderStateChanged, this, &Camera::updateRecorderState);
+    connect(m_mediaEncoder.data(), &QMediaRecorder::recorderStateChanged, this, &Camera::updateRecorderState);
 
     m_imageCapture = new QCameraImageCapture;
     m_captureSession.setImageCapture(m_imageCapture);
 
-    connect(m_mediaEncoder.data(), &QMediaEncoder::durationChanged, this, &Camera::updateRecordTime);
-    connect(m_mediaEncoder.data(), &QMediaEncoder::errorChanged, this, &Camera::displayRecorderError);
+    connect(m_mediaEncoder.data(), &QMediaRecorder::durationChanged, this, &Camera::updateRecordTime);
+    connect(m_mediaEncoder.data(), &QMediaRecorder::errorChanged, this, &Camera::displayRecorderError);
 
     connect(ui->exposureCompensation, &QAbstractSlider::valueChanged, this, &Camera::setExposureCompensation);
 
@@ -142,7 +142,7 @@ void Camera::keyPressEvent(QKeyEvent * event)
         if (m_doImageCapture) {
             takeImage();
         } else {
-            if (m_mediaEncoder->recorderState() == QMediaEncoder::RecordingState)
+            if (m_mediaEncoder->recorderState() == QMediaRecorder::RecordingState)
                 stop();
             else
                 record();
@@ -277,22 +277,22 @@ void Camera::updateCameraActive(bool active)
     }
 }
 
-void Camera::updateRecorderState(QMediaEncoder::RecorderState state)
+void Camera::updateRecorderState(QMediaRecorder::RecorderState state)
 {
     switch (state) {
-    case QMediaEncoder::StoppedState:
+    case QMediaRecorder::StoppedState:
         ui->recordButton->setEnabled(true);
         ui->pauseButton->setEnabled(true);
         ui->stopButton->setEnabled(false);
         ui->metaDataButton->setEnabled(true);
         break;
-    case QMediaEncoder::PausedState:
+    case QMediaRecorder::PausedState:
         ui->recordButton->setEnabled(true);
         ui->pauseButton->setEnabled(false);
         ui->stopButton->setEnabled(true);
         ui->metaDataButton->setEnabled(false);
         break;
-    case QMediaEncoder::RecordingState:
+    case QMediaRecorder::RecordingState:
         ui->recordButton->setEnabled(false);
         ui->pauseButton->setEnabled(true);
         ui->stopButton->setEnabled(true);
@@ -308,7 +308,7 @@ void Camera::setExposureCompensation(int index)
 
 void Camera::displayRecorderError()
 {
-    if (m_mediaEncoder->error() != QMediaEncoder::NoError)
+    if (m_mediaEncoder->error() != QMediaRecorder::NoError)
         QMessageBox::warning(this, tr("Capture Error"), m_mediaEncoder->errorString());
 }
 
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 48ea876d9..6a55f42b3 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -53,7 +53,7 @@
 
 #include <QCamera>
 #include <QCameraImageCapture>
-#include <QMediaEncoder>
+#include <QMediaRecorder>
 #include <QScopedPointer>
 #include <QMediaMetaData>
 #include <QMediaCaptureSession>
@@ -104,7 +104,7 @@ private slots:
 
     void updateCameraActive(bool active);
     void updateCaptureMode();
-    void updateRecorderState(QMediaEncoder::RecorderState state);
+    void updateRecorderState(QMediaRecorder::RecorderState state);
     void setExposureCompensation(int index);
 
     void updateRecordTime();
@@ -136,7 +136,7 @@ private:
     QScopedPointer<QCamera> m_camera;
     QScopedPointer<QAudioInput> m_audioInput;
     QCameraImageCapture *m_imageCapture;
-    QScopedPointer<QMediaEncoder> m_mediaEncoder;
+    QScopedPointer<QMediaRecorder> m_mediaEncoder;
 
     QMediaEncoderSettings m_encoderSettings;
     bool m_isCapturingImage = false;
diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc
index 8792674b8..68e19aac3 100644
--- a/examples/multimediawidgets/camera/doc/src/camera.qdoc
+++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc
@@ -49,7 +49,7 @@ settings.
 
 The Camera class contains an instance of \l {QCamera}, the API class interface to
 the hardware. It also has an instance of \l {QCameraImageCapture} to take still images
-and an instance of \l {QMediaEncoder} to record video. It also contains the user
+and an instance of \l {QMediaRecorder} to record video. It also contains the user
 interface object.
 
 The Camera constructor does some basic initialization. The camera object is
@@ -59,7 +59,7 @@ the \e{setCamera()} function is called, passing in a \l {QByteArray}.
 
 \e{setCamera()} sets up various connections between the user interface and the functionality
 of the Camera class using signals and slots. It also instantiates and initializes the \l {QCamera},
-\l {QCameraImageCapture} and \l {QMediaEncoder} objects mentioned above. The still
+\l {QCameraImageCapture} and \l {QMediaRecorder} objects mentioned above. The still
 and video recording visual tabs are enabled and finally the
 \l {QCamera::start()}{start()} function of the \l{QCamera} object is called.
 
@@ -72,7 +72,7 @@ is QCamera::CaptureStillImage, or if the capture mode is for video then one
 of two actions will occur. If the recording state shows that we are currently
 recording then the \e{stop()} function is called resulting in a call to
 \l {QCamera::stop()}, whereas if we are not recording then a video recording
-is started with a call to \l {QMediaEncoder::record()}.
+is started with a call to \l {QMediaRecorder::record()}.
 
 \image camera-example.png
 
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index cb17fda57..9bc0d0ea0 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -54,7 +54,7 @@
 #include <QComboBox>
 #include <QSpinBox>
 #include <QDebug>
-#include <QMediaEncoder>
+#include <QMediaRecorder>
 #include <QMediaFormat>
 #include <QAudioDevice>
 #include <QMediaCaptureSession>
@@ -62,7 +62,7 @@
 #include <QCamera>
 #include <QAudioInput>
 
-VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent)
+VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent)
     : QDialog(parent),
       ui(new Ui::VideoSettingsUi),
       mediaRecorder(mediaRecorder)
diff --git a/examples/multimediawidgets/camera/videosettings.h b/examples/multimediawidgets/camera/videosettings.h
index 05a21b4e4..2cb690d27 100644
--- a/examples/multimediawidgets/camera/videosettings.h
+++ b/examples/multimediawidgets/camera/videosettings.h
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
-class QMediaEncoder;
+class QMediaRecorder;
 namespace Ui { class VideoSettingsUi; }
 QT_END_NAMESPACE
 
@@ -65,7 +65,7 @@ class VideoSettings : public QDialog
     Q_OBJECT
 
 public:
-    explicit VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent = nullptr);
+    explicit VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent = nullptr);
     ~VideoSettings();
 
     QMediaEncoderSettings encoderSettings() const;
@@ -79,7 +79,7 @@ private:
     void selectComboBoxItem(QComboBox *box, const QVariant &value);
 
     Ui::VideoSettingsUi *ui;
-    QMediaEncoder *mediaRecorder;
+    QMediaRecorder *mediaRecorder;
 };
 
 #endif // VIDEOSETTINGS_H