From 3dcf6dfceee58360501396390d78c006351aef47 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 2 Aug 2017 12:57:55 +0200 Subject: remove unnecessary use of 'this->' Change-Id: I5c115389af7d24c18ddaf5fbec8c00f35017a5b4 Reviewed-on: https://gerrit.libreoffice.org/40671 Tested-by: Jenkins Reviewed-by: Noel Grandin --- slideshow/source/engine/activities/activitybase.cxx | 2 +- slideshow/source/engine/eventqueue.cxx | 2 +- slideshow/source/engine/slide/layermanager.cxx | 2 +- slideshow/source/engine/slide/shapemanagerimpl.cxx | 4 ++-- slideshow/source/engine/slide/slideimpl.cxx | 2 +- slideshow/source/engine/slide/userpaintoverlay.cxx | 18 +++++++++--------- .../source/engine/transitions/slidechangebase.cxx | 2 +- slideshow/source/engine/waitsymbol.cxx | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index 31b6854091f3..e00845bc3501 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -132,7 +132,7 @@ namespace slideshow if (mbFirstPerformCall) { mbFirstPerformCall = false; // notify derived classes that we're starting now - this->startAnimation(); + startAnimation(); } performEnd(); // calling private virtual diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index b202f4d3a6e8..df2ce3cdf3cb 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -41,7 +41,7 @@ namespace slideshow { // negate comparison, we want priority queue to be sorted // in increasing order of activation times - return this->nTime > rEvent.nTime; + return nTime > rEvent.nTime; } diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 1dccc7037ea1..2a12f0543e5e 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -88,7 +88,7 @@ namespace slideshow // init views for( const auto& rView : mrViews ) - this->viewAdded( rView ); + viewAdded( rView ); } void LayerManager::activate() diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 15c7a0d7c720..e15936e685ea 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -64,11 +64,11 @@ void ShapeManagerImpl::activate() // clone listener map uno::Reference xDummyListener; for( const auto& rListener : mrGlobalListenersMap ) - this->listenerAdded( xDummyListener, rListener.first ); + listenerAdded( xDummyListener, rListener.first ); // clone cursor map for( const auto& rListener : mrGlobalCursorMap ) - this->cursorChanged( rListener.first, rListener.second ); + cursorChanged( rListener.first, rListener.second ); if( mpLayerManager ) mpLayerManager->activate(); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 8f4ae3001a7b..0c51937b2b82 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -364,7 +364,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDra { // clone already existing views for slide bitmaps for( const auto& rView : rViewContainer ) - this->viewAdded( rView ); + viewAdded( rView ); // register screen update (LayerManager needs to signal pending // updates) diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 48b52dc956b2..27c4625839a0 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -75,7 +75,7 @@ namespace slideshow mbActive( bActive ) { for( const auto& rView : rViews ) - this->viewAdded( rView ); + viewAdded( rView ); drawPolygons(); } @@ -114,14 +114,14 @@ namespace slideshow { mbIsLastPointValid = false; mbActive = true; - this->maStrokeColor = rUserColor; - this->mbIsEraseModeActivated = false; + maStrokeColor = rUserColor; + mbIsEraseModeActivated = false; return true; } bool widthChanged( double nUserStrokeWidth ) override { - this->mnStrokeWidth = nUserStrokeWidth; + mnStrokeWidth = nUserStrokeWidth; mbIsEraseModeActivated = false; return true; } @@ -163,7 +163,7 @@ namespace slideshow bool eraseAllInkChanged( bool bEraseAllInk ) override { - this->mbIsEraseAllModeActivated = bEraseAllInk; + mbIsEraseAllModeActivated = bEraseAllInk; // if the erase all mode is activated it will remove all ink from slide, // therefore destroy all the polygons stored if(mbIsEraseAllModeActivated) @@ -180,9 +180,9 @@ namespace slideshow bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) override { // Change the size - this->mnSize=rEraseInkSize; + mnSize=rEraseInkSize; // Changed to mode Erase - this->mbIsEraseModeActivated = true; + mbIsEraseModeActivated = true; return true; } @@ -190,7 +190,7 @@ namespace slideshow { mbIsLastPointValid = false; mbActive = true; - this->mbIsEraseModeActivated = false; + mbIsEraseModeActivated = false; return true; } @@ -198,7 +198,7 @@ namespace slideshow { mbIsLastPointValid = false; mbActive = true; - this->mbIsEraseModeActivated = true; + mbIsEraseModeActivated = true; return true; } diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index cdc1d22134c8..9ea21486e5ed 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -180,7 +180,7 @@ void SlideChangeBase::prefetch( const AnimatableShapeSharedPtr&, // init views and create slide bitmaps for( const auto& pView : mrViewContainer ) - this->viewAdded( pView ); + viewAdded( pView ); mbPrefetched = true; } diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 918ca961e04c..aeecd72caa74 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -67,7 +67,7 @@ WaitSymbol::WaitSymbol( uno::Reference const & xBitmap, mbVisible(false) { for( const auto& pView : rViewContainer ) - this->viewAdded( pView ); + viewAdded( pView ); } void WaitSymbol::setVisible( const bool bVisible ) -- cgit