Gstreamer plugin: replace foreach with range-based for

Change-Id: Ic6d0f9d6b45eae1cdadc46783cb6f5bb7c64ac8c
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

7 files changed, 29 insertions, 20 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
index f5b6900f9..b1b61ffe7 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
@@ -116,13 +116,13 @@ GstEncodingContainerProfile *CameraBinContainer::createProfile()
         return 0;
     } else {
         QString format = m_actualFormat;
-        QStringList supportedFormats = m_supportedContainers.supportedCodecs();
+        const QStringList supportedFormats = m_supportedContainers.supportedCodecs();
 
         //if format is not in the list of supported gstreamer mime types,
         //try to find the mime type with matching extension
         if (!supportedFormats.contains(format)) {
             QString extension = suggestedFileExtension(m_actualFormat);
-            foreach (const QString &formatCandidate, supportedFormats) {
+            for (const QString &formatCandidate : supportedFormats) {
                 if (suggestedFileExtension(formatCandidate) == extension) {
                     format = formatCandidate;
                     break;
diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp
index 32b8d9454..340e776e5 100644
--- a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp
@@ -239,7 +239,7 @@ QCameraFocusZoneList CameraBinFocus::focusZones() const
     if (m_focusPointMode != QCameraFocus::FocusPointFaceDetection) {
         zones.append(QCameraFocusZone(m_focusRect, m_focusZoneStatus));
 #if GST_CHECK_VERSION(1,0,0)
-    } else foreach (const QRect &face, m_faceFocusRects) {
+    } else for (const QRect &face : qAsConst(m_faceFocusRects)) {
         const QRectF normalizedRect(
                     face.x() / qreal(m_viewfinderResolution.width()),
                     face.y() / qreal(m_viewfinderResolution.height()),
@@ -434,7 +434,7 @@ void CameraBinFocus::updateRegionOfInterest(const QVector<QRect> &rectangles)
                     m_viewfinderResolution.width(), m_viewfinderResolution.height()) * 0.3;
         const QRect viewfinderRectangle(QPoint(0, 0), m_viewfinderResolution);
 
-        foreach (const QRect &rectangle, rectangles) {
+        for (const QRect &rectangle : rectangles) {
             QRect paddedRectangle(
                         0,
                         0,
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
index ec2a83a66..0fca1d4f8 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
@@ -197,7 +197,8 @@ QVariant CameraBinMetaData::metaData(const QString &key) const
     }
 #endif
 
-    Q_FOREACH (const QGStreamerMetaDataKey &metadataKey, *qt_gstreamerMetaDataKeys()) {
+    const auto keys = *qt_gstreamerMetaDataKeys();
+    for (const QGStreamerMetaDataKey &metadataKey : keys) {
         if (metadataKey.qtName == key)
             return m_values.value(QByteArray::fromRawData(metadataKey.gstName, qstrlen(metadataKey.gstName)));
     }
@@ -216,7 +217,8 @@ void CameraBinMetaData::setMetaData(const QString &key, const QVariant &value)
         }
     }
 
-    Q_FOREACH (const QGStreamerMetaDataKey &metadataKey, *qt_gstreamerMetaDataKeys()) {
+    const auto keys = *qt_gstreamerMetaDataKeys();
+    for (const QGStreamerMetaDataKey &metadataKey : keys) {
         if (metadataKey.qtName == key) {
             const char *name = metadataKey.gstName;
 
@@ -239,7 +241,8 @@ QStringList CameraBinMetaData::availableMetaData() const
 {
     static QMap<QByteArray, QString> keysMap;
     if (keysMap.isEmpty()) {
-        Q_FOREACH (const QGStreamerMetaDataKey &metadataKey, *qt_gstreamerMetaDataKeys())
+        const auto keys = *qt_gstreamerMetaDataKeys();
+        for (const QGStreamerMetaDataKey &metadataKey : keys)
             keysMap[QByteArray(metadataKey.gstName)] = metadataKey.qtName;
     }
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinrecorder.cpp b/src/plugins/gstreamer/camerabin/camerabinrecorder.cpp
index ad0596a6e..bc97563ec 100644
--- a/src/plugins/gstreamer/camerabin/camerabinrecorder.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinrecorder.cpp
@@ -154,7 +154,7 @@ void CameraBinRecorder::applySettings()
         candidates.append(QStringList() << "video/quicktime" << "video/x-h264" << "audio/mpeg");
         candidates.append(QStringList() << "video/x-msvideo" << "video/x-divx" << "audio/mpeg");
 
-        foreach (const QStringList &candidate, candidates) {
+        for (const QStringList &candidate : qAsConst(candidates)) {
             if (containerControl->supportedContainers().contains(candidate[0]) &&
                     videoEncoderControl->supportedVideoCodecs().contains(candidate[1]) &&
                     audioEncoderControl->supportedAudioCodecs().contains(candidate[2])) {
diff --git a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp
index 745536e87..f76c2c2a3 100644
--- a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp
@@ -127,13 +127,17 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe
     }
 
     QSet<ResourcePolicy::ResourceType> currentTypes;
-    foreach (ResourcePolicy::Resource *resource, m_resource->resources())
+    const auto resources = m_resource->resources();
+    currentTypes.reserve(resources.size());
+    for (ResourcePolicy::Resource *resource : resources)
         currentTypes << resource->type();
 
-    foreach (ResourcePolicy::ResourceType resourceType, currentTypes - requestedTypes)
+    const auto diffCurrentWithRequested = currentTypes - requestedTypes;
+    for (ResourcePolicy::ResourceType resourceType : diffCurrentWithRequested)
         m_resource->deleteResource(resourceType);
 
-    foreach (ResourcePolicy::ResourceType resourceType, requestedTypes - currentTypes) {
+    const auto diffRequestedWithCurrent = requestedTypes - currentTypes;
+    for (ResourcePolicy::ResourceType resourceType : diffRequestedWithCurrent) {
         if (resourceType == ResourcePolicy::LensCoverType) {
             ResourcePolicy::LensCoverResource *lensCoverResource = new ResourcePolicy::LensCoverResource;
             lensCoverResource->setOptional(true);
@@ -169,7 +173,8 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe
 bool CamerabinResourcePolicy::isResourcesGranted() const
 {
 #ifdef HAVE_RESOURCE_POLICY
-    foreach (ResourcePolicy::Resource *resource, m_resource->resources())
+    const auto resources = m_resource->resources();
+    for (ResourcePolicy::Resource *resource : resources)
         if (!resource->isOptional() && !resource->isGranted())
             return false;
 #endif
@@ -218,7 +223,8 @@ void CamerabinResourcePolicy::updateCanCapture()
     const bool wasAbleToRecord = m_canCapture;
     m_canCapture = (m_resourceSet == VideoCaptureResources) || (m_resourceSet == ImageCaptureResources);
 #ifdef HAVE_RESOURCE_POLICY
-    foreach (ResourcePolicy::Resource *resource, m_resource->resources()) {
+    const auto resources = m_resource->resources();
+    for (ResourcePolicy::Resource *resource : resources) {
         if (resource->type() != ResourcePolicy::LensCoverType)
             m_canCapture = m_canCapture && resource->isGranted();
     }
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index 3dd200c54..95624f711 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -496,8 +496,8 @@ GstElement *CameraBinSession::buildCameraSource()
                 const QByteArray envVideoSource = qgetenv("QT_GSTREAMER_CAMERABIN_VIDEOSRC");
 
                 if (!envVideoSource.isEmpty()) {
-                    QList<QByteArray> sources = envVideoSource.split(',');
-                    foreach (const QByteArray &source, sources) {
+                    const QList<QByteArray> sources = envVideoSource.split(',');
+                    for (const QByteArray &source : sources) {
                         QList<QByteArray> keyValue = source.split('=');
                         if (keyValue.count() == 1) {
                             m_videoSrc = gst_element_factory_make(keyValue.at(0), "camera_source");
@@ -1363,7 +1363,7 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
     //if the range is continuos, populate is with the common rates
     if (isContinuous && res.size() >= 2) {
         //fill the ragne with common value
-        static QList<QSize> commonSizes =
+        static const QList<QSize> commonSizes =
                 QList<QSize>() << QSize(128, 96)
                                << QSize(160,120)
                                << QSize(176, 144)
@@ -1385,7 +1385,7 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
         QSize maxSize = res.last();
         res.clear();
 
-        foreach (const QSize &candidate, commonSizes) {
+        for (const QSize &candidate : commonSizes) {
             int w = candidate.width();
             int h = candidate.height();
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
index 2d53af1fb..12336ea43 100644
--- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
@@ -71,9 +71,9 @@ QList< qreal > CameraBinVideoEncoder::supportedFrameRates(const QVideoEncoderSet
         *continuous = false;
 
     QList< qreal > res;
-    QPair<int,int> rate;
 
-    foreach(rate, m_session->supportedFrameRates(settings.resolution(), continuous)) {
+    const auto rates = m_session->supportedFrameRates(settings.resolution(), continuous);
+    for (const auto &rate : rates) {
         if (rate.second > 0)
             res << qreal(rate.first)/rate.second;
     }
@@ -141,7 +141,7 @@ QPair<int,int> CameraBinVideoEncoder::rateAsRational(qreal frameRate) const
         int num = 1;
         int denum = 1;
 
-        foreach (int curDenum, denumCandidates) {
+        for (int curDenum : qAsConst(denumCandidates)) {
             int curNum = qRound(frameRate*curDenum);
             qreal curError = qAbs(qreal(curNum)/curDenum - frameRate);