diff options
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/effectrewinder.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/eventqueue.cxx | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index 8319856c1154..5a784a7fe7d0 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -207,7 +207,7 @@ bool EffectRewinder::rewind ( if (mpAsynchronousRewindEvent) mrEventQueue.addEvent(mpAsynchronousRewindEvent); - return mpAsynchronousRewindEvent.get()!=nullptr; + return bool(mpAsynchronousRewindEvent); } diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 5ed44f0efd44..6094fa43bf89 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -111,7 +111,7 @@ namespace slideshow::internal << " with delay " << rEvent->getActivationTime(0.0) ); - ENSURE_OR_RETURN_FALSE( rEvent.get() != nullptr, + ENSURE_OR_RETURN_FALSE( rEvent, "EventQueue::addEvent: event ptr NULL" ); maNextEvents.emplace_back( rEvent, rEvent->getActivationTime( mpTimer->getElapsedTime()) ); @@ -128,9 +128,7 @@ namespace slideshow::internal << " with delay " << rpEvent->getActivationTime(0.0) ); - ENSURE_OR_RETURN_FALSE( - rpEvent.get() != nullptr, - "EventQueue::addEvent: event ptr NULL"); + ENSURE_OR_RETURN_FALSE( rpEvent, "EventQueue::addEvent: event ptr NULL"); maNextNextEvents.push( EventEntry( |