summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/camera/dscamerasession.cpp
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/camera/dscamerasession.cpp
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/camera/dscamerasession.cpp')
-rw-r--r--src/plugins/directshow/camera/dscamerasession.cpp8
1 files changed, 4 insertions, 4 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);