diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-08-12 06:46:46 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-08-12 06:48:43 +0200 |
commit | 1e4b29e1ad16e908f550eae035c3fae8e56831dd (patch) | |
tree | 3280bf93e3d134741c440680314f9a26ce9e8063 /slideshow | |
parent | 87130a4e18347d055331ff53da3b1a79548ff24a (diff) |
Range-based for-loops.
Change-Id: I6fb0d182dfccb3af42f0bbc60969c72df09b6ce6
Diffstat (limited to 'slideshow')
-rw-r--r-- | slideshow/source/engine/slide/layermanager.cxx | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 7f25df5715a8..2440672330b8 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -142,28 +142,19 @@ namespace slideshow // for all shapes, though. const bool bMoreThanOneLayer(maLayers.size() > 1); - if( mnActiveSprites || bMoreThanOneLayer ) + if (mnActiveSprites || bMoreThanOneLayer) { // clear all viewlayers, dump everything but the // background layer - this will also remove all shape // sprites - std::for_each( maAllShapes.begin(), - maAllShapes.end(), - []( const LayerShapeMap::value_type& cp ) - { cp.first->clearAllViewLayers(); } ); - - for (LayerShapeMap::iterator - iShape (maAllShapes.begin()), - iEnd (maAllShapes.end()); - iShape!=iEnd; - ++iShape) - { - iShape->second.reset(); - } + for (auto& rShape : maAllShapes) + rShape.first->clearAllViewLayers(); + + for (auto& rShape : maAllShapes) + rShape.second.reset(); - if( bMoreThanOneLayer ) - maLayers.erase(maLayers.begin()+1, - maLayers.end()); + if (bMoreThanOneLayer) + maLayers.erase(maLayers.begin() + 1, maLayers.end()); mbLayerAssociationDirty = true; } |