From 6b5f9bb6e855dddd041ec6d98bf48b5c622751bf Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 15 Jan 2016 11:34:06 +0300 Subject: AVFoundation: replace foreach with range-based for Change-Id: I7a2f563f74fc67b55ea9b00f0e87d8ddaa2659c4 Reviewed-by: Yoann Lopes --- src/plugins/avfoundation/camera/avfcameraserviceplugin.mm | 3 ++- src/plugins/avfoundation/camera/avfcamerasession.mm | 2 +- src/plugins/avfoundation/camera/avfstoragelocation.mm | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/plugins/avfoundation/camera/avfcameraserviceplugin.mm b/src/plugins/avfoundation/camera/avfcameraserviceplugin.mm index bf2f4a24b..f450c35c7 100644 --- a/src/plugins/avfoundation/camera/avfcameraserviceplugin.mm +++ b/src/plugins/avfoundation/camera/avfcameraserviceplugin.mm @@ -78,7 +78,8 @@ QList AVFServicePlugin::devices(const QByteArray &service) const if (service == Q_MEDIASERVICE_CAMERA) { const QList &cameras = AVFCameraSession::availableCameraDevices(); - Q_FOREACH (const AVFCameraInfo &info, cameras) + devs.reserve(cameras.size()); + for (const AVFCameraInfo &info : cameras) devs.append(info.deviceId); } diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm index 66dc43d81..43ab1d149 100644 --- a/src/plugins/avfoundation/camera/avfcamerasession.mm +++ b/src/plugins/avfoundation/camera/avfcamerasession.mm @@ -179,7 +179,7 @@ AVFCameraInfo AVFCameraSession::cameraDeviceInfo(const QByteArray &device) { updateCameraDevices(); - Q_FOREACH (const AVFCameraInfo &info, m_cameraDevices) { + for (const AVFCameraInfo &info : qAsConst(m_cameraDevices)) { if (info.deviceId == device) return info; } diff --git a/src/plugins/avfoundation/camera/avfstoragelocation.mm b/src/plugins/avfoundation/camera/avfstoragelocation.mm index 3bb62ed93..5f3aef490 100644 --- a/src/plugins/avfoundation/camera/avfstoragelocation.mm +++ b/src/plugins/avfoundation/camera/avfstoragelocation.mm @@ -81,7 +81,7 @@ QDir AVFStorageLocation::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); } @@ -96,7 +96,8 @@ QString AVFStorageLocation::generateFileName(const QString &prefix, const QDir & if (lastClip == 0) { //first run, find the maximum clip number during the fist capture - Q_FOREACH (const QString &fileName, dir.entryList(QStringList() << QString("%1*.%2").arg(prefix).arg(ext))) { + const auto list = dir.entryList(QStringList() << QString("%1*.%2").arg(prefix).arg(ext)); + for (const QString &fileName : list) { int imgNumber = fileName.midRef(prefix.length(), fileName.size()-prefix.length()-ext.length()-1).toInt(); lastClip = qMax(lastClip, imgNumber); } -- cgit v1.2.3