diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:23:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:39 +0100 |
| commit | b6fe760beb512cafdb5e6fa5b03b3ed8746b612c (patch) | |
| tree | d837c6d2b02f756c977168c019ad6c21a087d55e /slideshow/source/engine/transitions | |
| parent | 7a8d48f57d106005be80e37ac74e8e2544ad83fe (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: Ief4dd31d68bd7c8e45070eea689d07057449ce77
Diffstat (limited to 'slideshow/source/engine/transitions')
3 files changed, 6 insertions, 6 deletions
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 68e5e234aa45..8837ec8e7862 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -208,7 +208,7 @@ AnimationActivitySharedPtr createShapeTransitionByType( getTransitionInfo( nType, nSubType ) ); AnimationActivitySharedPtr pGeneratedActivity; - if( pTransitionInfo != NULL ) + if( pTransitionInfo != nullptr ) { switch( pTransitionInfo->meTransitionClass ) { @@ -251,7 +251,7 @@ AnimationActivitySharedPtr createShapeTransitionByType( const TransitionInfo* pRandomTransitionInfo( getRandomTransitionInfo() ); - ENSURE_OR_THROW( pRandomTransitionInfo != NULL, + ENSURE_OR_THROW( pRandomTransitionInfo != nullptr, "createShapeTransitionByType(): Got invalid random transition info" ); ENSURE_OR_THROW( pRandomTransitionInfo->mnTransitionType != animations::TransitionType::RANDOM, diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index e71592f5d862..e40cd310354f 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -687,7 +687,7 @@ NumberAnimationSharedPtr createPushWipeTransition( const SoundPlayerSharedPtr& pSoundPlayer ) { boost::optional<SlideSharedPtr> leavingSlide; // no bitmap - if (leavingSlide_ && (*leavingSlide_).get() != 0) + if (leavingSlide_ && (*leavingSlide_).get() != nullptr) { // opt: only page, if we've an // actual slide to move out here. We @@ -957,7 +957,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( const TransitionInfo* pTransitionInfo( getTransitionInfo( nTransitionType, nTransitionSubType ) ); - if( pTransitionInfo != NULL ) + if( pTransitionInfo != nullptr ) { switch( pTransitionInfo->meTransitionClass ) { @@ -1010,7 +1010,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( getRandomTransitionInfo() ); ENSURE_OR_THROW( - pRandomTransitionInfo != NULL, + pRandomTransitionInfo != nullptr, "TransitionFactory::createSlideTransition(): " "Got invalid random transition info" ); diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx index a3d814534255..b17cd6626aa5 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.cxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx @@ -2122,7 +2122,7 @@ const TransitionInfo* getTransitionInfo( if (pRes != pTableEnd) return pRes; else - return NULL; + return nullptr; } const TransitionInfo* getRandomTransitionInfo() |