Kaydet (Commit) 647b5aec authored tarafından Daniel Robertson's avatar Daniel Robertson Kaydeden (comit) Caolán McNamara

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/17586Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 9fbf4fd5
......@@ -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() :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment