summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/player
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-15 11:51:58 +0300
committerYoann Lopes <yoann.lopes@theqtcompany.com>2016-01-15 13:57:36 +0000
commitd12d14a905a52a76d3960f040bdd2d16234fb05c (patch)
treed498620ed5f99bf6035d16f35620c2650f13db8e /src/plugins/directshow/player
parent559a05605cc622142b0fbe76bc8edd4ab0f86d50 (diff)
DirectShow plugin: replace foreach with range-based for
Change-Id: Id1a0b4d2c3defe254e503079faa8b35eaaba8c08 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/directshow/player')
-rw-r--r--src/plugins/directshow/player/directshowaudioendpointcontrol.cpp2
-rw-r--r--src/plugins/directshow/player/directshowmetadatacontrol.cpp3
-rw-r--r--src/plugins/directshow/player/directshowpinenum.cpp4
-rw-r--r--src/plugins/directshow/player/videosurfacefilter.cpp4
4 files changed, 7 insertions, 6 deletions
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)