Get rid of the global enums in qmultimedia.h

Move the ones that are still used into the correct place.

Change-Id: I3ddc05aad35a163c88a45a1f192c49a65239c536
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

4 files changed, 14 insertions, 14 deletions

diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 8bd0cdfc6..821b6481c 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -110,8 +110,8 @@ AudioRecorder::AudioRecorder()
     ui->channelsBox->addItem(QStringLiteral("4"), QVariant(4));
 
     //quality
-    ui->qualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
-    ui->qualitySlider->setValue(int(QMultimedia::NormalQuality));
+    ui->qualitySlider->setRange(0, int(QImageEncoderSettings::VeryHighQuality));
+    ui->qualitySlider->setValue(int(QImageEncoderSettings::NormalQuality));
 
     //bitrates:
     ui->bitrateBox->addItem(tr("Default"), QVariant(0));
@@ -198,10 +198,10 @@ void AudioRecorder::toggleRecord()
         settings.setAudioSampleRate(ui->sampleRateBox->value());
         settings.setAudioBitRate(boxValue(ui->bitrateBox).toInt());
         settings.setAudioChannelCount(boxValue(ui->channelsBox).toInt());
-        settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value()));
+        settings.setQuality(QMediaEncoderSettings::Quality(ui->qualitySlider->value()));
         settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
-                                 QMultimedia::ConstantQualityEncoding :
-                                 QMultimedia::ConstantBitRateEncoding);
+                                 QMediaEncoderSettings::ConstantQualityEncoding :
+                                 QMediaEncoderSettings::ConstantBitRateEncoding);
 
         m_audioRecorder->setEncoderSettings(settings);
         m_audioRecorder->record();
diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
index 4e4032bff..4d5bdfa0e 100644
--- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
+++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
@@ -51,8 +51,8 @@
     \l{QAudioRecorder::supportedContainers()}{supportedContainers()}, and
     \l{QAudioRecorder::supportedAudioSampleRates()}{supportedAudioSampleRates()}
     methods. The quality slider is setup from 0 (zero) to
-    \l{QMultimedia::VeryHighQuality} with a default value of
-    \l{QMultimedia::NormalQuality}, while the bitrates are hardcoded
+    \l{QMediaEncoderSettings::VeryHighQuality} with a default value of
+    \l{QMediaEncoderSettings::NormalQuality}, while the bitrates are hardcoded
     into the list.
 
     \section1 Recording Audio
@@ -83,10 +83,10 @@
         settings.setCodec(boxValue(ui->audioCodecBox).toString());
         settings.setSampleRate(boxValue(ui->sampleRateBox).toInt());
         settings.setBitRate(boxValue(ui->bitrateBox).toInt());
-        settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value()));
+        settings.setQuality(QMediaEncoderSettings::EncodingQuality(ui->qualitySlider->value()));
         settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
-                                 QMultimedia::ConstantQualityEncoding :
-                                 QMultimedia::ConstantBitRateEncoding);
+                                 QMediaEncoderSettings::ConstantQualityEncoding :
+                                 QMediaEncoderSettings::ConstantBitRateEncoding);
 
         QString container = boxValue(ui->containerBox).toString();
 
diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp
index c8042bb03..a74982854 100644
--- a/examples/multimediawidgets/camera/imagesettings.cpp
+++ b/examples/multimediawidgets/camera/imagesettings.cpp
@@ -72,7 +72,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
         ui->imageCodecBox->addItem(QImageEncoderSettings::fileFormatName(f) + ": " + description, QVariant::fromValue(f));
     }
 
-    ui->imageQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
+    ui->imageQualitySlider->setRange(0, int(QImageEncoderSettings::VeryHighQuality));
 
     ui->imageResolutionBox->addItem(tr("Default Resolution"));
     const QList<QSize> supportedResolutions = imagecapture->camera()->cameraInfo().photoResolutions();
@@ -103,7 +103,7 @@ QImageEncoderSettings ImageSettings::imageSettings() const
 {
     QImageEncoderSettings settings = imagecapture->encodingSettings();
     settings.setFormat(boxValue(ui->imageCodecBox).value<QImageEncoderSettings::FileFormat>());
-    settings.setQuality(QMultimedia::EncodingQuality(ui->imageQualitySlider->value()));
+    settings.setQuality(QImageEncoderSettings::Quality(ui->imageQualitySlider->value()));
     settings.setResolution(boxValue(ui->imageResolutionBox).toSize());
 
     return settings;
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index 3ffb42ed4..8b70b2014 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -109,7 +109,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent)
                                         QVariant::fromValue(format));
     }
 
-    ui->qualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
+    ui->qualitySlider->setRange(0, int(QImageEncoderSettings::VeryHighQuality));
 }
 
 VideoSettings::~VideoSettings()
@@ -132,7 +132,7 @@ void VideoSettings::changeEvent(QEvent *e)
 QMediaEncoderSettings VideoSettings::encoderSettings() const
 {
     QMediaEncoderSettings settings = mediaRecorder->encoderSettings();
-    settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value()));
+    settings.setQuality(QMediaEncoderSettings::Quality(ui->qualitySlider->value()));
     settings.setFormat(boxValue(ui->containerFormatBox).value<QMediaFormat::FileFormat>());
 
     settings.setAudioCodec(boxValue(ui->audioCodecBox).value<QMediaFormat::AudioCodec>());