summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/slide/layermanager.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow/source/engine/slide/layermanager.cxx')
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx14
1 files changed, 5 insertions, 9 deletions
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index c46b90245276..7e0279920b5d 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -488,13 +488,9 @@ namespace slideshow
if( mbLayerAssociationDirty || !maUpdateShapes.empty() )
return true;
- const LayerVector::const_iterator aEnd( maLayers.end() );
- if( std::find_if( maLayers.begin(),
- aEnd,
- boost::mem_fn(&Layer::isUpdatePending)) != aEnd )
- return true;
-
- return false;
+ return std::any_of( maLayers.begin(),
+ maLayers.end(),
+ boost::mem_fn(&Layer::isUpdatePending) );
}
bool LayerManager::updateSprites()
@@ -552,9 +548,9 @@ namespace slideshow
bRet = updateSprites();
// any non-sprite update areas left?
- if( std::find_if( maLayers.begin(),
+ if( std::none_of( maLayers.begin(),
maLayers.end(),
- boost::mem_fn( &Layer::isUpdatePending )) == maLayers.end() )
+ boost::mem_fn( &Layer::isUpdatePending ) ) )
return bRet; // nope, done.
// update each shape on each layer, that has