From 720cea21f352933fa5d36d4b6faff11799c604f2 Mon Sep 17 00:00:00 2001 From: Daniel Robertson Date: Fri, 14 Aug 2015 21:35:00 -0400 Subject: canvas: replace for_each with range-based for-loop Replace ::std::for_each for a more readable range-based for loop in cases in which the function object to be applied by for_each is more readable as the body of a for loop. Change-Id: I5ea0f6a464855b8cc8af38f211bb784dd91eca0d Reviewed-on: https://gerrit.libreoffice.org/17775 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- canvas/source/opengl/ogl_canvashelper.cxx | 5 ++--- canvas/source/opengl/ogl_spritedevicehelper.cxx | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'canvas/source/opengl') diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 4ecf9914174b..1534f7c3b10a 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -800,9 +800,8 @@ namespace oglcanvas } // own copy, for thread safety - std::for_each(rAct.maPolyPolys.begin(), - rAct.maPolyPolys.end(), - ::boost::mem_fn(&::basegfx::B2DPolyPolygon::makeUnique)); + for( auto& rPoly : rAct.maPolyPolys ) + rPoly.makeUnique(); rAct.maFunction = &lcl_fillPolyPolygon; } diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index e5da0f23d1a4..3c58b4051bb5 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -293,9 +293,8 @@ namespace oglcanvas std::sort(aSprites.begin(), aSprites.end(), SpriteComparator()); - std::for_each(aSprites.begin(), - aSprites.end(), - std::mem_fn(&CanvasCustomSprite::renderSprite)); + for( const auto& rSprite : aSprites ) + rSprite->renderSprite(); // frame counter, other info -- cgit