diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-23 15:18:22 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-26 13:26:53 +0000 |
commit | e8e9f40ebc0d822fe639bed75d185800ff16b452 (patch) | |
tree | bd1123b5c358b39b18b28b69b3c0fa2d8eb3b528 /examples/multimediawidgets/camera/imagesettings.cpp | |
parent | 019dc4d39ab87966d6f3e1c8f1d941a6d113f44b (diff) |
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>
Diffstat (limited to 'examples/multimediawidgets/camera/imagesettings.cpp')
-rw-r--r-- | examples/multimediawidgets/camera/imagesettings.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp index 55441b4e3..658176369 100644 --- a/examples/multimediawidgets/camera/imagesettings.cpp +++ b/examples/multimediawidgets/camera/imagesettings.cpp @@ -56,16 +56,17 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent) //image codecs ui->imageCodecBox->addItem(tr("Default image format"), QVariant(QString())); - foreach(const QString &codecName, imagecapture->supportedImageCodecs()) { + const QStringList supportedImageCodecs = imagecapture->supportedImageCodecs(); + for (const QString &codecName : supportedImageCodecs) { QString description = imagecapture->imageCodecDescription(codecName); - ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName)); + ui->imageCodecBox->addItem(codecName + ": " + description, QVariant(codecName)); } ui->imageQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality)); ui->imageResolutionBox->addItem(tr("Default Resolution")); - QList<QSize> supportedResolutions = imagecapture->supportedResolutions(); - foreach(const QSize &resolution, supportedResolutions) { + const QList<QSize> supportedResolutions = imagecapture->supportedResolutions(); + for (const QSize &resolution : supportedResolutions) { ui->imageResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()), QVariant(resolution)); } |