Gstreamer plugin: replace foreach with range-based for

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

6 files changed, 20 insertions, 16 deletions

diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
index b7693c18a..2528bbec1 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
@@ -77,7 +77,7 @@ QGstreamerAudioEncode::QGstreamerAudioEncode(QObject *parent)
     m_codecOptions["audio/AMR"] = QStringList();
     m_codecOptions["audio/AMR-WB"] = QStringList();
 
-    foreach( const QByteArray& codecName, codecCandidates ) {
+    for (const QByteArray& codecName : qAsConst(codecCandidates)) {
         QByteArray elementName = m_elementNames[codecName];
         GstElementFactory *factory = gst_element_factory_find(elementName.constData());
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
index a5f91f193..57b968b77 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
@@ -74,7 +74,8 @@ int QGstreamerImageCaptureControl::capture(const QString &fileName)
     if (path.isEmpty()) {
         int lastImage = 0;
         QDir outputDir = QDir::currentPath();
-        foreach(QString fileName, outputDir.entryList(QStringList() << "img_*.jpg")) {
+        const auto list = outputDir.entryList(QStringList() << "img_*.jpg");
+        for (const QString &fileName : list) {
             int imgNumber = fileName.midRef(4, fileName.size()-8).toInt();
             lastImage = qMax(lastImage, imgNumber);
         }
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
index 338af5255..41b049d5d 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
@@ -71,7 +71,7 @@ QGstreamerMediaContainerControl::QGstreamerMediaContainerControl(QObject *parent
 
     QSet<QString> allTypes;
 
-    foreach( const QByteArray& formatName, formatCandidates ) {
+    for (const QByteArray& formatName : qAsConst(formatCandidates)) {
         QByteArray elementName = m_elementNames[formatName];
         GstElementFactory *factory = gst_element_factory_find(elementName.constData());
         if (factory) {
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
index 91bfd67f3..d30a2fe6f 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
@@ -242,7 +242,7 @@ void QGstreamerRecorderControl::applySettings()
     QString audioCodec;
     QString videoCodec;
 
-    foreach (const QString &containerCandidate, containerCandidates) {
+    for (const QString &containerCandidate : qAsConst(containerCandidates)) {
         QSet<QString> supportedTypes = mediaContainerControl->supportedStreamTypes(containerCandidate);
 
         audioCodec.clear();
@@ -250,7 +250,7 @@ void QGstreamerRecorderControl::applySettings()
 
         if (needAudio) {
             bool found = false;
-            foreach (const QString &audioCandidate, audioCandidates) {
+            for (const QString &audioCandidate : qAsConst(audioCandidates)) {
                 QSet<QString> audioTypes = audioEncodeControl->supportedStreamTypes(audioCandidate);
                 if (audioTypes.intersects(supportedTypes)) {
                     found = true;
@@ -264,7 +264,7 @@ void QGstreamerRecorderControl::applySettings()
 
         if (needVideo) {
             bool found = false;
-            foreach (const QString &videoCandidate, videoCandidates) {
+            for (const QString &videoCandidate : qAsConst(videoCandidates)) {
                 QSet<QString> videoTypes = videoEncodeControl->supportedStreamTypes(videoCandidate);
                 if (videoTypes.intersects(supportedTypes)) {
                     found = true;
@@ -339,7 +339,7 @@ QDir QGstreamerRecorderControl::defaultDir() const
     dirCandidates << QDir::currentPath();
     dirCandidates << QDir::tempPath();
 
-    foreach (const QString &path, dirCandidates) {
+    for (const QString &path : qAsConst(dirCandidates)) {
         QDir dir(path);
         if (dir.exists() && QFileInfo(path).isWritable())
             return dir;
@@ -352,7 +352,8 @@ QString QGstreamerRecorderControl::generateFileName(const QDir &dir, const QStri
 {
 
     int lastClip = 0;
-    foreach(QString fileName, dir.entryList(QStringList() << QString("clip_*.%1").arg(ext))) {
+    const auto list = dir.entryList(QStringList() << QString("clip_*.%1").arg(ext));
+    for (const QString &fileName : list) {
         int imgNumber = fileName.midRef(5, fileName.size()-6-ext.length()).toInt();
         lastClip = qMax(lastClip, imgNumber);
     }
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
index 600a492e7..65e19ad2e 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
@@ -138,7 +138,7 @@ void QGstreamerV4L2Input::updateSupportedResolutions(const QByteArray &device)
 
     //get the list of resolutions:
 
-    foreach (quint32 format, supportedFormats) {
+    for (quint32 format : qAsConst(supportedFormats)) {
         struct v4l2_frmsizeenum formatSize;
         memset(&formatSize, 0, sizeof(formatSize));
         formatSize.pixel_format = format;
@@ -161,7 +161,7 @@ void QGstreamerV4L2Input::updateSupportedResolutions(const QByteArray &device)
                 sizeList.append(QSize(formatSize.discrete.width, formatSize.discrete.height));
             } else {
 
-                foreach (const QSize& candidate, commonSizes) {
+                for (const QSize& candidate : qAsConst(commonSizes)) {
                     if (candidate.width() <= (int)formatSize.stepwise.max_width &&
                         candidate.height() >= (int)formatSize.stepwise.min_width &&
                         candidate.width() % formatSize.stepwise.step_width == 0 &&
@@ -185,7 +185,7 @@ void QGstreamerV4L2Input::updateSupportedResolutions(const QByteArray &device)
 
         //and frameRates for each resolution.
 
-        foreach (const QSize &s, sizeList) {
+        for (const QSize &s : qAsConst(sizeList)) {
             allResolutions.insert(s);
 
             struct v4l2_frmivalenum formatInterval;
@@ -221,7 +221,7 @@ void QGstreamerV4L2Input::updateSupportedResolutions(const QByteArray &device)
                                          formatInterval.stepwise.max.numerator);
 
 
-                    foreach (int candidate, commonRates) {
+                    for (int candidate : qAsConst(commonRates)) {
                         if (candidate >= minRate && candidate <= maxRate)
                             frameRates.append(candidate);
                     }
@@ -242,7 +242,7 @@ void QGstreamerV4L2Input::updateSupportedResolutions(const QByteArray &device)
 
     f.close();
 
-    foreach(int rate, allFrameRates) {
+    for (int rate : qAsConst(allFrameRates)) {
         m_frameRates.append(rate/1000.0);
     }
 
@@ -262,7 +262,9 @@ QList<qreal> QGstreamerV4L2Input::supportedFrameRates(const QSize &frameSize) co
         return m_frameRates;
     else {
         QList<qreal> res;
-        foreach(int rate, m_ratesByResolution[frameSize]) {
+        const auto rates = m_ratesByResolution[frameSize];
+        res.reserve(rates.size());
+        for (int rate : rates) {
             res.append(rate/1000.0);
         }
         return res;
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
index 543603c6d..172845d7c 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
@@ -59,7 +59,7 @@ QGstreamerVideoEncode::QGstreamerVideoEncode(QGstreamerCaptureSession *session)
     m_codecOptions["video/mpeg2"] = QStringList() << "quantizer";
     m_codecOptions["video/theora"] = QStringList();
 
-    foreach( const QByteArray& codecName, codecCandidates ) {
+    for (const QByteArray& codecName : qAsConst(codecCandidates)) {
         QByteArray elementName = m_elementNames[codecName];
         GstElementFactory *factory = gst_element_factory_find(elementName.constData());
         if (factory) {
@@ -293,7 +293,7 @@ QPair<int,int> QGstreamerVideoEncode::rateAsRational() 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);