QGstTools: replace foreach with range-based for

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

5 files changed, 31 insertions, 22 deletions

diff --git a/src/gsttools/qgstreameraudioinputselector.cpp b/src/gsttools/qgstreameraudioinputselector.cpp
index 52587e075..565b6c44a 100644
--- a/src/gsttools/qgstreameraudioinputselector.cpp
+++ b/src/gsttools/qgstreameraudioinputselector.cpp
@@ -145,8 +145,8 @@ void QGstreamerAudioInputSelector::updateOssDevices()
 {
     QDir devDir("/dev");
     devDir.setFilter(QDir::System);
-    QFileInfoList entries = devDir.entryInfoList(QStringList() << "dsp*");
-    foreach(const QFileInfo& entryInfo, entries) {
+    const QFileInfoList entries = devDir.entryInfoList(QStringList() << "dsp*");
+    for (const QFileInfo& entryInfo : entries) {
         m_names.append(QLatin1String("oss:")+entryInfo.filePath());
         m_descriptions.append(QString("OSS device %1").arg(entryInfo.fileName()));
     }
diff --git a/src/gsttools/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp
index 7db62b83c..243a21611 100644
--- a/src/gsttools/qgstreamerbushelper.cpp
+++ b/src/gsttools/qgstreamerbushelper.cpp
@@ -117,7 +117,7 @@ private:
 private slots:
     void doProcessMessage(const QGstreamerMessage& msg)
     {
-        foreach (QGstreamerBusMessageFilter *filter, busFilters) {
+        for (QGstreamerBusMessageFilter *filter : qAsConst(busFilters)) {
             if (filter->processBusMessage(msg))
                 break;
         }
@@ -136,7 +136,7 @@ static GstBusSyncReply syncGstBusFilter(GstBus* bus, GstMessage* message, QGstre
     Q_UNUSED(bus);
     QMutexLocker lock(&d->filterMutex);
 
-    foreach (QGstreamerSyncMessageFilter *filter, d->syncFilters) {
+    for (QGstreamerSyncMessageFilter *filter : qAsConst(d->syncFilters)) {
         if (filter->processSyncMessage(QGstreamerMessage(message)))
             return GST_BUS_DROP;
     }
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index b9e04e3f1..0b84e16ee 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -480,7 +480,7 @@ QMultimedia::SupportEstimate QGstUtils::hasSupport(const QString &mimeType,
     }
 
     int supportedCodecCount = 0;
-    foreach (const QString &codec, codecs) {
+    for (const QString &codec : codecs) {
         QString codecLowcase = codec.toLower();
         const char* codecAlias = getCodecAlias(codecLowcase);
         if (codecAlias) {
@@ -583,10 +583,10 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa
     QDir devDir(QStringLiteral("/dev"));
     devDir.setFilter(QDir::System);
 
-    QFileInfoList entries = devDir.entryInfoList(QStringList()
+    const QFileInfoList entries = devDir.entryInfoList(QStringList()
                 << QStringLiteral("video*"));
 
-    foreach (const QFileInfo &entryInfo, entries) {
+    for (const QFileInfo &entryInfo : entries) {
         //qDebug() << "Try" << entryInfo.filePath();
 
         int fd = qt_safe_open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
@@ -643,7 +643,9 @@ QList<QByteArray> QGstUtils::cameraDevices(GstElementFactory * factory)
 {
     QList<QByteArray> devices;
 
-    foreach (const CameraInfo &camera, enumerateCameras(factory))
+    const auto cameras = enumerateCameras(factory);
+    devices.reserve(cameras.size());
+    for (const CameraInfo &camera : cameras)
         devices.append(camera.name.toUtf8());
 
     return devices;
@@ -651,7 +653,8 @@ QList<QByteArray> QGstUtils::cameraDevices(GstElementFactory * factory)
 
 QString QGstUtils::cameraDescription(const QString &device, GstElementFactory * factory)
 {
-    foreach (const CameraInfo &camera, enumerateCameras(factory)) {
+    const auto cameras = enumerateCameras(factory);
+    for (const CameraInfo &camera : cameras) {
         if (camera.name == device)
             return camera.description;
     }
@@ -660,7 +663,8 @@ QString QGstUtils::cameraDescription(const QString &device, GstElementFactory *
 
 QCamera::Position QGstUtils::cameraPosition(const QString &device, GstElementFactory * factory)
 {
-    foreach (const CameraInfo &camera, enumerateCameras(factory)) {
+    const auto cameras = enumerateCameras(factory);
+    for (const CameraInfo &camera : cameras) {
         if (camera.name == device)
             return camera.position;
     }
@@ -669,7 +673,8 @@ QCamera::Position QGstUtils::cameraPosition(const QString &device, GstElementFac
 
 int QGstUtils::cameraOrientation(const QString &device, GstElementFactory * factory)
 {
-    foreach (const CameraInfo &camera, enumerateCameras(factory)) {
+    const auto cameras = enumerateCameras(factory);
+    for (const CameraInfo &camera : cameras) {
         if (camera.name == device)
             return camera.orientation;
     }
@@ -678,7 +683,8 @@ int QGstUtils::cameraOrientation(const QString &device, GstElementFactory * fact
 
 QByteArray QGstUtils::cameraDriver(const QString &device, GstElementFactory *factory)
 {
-    foreach (const CameraInfo &camera, enumerateCameras(factory)) {
+    const auto cameras = enumerateCameras(factory);
+    for (const CameraInfo &camera : cameras) {
         if (camera.name == device)
             return camera.driver;
     }
@@ -749,8 +755,8 @@ QSet<QString> QGstUtils::supportedMimeTypes(bool (*isValidFactory)(GstElementFac
                             if (value) {
                                 gchar *str = gst_value_serialize(value);
                                 QString versions(str);
-                                QStringList elements = versions.split(QRegExp("\\D+"), QString::SkipEmptyParts);
-                                foreach (const QString &e, elements)
+                                const QStringList elements = versions.split(QRegExp("\\D+"), QString::SkipEmptyParts);
+                                for (const QString &e : elements)
                                     supportedMimeTypes.insert(nameLowcase + e);
                                 g_free(str);
                             }
@@ -768,7 +774,7 @@ QSet<QString> QGstUtils::supportedMimeTypes(bool (*isValidFactory)(GstElementFac
     QStringList list = supportedMimeTypes.toList();
     list.sort();
     if (qgetenv("QT_DEBUG_PLUGINS").toInt() > 0) {
-        foreach (const QString &type, list)
+        for (const QString &type : qAsConst(list))
             qDebug() << type;
     }
 #endif
@@ -1110,7 +1116,7 @@ GstCaps *QGstUtils::capsForFormats(const QList<QVideoFrame::PixelFormat> &format
     GstCaps *caps = gst_caps_new_empty();
 
 #if GST_CHECK_VERSION(1,0,0)
-    foreach (QVideoFrame::PixelFormat format, formats) {
+    for (QVideoFrame::PixelFormat format : formats) {
         int index = indexOfVideoFormat(format);
 
         if (index != -1) {
@@ -1121,7 +1127,7 @@ GstCaps *QGstUtils::capsForFormats(const QList<QVideoFrame::PixelFormat> &format
         }
     }
 #else
-    foreach (QVideoFrame::PixelFormat format, formats) {
+    for (QVideoFrame::PixelFormat format : formats) {
         int index = indexOfYuvColor(format);
 
         if (index != -1) {
diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp
index 31ac94e86..8f71e4ac7 100644
--- a/src/gsttools/qgstvideorenderersink.cpp
+++ b/src/gsttools/qgstvideorenderersink.cpp
@@ -119,7 +119,8 @@ QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(QAbstractVideoSurface *surfac
     , m_stop(false)
     , m_flush(false)
 {
-    foreach (QObject *instance, rendererLoader()->instances(QGstVideoRendererPluginKey)) {
+    const auto instances = rendererLoader()->instances(QGstVideoRendererPluginKey);
+    for (QObject *instance : instances) {
         QGstVideoRendererInterface* plugin = qobject_cast<QGstVideoRendererInterface*>(instance);
         if (QGstVideoRenderer *renderer = plugin ? plugin->createRenderer() : 0)
             m_renderers.append(renderer);
@@ -369,7 +370,7 @@ void QVideoSurfaceGstDelegate::updateSupportedFormats()
         m_surfaceCaps = 0;
     }
 
-    foreach (QGstVideoRenderer *pool, m_renderers) {
+    for (QGstVideoRenderer *pool : qAsConst(m_renderers)) {
         if (GstCaps *caps = pool->getCaps(m_surface)) {
             if (gst_caps_is_empty(caps)) {
                 gst_caps_unref(caps);
diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp
index d59709723..2f61770ce 100644
--- a/src/gsttools/qvideosurfacegstsink.cpp
+++ b/src/gsttools/qvideosurfacegstsink.cpp
@@ -65,7 +65,8 @@ QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(
     , m_startCanceled(false)
 {
     if (m_surface) {
-        foreach (QObject *instance, bufferPoolLoader()->instances(QGstBufferPoolPluginKey)) {
+        const auto instances = bufferPoolLoader()->instances(QGstBufferPoolPluginKey);
+        for (QObject *instance : instances) {
             QGstBufferPoolInterface* plugin = qobject_cast<QGstBufferPoolInterface*>(instance);
 
             if (plugin) {
@@ -302,7 +303,7 @@ void QVideoSurfaceGstDelegate::queuedRender()
 void QVideoSurfaceGstDelegate::updateSupportedFormats()
 {
     QGstBufferPoolInterface *newPool = 0;
-    foreach (QGstBufferPoolInterface *pool, m_pools) {
+    for (QGstBufferPoolInterface *pool : qAsConst(m_pools)) {
         if (!m_surface->supportedPixelFormats(pool->handleType()).isEmpty()) {
             newPool = pool;
             break;
@@ -503,7 +504,8 @@ GstCaps *QVideoSurfaceGstSink::get_caps(GstBaseSink *base)
     sink->delegate->poolMutex()->unlock();
 
     supportedFormats = poolHandleFormats;
-    foreach (QVideoFrame::PixelFormat format, sink->delegate->supportedPixelFormats()) {
+    const auto supportedPixelFormats = sink->delegate->supportedPixelFormats();
+    for (QVideoFrame::PixelFormat format : supportedPixelFormats) {
         if (!poolHandleFormats.contains(format))
             supportedFormats.append(format);
     }