diff options
author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-01-15 11:23:38 +0300 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2016-01-15 13:58:57 +0000 |
commit | 2e78cf2213c006a96979c5c15534a3263da66995 (patch) | |
tree | e569745836551b3b7e8ed5a89c98a05895af5d20 /src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp | |
parent | 122de0fdc30ffbef569a61710693059a8eded8e0 (diff) | |
download | qtmultimedia-2e78cf2213c006a96979c5c15534a3263da66995.tar.gz |
Gstreamer plugin: replace foreach with range-based for
Change-Id: Ic6d0f9d6b45eae1cdadc46783cb6f5bb7c64ac8c
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp index 745536e87..f76c2c2a3 100644 --- a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp @@ -127,13 +127,17 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe } QSet<ResourcePolicy::ResourceType> currentTypes; - foreach (ResourcePolicy::Resource *resource, m_resource->resources()) + const auto resources = m_resource->resources(); + currentTypes.reserve(resources.size()); + for (ResourcePolicy::Resource *resource : resources) currentTypes << resource->type(); - foreach (ResourcePolicy::ResourceType resourceType, currentTypes - requestedTypes) + const auto diffCurrentWithRequested = currentTypes - requestedTypes; + for (ResourcePolicy::ResourceType resourceType : diffCurrentWithRequested) m_resource->deleteResource(resourceType); - foreach (ResourcePolicy::ResourceType resourceType, requestedTypes - currentTypes) { + const auto diffRequestedWithCurrent = requestedTypes - currentTypes; + for (ResourcePolicy::ResourceType resourceType : diffRequestedWithCurrent) { if (resourceType == ResourcePolicy::LensCoverType) { ResourcePolicy::LensCoverResource *lensCoverResource = new ResourcePolicy::LensCoverResource; lensCoverResource->setOptional(true); @@ -169,7 +173,8 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe bool CamerabinResourcePolicy::isResourcesGranted() const { #ifdef HAVE_RESOURCE_POLICY - foreach (ResourcePolicy::Resource *resource, m_resource->resources()) + const auto resources = m_resource->resources(); + for (ResourcePolicy::Resource *resource : resources) if (!resource->isOptional() && !resource->isGranted()) return false; #endif @@ -218,7 +223,8 @@ void CamerabinResourcePolicy::updateCanCapture() const bool wasAbleToRecord = m_canCapture; m_canCapture = (m_resourceSet == VideoCaptureResources) || (m_resourceSet == ImageCaptureResources); #ifdef HAVE_RESOURCE_POLICY - foreach (ResourcePolicy::Resource *resource, m_resource->resources()) { + const auto resources = m_resource->resources(); + for (ResourcePolicy::Resource *resource : resources) { if (resource->type() != ResourcePolicy::LensCoverType) m_canCapture = m_canCapture && resource->isGranted(); } |