From 559a05605cc622142b0fbe76bc8edd4ab0f86d50 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 15 Jan 2016 11:54:52 +0300 Subject: QNX plugin: replace foreach with range-based for Change-Id: Ia95da6282ae4dcbeff024655b78788e15ad0e18c Reviewed-by: Yoann Lopes --- src/plugins/qnx/camera/bbcamerasession.cpp | 4 ++-- src/plugins/qnx/camera/bbmediastoragelocation.cpp | 5 +++-- src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/plugins/qnx') diff --git a/src/plugins/qnx/camera/bbcamerasession.cpp b/src/plugins/qnx/camera/bbcamerasession.cpp index 66243187b..13af75e2d 100644 --- a/src/plugins/qnx/camera/bbcamerasession.cpp +++ b/src/plugins/qnx/camera/bbcamerasession.cpp @@ -526,7 +526,7 @@ void BbCameraSession::applyVideoSettings() QList sizes = supportedViewfinderResolutions(QCamera::CaptureVideo); std::reverse(sizes.begin(), sizes.end()); // use smallest possible resolution - foreach (const QSize &size, sizes) { + for (const QSize &size : qAsConst(sizes)) { // search for viewfinder resolution with the same aspect ratio if (qFuzzyCompare(aspectRatio, (static_cast(size.width())/static_cast(size.height())))) { viewfinderResolution = size; @@ -944,7 +944,7 @@ void BbCameraSession::applyConfiguration() QSize viewfinderResolution; QList sizes = supportedViewfinderResolutions(QCamera::CaptureStillImage); std::reverse(sizes.begin(), sizes.end()); // use smallest possible resolution - foreach (const QSize &size, sizes) { + for (const QSize &size : qAsConst(sizes)) { // search for viewfinder resolution with the same aspect ratio if (qFuzzyCompare(aspectRatio, (static_cast(size.width())/static_cast(size.height())))) { viewfinderResolution = size; diff --git a/src/plugins/qnx/camera/bbmediastoragelocation.cpp b/src/plugins/qnx/camera/bbmediastoragelocation.cpp index deaff77d3..ffec15381 100644 --- a/src/plugins/qnx/camera/bbmediastoragelocation.cpp +++ b/src/plugins/qnx/camera/bbmediastoragelocation.cpp @@ -57,7 +57,7 @@ QDir BbMediaStorageLocation::defaultDir(QCamera::CaptureMode mode) const dirCandidates << QDir::currentPath(); dirCandidates << QDir::tempPath(); - Q_FOREACH (const QString &path, dirCandidates) { + for (const QString &path : qAsConst(dirCandidates)) { if (QFileInfo(path).isWritable()) return QDir(path); } @@ -83,7 +83,8 @@ QString BbMediaStorageLocation::generateFileName(const QString &prefix, const QD if (lastMediaIndex == 0) { // first run, find the maximum media number during the fist capture - Q_FOREACH (const QString &fileName, dir.entryList(QStringList() << QString("%1*.%2").arg(prefix).arg(extension))) { + const auto list = dir.entryList(QStringList() << QString("%1*.%2").arg(prefix).arg(extension)); + for (const QString &fileName : list) { const qint64 mediaIndex = fileName.midRef(prefix.length(), fileName.size() - prefix.length() - extension.length() - 1).toInt(); lastMediaIndex = qMax(lastMediaIndex, mediaIndex); } diff --git a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp index aac8825cf..84f0ca83b 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp @@ -405,7 +405,8 @@ void MmRendererVideoWindowControl::screenEventHandler(const screen_event_t &scre QWindow *MmRendererVideoWindowControl::findWindow(WId id) const { - Q_FOREACH (QWindow *window, QGuiApplication::allWindows()) + const auto allWindows = QGuiApplication::allWindows(); + for (QWindow *window : allWindows) if (window->winId() == id) return window; return 0; -- cgit v1.2.3