summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-15 11:54:52 +0300
committerYoann Lopes <yoann.lopes@theqtcompany.com>2016-01-15 13:57:27 +0000
commit559a05605cc622142b0fbe76bc8edd4ab0f86d50 (patch)
treeb1f1aadedef518dbef097ba237b8e031d58fd697
parent50a8f44fa47ec00769b55058c66c94390735cf57 (diff)
QNX plugin: replace foreach with range-based for
Change-Id: Ia95da6282ae4dcbeff024655b78788e15ad0e18c Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
-rw-r--r--src/plugins/qnx/camera/bbcamerasession.cpp4
-rw-r--r--src/plugins/qnx/camera/bbmediastoragelocation.cpp5
-rw-r--r--src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp3
3 files changed, 7 insertions, 5 deletions
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<QSize> 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<qreal>(size.width())/static_cast<qreal>(size.height())))) {
viewfinderResolution = size;
@@ -944,7 +944,7 @@ void BbCameraSession::applyConfiguration()
QSize viewfinderResolution;
QList<QSize> 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<qreal>(size.width())/static_cast<qreal>(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;