DirectShow plugin: replace foreach with range-based for

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

6 files changed, 13 insertions, 12 deletions

diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index 2d3aa1bce..24dad94c5 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -257,7 +257,7 @@ bool DSCameraSession::unload()
 
     m_needsHorizontalMirroring = false;
     m_supportedViewfinderSettings.clear();
-    Q_FOREACH (AM_MEDIA_TYPE f, m_supportedFormats)
+    for (AM_MEDIA_TYPE f : qAsConst(m_supportedFormats))
         _FreeMediaType(f);
     m_supportedFormats.clear();
     SAFE_RELEASE(m_sourceFilter);
@@ -642,7 +642,7 @@ bool DSCameraSession::configurePreviewFormat()
     // Resolve viewfinder settings
     int settingsIndex = 0;
     QCameraViewfinderSettings resolvedViewfinderSettings;
-    Q_FOREACH (const QCameraViewfinderSettings &s, m_supportedViewfinderSettings) {
+    for (const QCameraViewfinderSettings &s : qAsConst(m_supportedViewfinderSettings)) {
         if ((m_viewfinderSettings.resolution().isEmpty() || m_viewfinderSettings.resolution() == s.resolution())
                 && (qFuzzyIsNull(m_viewfinderSettings.minimumFrameRate()) || qFuzzyCompare((float)m_viewfinderSettings.minimumFrameRate(), (float)s.minimumFrameRate()))
                 && (qFuzzyIsNull(m_viewfinderSettings.maximumFrameRate()) || qFuzzyCompare((float)m_viewfinderSettings.maximumFrameRate(), (float)s.maximumFrameRate()))
@@ -803,7 +803,7 @@ void DSCameraSession::updateSourceCapabilities()
 
     m_supportedViewfinderSettings.clear();
     m_needsHorizontalMirroring = false;
-    Q_FOREACH (AM_MEDIA_TYPE f, m_supportedFormats)
+    for (AM_MEDIA_TYPE f : qAsConst(m_supportedFormats))
         _FreeMediaType(f);
     m_supportedFormats.clear();
 
@@ -894,7 +894,7 @@ void DSCameraSession::updateSourceCapabilities()
                                                                    qreal(10000000) / scc.MinFrameInterval));
                 }
 
-                Q_FOREACH (const QCamera::FrameRateRange &frameRateRange, frameRateRanges) {
+                for (const QCamera::FrameRateRange &frameRateRange : qAsConst(frameRateRanges)) {
                     QCameraViewfinderSettings settings;
                     settings.setResolution(resolution);
                     settings.setMinimumFrameRate(frameRateRange.minimumFrameRate);
diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp
index 4af38b1cc..839271219 100644
--- a/src/plugins/directshow/dsserviceplugin.cpp
+++ b/src/plugins/directshow/dsserviceplugin.cpp
@@ -137,7 +137,7 @@ QList<QByteArray> DSServicePlugin::devices(const QByteArray &service) const
 #ifdef QMEDIA_DIRECTSHOW_CAMERA
     if (service == Q_MEDIASERVICE_CAMERA) {
         const QList<DSVideoDeviceInfo> &devs = DSVideoDeviceControl::availableDevices();
-        Q_FOREACH (const DSVideoDeviceInfo &info, devs)
+        for (const DSVideoDeviceInfo &info : devs)
             result.append(info.first);
     }
 #endif
@@ -150,7 +150,7 @@ QString DSServicePlugin::deviceDescription(const QByteArray &service, const QByt
 #ifdef QMEDIA_DIRECTSHOW_CAMERA
     if (service == Q_MEDIASERVICE_CAMERA) {
         const QList<DSVideoDeviceInfo> &devs = DSVideoDeviceControl::availableDevices();
-        Q_FOREACH (const DSVideoDeviceInfo &info, devs) {
+        for (const DSVideoDeviceInfo &info : devs) {
             if (info.first == device)
                 return info.second;
         }
diff --git a/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp b/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp
index d063447e3..a240f6c5f 100644
--- a/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp
+++ b/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp
@@ -54,7 +54,7 @@ DirectShowAudioEndpointControl::DirectShowAudioEndpointControl(
 
 DirectShowAudioEndpointControl::~DirectShowAudioEndpointControl()
 {
-    foreach (IMoniker *moniker, m_devices)
+    for (IMoniker *moniker : qAsConst(m_devices))
         moniker->Release();
 
     if (m_bindContext)
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index 3f58be249..3da02aa45 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -493,7 +493,8 @@ void DirectShowMetaDataControl::updateGraph(IFilterGraph2 *graph, IBaseFilter *s
     IWMHeaderInfo *info = com_cast<IWMHeaderInfo>(source, IID_IWMHeaderInfo);
 
     if (info) {
-        Q_FOREACH (const QWMMetaDataKey &key, *qt_wmMetaDataKeys()) {
+        const auto keys = *qt_wmMetaDataKeys();
+        for (const QWMMetaDataKey &key : keys) {
             QVariant var = getValue(info, key.wmName);
             if (var.isValid()) {
                 if (key.qtName == QMediaMetaData::Duration) {
diff --git a/src/plugins/directshow/player/directshowpinenum.cpp b/src/plugins/directshow/player/directshowpinenum.cpp
index 1119cb690..d47fe19fc 100644
--- a/src/plugins/directshow/player/directshowpinenum.cpp
+++ b/src/plugins/directshow/player/directshowpinenum.cpp
@@ -39,13 +39,13 @@ DirectShowPinEnum::DirectShowPinEnum(const QList<IPin *> &pins)
     , m_pins(pins)
     , m_index(0)
 {
-    foreach (IPin *pin, m_pins)
+    for (IPin *pin : qAsConst(m_pins))
         pin->AddRef();
 }
 
 DirectShowPinEnum::~DirectShowPinEnum()
 {
-    foreach (IPin *pin, m_pins)
+    for (IPin *pin : qAsConst(m_pins))
         pin->Release();
 }
 
diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp
index 1fa7329cc..d53e9187c 100644
--- a/src/plugins/directshow/player/videosurfacefilter.cpp
+++ b/src/plugins/directshow/player/videosurfacefilter.cpp
@@ -582,7 +582,7 @@ void VideoSurfaceFilter::supportedFormatsChanged()
     static const GUID none = {
         0xe436eb8e, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70} };
 
-    QList<QVideoFrame::PixelFormat> formats = m_surface->supportedPixelFormats();
+    const QList<QVideoFrame::PixelFormat> formats = m_surface->supportedPixelFormats();
 
     QVector<AM_MEDIA_TYPE> mediaTypes;
     mediaTypes.reserve(formats.count());
@@ -597,7 +597,7 @@ void VideoSurfaceFilter::supportedFormatsChanged()
     type.cbFormat = 0;
     type.pbFormat = 0;
 
-    foreach (QVideoFrame::PixelFormat format, formats) {
+    for (QVideoFrame::PixelFormat format : formats) {
         type.subtype = DirectShowMediaType::convertPixelFormat(format);
 
         if (type.subtype != none)