summaryrefslogtreecommitdiff
path: root/slideshow/source/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-01-24 13:21:10 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-01-25 07:06:10 +0100
commitcee62b1068775b7d0bcd2875e9789c8c36c22057 (patch)
treec093300a02cc6dc5db73ba0a51067cc480ddfdf5 /slideshow/source/inc
parenta46e768810e82abaf98e5cef02c697c718877974 (diff)
loplugin:makeshared in slideshow
Change-Id: I87dead1ed09aa50c939c03ae8ed3faf9300a8b4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87354 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow/source/inc')
-rw-r--r--slideshow/source/inc/delayevent.hxx4
-rw-r--r--slideshow/source/inc/interruptabledelayevent.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 1389b806885e..9585910bf689 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -78,7 +78,7 @@ private:
template <typename FuncT>
inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, OUString const& rsDescription )
{
- return EventSharedPtr( new Delay( func, nTimeout, rsDescription ) );
+ return std::make_shared<Delay>( func, nTimeout, rsDescription );
}
/** Generate immediate event
@@ -91,7 +91,7 @@ inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, OUString c
template <typename FuncT>
inline EventSharedPtr makeEvent_( FuncT const& func, OUString const& rsDescription)
{
- return EventSharedPtr( new Delay( func, 0.0, rsDescription ) );
+ return std::make_shared<Delay>( func, 0.0, rsDescription );
}
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index 2d79625ee897..ee2ae17dfb15 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -129,8 +129,8 @@ namespace slideshow
InterruptableEventPair aRes;
aRes.mpImmediateEvent = makeEvent( rFunctor, "makeInterruptableDelay");
- aRes.mpTimeoutEvent.reset( new DelayFacade( aRes.mpImmediateEvent,
- nTimeout ) );
+ aRes.mpTimeoutEvent = std::make_shared<DelayFacade>( aRes.mpImmediateEvent,
+ nTimeout );
return aRes;
}