diff options
| author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-08-07 22:57:07 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-11 13:29:20 +0000 |
| commit | 647b5aecd4c3facc302df33386451dda732aab98 (patch) | |
| tree | f895a0f675f78214877ff7d7628c62ae8206fb5e | |
| parent | 9fbf4fd5292f6a3c28a092f7bb02541ceb61351f (diff) | |
tdf#92459 remove compat_functional from canvas
Replace all uses of deprecated features from the o3tl in
compat_functional.hxx with lambda expressions in canvas. There should
be no side effects due to this patch.
Change-Id: Ia08ff1642a4f64035441dfdbac03c6fb09fa0443
Reviewed-on: https://gerrit.libreoffice.org/17586
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | canvas/source/tools/spriteredrawmanager.cxx | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index e5c6182fc773..94d3d40fd45f 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -24,13 +24,10 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> #include <basegfx/vector/b2dsize.hxx> -#include <boost/bind.hpp> -#include <o3tl/compat_functional.hxx> #include <tools/diagnose_ex.h> #include <canvas/spriteredrawmanager.hxx> - namespace canvas { namespace @@ -411,12 +408,8 @@ namespace canvas ::basegfx::B2DRange aTrueArea( rUpdateArea.maComponentList.begin()->second.getUpdateArea() ); ::std::for_each( rUpdateArea.maComponentList.begin(), rUpdateArea.maComponentList.end(), - ::boost::bind( (void (basegfx::B2DRange::*)(const basegfx::B2DRange&))( - &basegfx::B2DRange::expand), - aTrueArea, - ::boost::bind( &SpriteInfo::getUpdateArea, - ::boost::bind( ::o3tl::select2nd<AreaComponent>(), - _1 ) ) ) ); + [&aTrueArea]( const ::std::pair< ::basegfx::B2DRange, SpriteInfo >& cp ) + { aTrueArea.expand(cp.second.getUpdateArea()); } ); const SpriteConnectedRanges::ComponentListType::const_iterator aEnd( rUpdateArea.maComponentList.end() ); @@ -425,10 +418,8 @@ namespace canvas // update will not be opaque. return ::std::none_of( rUpdateArea.maComponentList.begin(), aEnd, - ::boost::bind( &SpriteRedrawManager::isAreaUpdateNotOpaque, - this, - ::boost::cref(aTrueArea), - _1 ) ); + [&aTrueArea, this]( const ::std::pair< ::basegfx::B2DRange, SpriteInfo >& cp ) + { return this->isAreaUpdateNotOpaque(aTrueArea, cp); } ); } bool SpriteRedrawManager::areSpritesChanged( const UpdateArea& rUpdateArea ) const @@ -442,10 +433,8 @@ namespace canvas rUpdateArea.maComponentList.end() ); return ::std::any_of( rUpdateArea.maComponentList.begin(), aEnd, - ::boost::bind( &SpriteInfo::needsUpdate, - ::boost::bind( - ::o3tl::select2nd<SpriteConnectedRanges::ComponentType>(), - _1 ) ) ); + []( const ::std::pair< ::basegfx::B2DRange, SpriteInfo >& cp ) + { return cp.second.needsUpdate(); } ); } SpriteRedrawManager::SpriteRedrawManager() : |