From f1453e0f51cf60773eddc37d9451375e806bf4ce Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 15 Jan 2016 10:48:05 +0300 Subject: imports: replace foreach with range-based for Change-Id: I495438c99337b9423b0a589c1c8d8171d20b0cff Reviewed-by: Yoann Lopes --- src/imports/multimedia/qdeclarativecamera.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/imports/multimedia') diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index eac1c0c9b..368b1f036 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -982,11 +982,11 @@ QJSValue QDeclarativeCamera::supportedViewfinderResolutions(qreal minimumFrameRa QCameraViewfinderSettings settings; settings.setMinimumFrameRate(minimumFrameRate); settings.setMaximumFrameRate(maximumFrameRate); - QList resolutions = m_camera->supportedViewfinderResolutions(settings); + const QList resolutions = m_camera->supportedViewfinderResolutions(settings); QJSValue supportedResolutions = engine->newArray(resolutions.count()); int i = 0; - Q_FOREACH (const QSize &resolution, resolutions) { + for (const QSize &resolution : resolutions) { QJSValue size = engine->newObject(); size.setProperty(QStringLiteral("width"), resolution.width()); size.setProperty(QStringLiteral("height"), resolution.height()); @@ -1024,11 +1024,11 @@ QJSValue QDeclarativeCamera::supportedViewfinderFrameRateRanges(const QJSValue & if (width.isNumber() && height.isNumber()) settings.setResolution(width.toInt(), height.toInt()); } - QList frameRateRanges = m_camera->supportedViewfinderFrameRateRanges(settings); + const QList frameRateRanges = m_camera->supportedViewfinderFrameRateRanges(settings); QJSValue supportedFrameRateRanges = engine->newArray(frameRateRanges.count()); int i = 0; - Q_FOREACH (const QCamera::FrameRateRange &frameRateRange, frameRateRanges) { + for (const QCamera::FrameRateRange &frameRateRange : frameRateRanges) { QJSValue range = engine->newObject(); range.setProperty(QStringLiteral("minimumFrameRate"), frameRateRange.minimumFrameRate); range.setProperty(QStringLiteral("maximumFrameRate"), frameRateRange.maximumFrameRate); -- cgit v1.2.3