From 33e176552d0f4b6d343de72433963c44fa44f9ba Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 17 Oct 2019 14:42:29 +0200 Subject: loplugin:virtualdead unused param in Animation::prefetch Change-Id: I7eaf01548567ce560b0e32f222880d21b966c78d Reviewed-on: https://gerrit.libreoffice.org/81071 Tested-by: Jenkins Reviewed-by: Noel Grandin --- slideshow/source/engine/animationfactory.cxx | 9 +++------ slideshow/source/engine/animationnodes/animationcolornode.cxx | 3 +-- slideshow/source/engine/slideshowimpl.cxx | 4 +--- slideshow/source/engine/transitions/shapetransitionfactory.cxx | 6 ++---- slideshow/source/engine/transitions/slidechangebase.cxx | 9 ++++----- slideshow/source/engine/transitions/slidechangebase.hxx | 3 +-- slideshow/source/inc/animation.hxx | 3 +-- 7 files changed, 13 insertions(+), 24 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 4967bdc9c519..e1a02d083760 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -88,8 +88,7 @@ namespace slideshow // Animation interface - virtual void prefetch( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) override + virtual void prefetch() override {} virtual void start( const AnimatableShapeSharedPtr& rShape, @@ -242,8 +241,7 @@ namespace slideshow // Animation interface - virtual void prefetch( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) override + virtual void prefetch() override {} virtual void start( const AnimatableShapeSharedPtr& rShape, @@ -440,8 +438,7 @@ namespace slideshow // Animation interface - virtual void prefetch( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) + virtual void prefetch() {} virtual void start( const AnimatableShapeSharedPtr& rShape, diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx index 79850c84b7a9..4d6daeec3a05 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.cxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx @@ -49,8 +49,7 @@ public: "HSLWrapper::HSLWrapper(): Invalid color animation delegate" ); } - virtual void prefetch( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) override + virtual void prefetch() override {} virtual void start( const AnimatableShapeSharedPtr& rShape, diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index a3a5dbe112ca..f81e9e9fb278 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -852,9 +852,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( // reached final size maEventQueue.addEvent( makeEvent( [pTransition] () { - pTransition->prefetch( - AnimatableShapeSharedPtr(), - ShapeAttributeLayerSharedPtr()); }, + pTransition->prefetch(); }, "Animation::prefetch")); return ActivitySharedPtr( diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index d3054d4b9799..ffc008191193 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -63,8 +63,7 @@ public: // Animation interface - virtual void prefetch( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) override; + virtual void prefetch() override; virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) override; virtual void end() override; @@ -116,8 +115,7 @@ ClippingAnimation::~ClippingAnimation() } } -void ClippingAnimation::prefetch( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) +void ClippingAnimation::prefetch() { } diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index c75382d994ed..d97210963c6a 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -169,8 +169,7 @@ void SlideChangeBase::renderBitmap( pSlideBitmap->draw( pDevicePixelCanvas ); } -void SlideChangeBase::prefetch( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) +void SlideChangeBase::prefetch() { // we're a one-shot activity, and already finished if( mbFinished || mbPrefetched ) @@ -186,14 +185,14 @@ void SlideChangeBase::prefetch( const AnimatableShapeSharedPtr&, mbPrefetched = true; } -void SlideChangeBase::start( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rLayer ) +void SlideChangeBase::start( const AnimatableShapeSharedPtr& /*rShape*/, + const ShapeAttributeLayerSharedPtr& /*rLayer*/ ) { // we're a one-shot activity, and already finished if( mbFinished ) return; - prefetch(rShape,rLayer); // no-op, if already done + prefetch(); // no-op, if already done // get the subclasses a chance to do any specific initialization before run for ( ViewsVecT::const_iterator aCurr( beginViews() ), aEnd( endViews() ); aCurr != aEnd; ++aCurr ) diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index a0b8958360d9..0cb20b1a66b4 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -57,8 +57,7 @@ public: virtual double getUnderlyingValue() const override; // Animation - virtual void prefetch( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) override; + virtual void prefetch() override; virtual void start( const AnimatableShapeSharedPtr&, const ShapeAttributeLayerSharedPtr& ) override; virtual void end() override; diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx index b44d02dc36fc..b925e2ecf4c7 100644 --- a/slideshow/source/inc/animation.hxx +++ b/slideshow/source/inc/animation.hxx @@ -58,8 +58,7 @@ namespace slideshow @param rAttrLayer Attribute layer to play the animation on. */ - virtual void prefetch( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) = 0; + virtual void prefetch( ) = 0; /** Notify that the animation is about to begin. -- cgit v1.2.3