Camera example: Brush up to C++11

Use Qt 5 signal/slot syntax, range based for, member initialization.
Add message for captured images and fix some minor issues.

Task-number: QTBUG-60627
Change-Id: I1011fc95d928a9d2edaad16120acb0dc41f987d9
Reviewed-by: Christian Stromme <christian.stromme@qt.io>

1 files changed, 15 insertions, 13 deletions

diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index 3e0c2afd0..38e8e476b 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -56,47 +56,49 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
 
     //audio codecs
     ui->audioCodecBox->addItem(tr("Default audio codec"), QVariant(QString()));
-    foreach (const QString &codecName, mediaRecorder->supportedAudioCodecs()) {
+    const QStringList supportedAudioCodecs =  mediaRecorder->supportedAudioCodecs();
+    for (const QString &codecName : supportedAudioCodecs) {
         QString description = mediaRecorder->audioCodecDescription(codecName);
-        ui->audioCodecBox->addItem(codecName+": "+description, QVariant(codecName));
+        ui->audioCodecBox->addItem(codecName + ": " + description, QVariant(codecName));
     }
 
     //sample rate:
-    foreach (int sampleRate, mediaRecorder->supportedAudioSampleRates()) {
+    const QList<int>supportedAudioSampleRates = mediaRecorder->supportedAudioSampleRates();
+    for (int sampleRate : supportedAudioSampleRates)
         ui->audioSampleRateBox->addItem(QString::number(sampleRate), QVariant(sampleRate));
-    }
 
     ui->audioQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
 
     //video codecs
     ui->videoCodecBox->addItem(tr("Default video codec"), QVariant(QString()));
-    foreach (const QString &codecName, mediaRecorder->supportedVideoCodecs()) {
+    const QStringList supportedVideoCodecs = mediaRecorder->supportedVideoCodecs();
+    for (const QString &codecName : supportedVideoCodecs) {
         QString description = mediaRecorder->videoCodecDescription(codecName);
-        ui->videoCodecBox->addItem(codecName+": "+description, QVariant(codecName));
+        ui->videoCodecBox->addItem(codecName + ": " + description, QVariant(codecName));
     }
 
     ui->videoQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
 
 
     ui->videoResolutionBox->addItem(tr("Default"));
-    QList<QSize> supportedResolutions = mediaRecorder->supportedResolutions();
-    foreach (const QSize &resolution, supportedResolutions) {
+    const QList<QSize> supportedResolutions = mediaRecorder->supportedResolutions();
+    for (const QSize &resolution : supportedResolutions) {
         ui->videoResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()),
                                         QVariant(resolution));
     }
 
     ui->videoFramerateBox->addItem(tr("Default"));
-    QList<qreal> supportedFrameRates = mediaRecorder->supportedFrameRates();
-    qreal rate;
-    foreach (rate, supportedFrameRates) {
+    const QList<qreal> supportedFrameRates = mediaRecorder->supportedFrameRates();
+    for (qreal rate : supportedFrameRates) {
         QString rateString = QString("%1").arg(rate, 0, 'f', 2);
         ui->videoFramerateBox->addItem(rateString, QVariant(rate));
     }
 
     //containers
     ui->containerFormatBox->addItem(tr("Default container"), QVariant(QString()));
-    foreach (const QString &format, mediaRecorder->supportedContainers()) {
-        ui->containerFormatBox->addItem(format+":"+mediaRecorder->containerDescription(format),
+    const QStringList formats = mediaRecorder->supportedContainers();
+    for (const QString &format : formats) {
+        ui->containerFormatBox->addItem(format + ": " + mediaRecorder->containerDescription(format),
                                         QVariant(format));
     }
 }