summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-12-05 08:59:33 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-12-05 08:59:33 +0100
commitfbb3f88df5b9ee64f2aacbe758a481c5d91d0fed (patch)
treef46048fdec2356ebd7721a0c1248f4e027e89f90 /slideshow
parent96918103a07ae984befceb4dc579b004216bbc9f (diff)
loplugin:unnecessaryoverride (dtors) in slideshow
Change-Id: I5c4bc26bc51347e453ce69913edc52cf1f1aa821
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/effectrewinder.cxx4
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx6
2 files changed, 2 insertions, 8 deletions
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index 19106567127b..96ba0e048281 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -43,7 +43,7 @@ class RewinderEventHandler : public EventHandler
public:
typedef ::std::function<bool ()> Action;
explicit RewinderEventHandler (const Action& rAction) : maAction(rAction) {}
- virtual ~RewinderEventHandler() override {}
+
private:
const Action maAction;
virtual bool handleEvent() override { return maAction(); }
@@ -55,7 +55,7 @@ class RewinderAnimationEventHandler : public AnimationEventHandler
public:
typedef ::std::function<bool (const AnimationNodeSharedPtr& rpNode)> Action;
explicit RewinderAnimationEventHandler (const Action& rAction) : maAction(rAction) {}
- virtual ~RewinderAnimationEventHandler() override {}
+
private:
const Action maAction;
virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode) override
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 63d1787474cb..0ca3695d8b99 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -131,8 +131,6 @@ double ScrollTextAnimNode::GetStateAtRelativeTime(
class ActivityImpl : public Activity
{
public:
- virtual ~ActivityImpl() override;
-
ActivityImpl(
SlideShowContext const& rContext,
std::shared_ptr<WakeupEvent> const& pWakeupEvent,
@@ -849,10 +847,6 @@ bool ActivityImpl::enableAnimations()
return maContext.mrActivitiesQueue.addActivity( std::dynamic_pointer_cast<Activity>(shared_from_this()) );
}
-ActivityImpl::~ActivityImpl()
-{
-}
-
void ActivityImpl::dispose()
{
if( !mbIsDisposed )