From 2c587f08edaec09d5af53504c916c4dee0617555 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 11 Aug 2015 09:21:56 +0200 Subject: slideshow: prefer value_type over manual type generation Change-Id: I3e088a10e7bc0da73e4fa20db15e71581661fe4b Reviewed-on: https://gerrit.libreoffice.org/17641 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- slideshow/source/engine/pointersymbol.cxx | 4 ++-- slideshow/source/engine/rehearsetimingsactivity.cxx | 4 ++-- slideshow/source/engine/slide/layermanager.cxx | 4 ++-- slideshow/source/engine/slide/shapemanagerimpl.cxx | 6 ++---- slideshow/source/engine/slide/slideimpl.cxx | 4 ++-- slideshow/source/engine/waitsymbol.cxx | 4 ++-- slideshow/test/testshape.cxx | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx index 7b33333edd6f..c63f8fe80a63 100644 --- a/slideshow/source/engine/pointersymbol.cxx +++ b/slideshow/source/engine/pointersymbol.cxx @@ -145,7 +145,7 @@ void PointerSymbol::viewRemoved( const UnoViewSharedPtr& rView ) std::remove_if( maViews.begin(), maViews.end(), [&rView] - ( const ::std::pair< UnoViewSharedPtr, cppcanvas::CustomSpriteSharedPtr >& cp ) + ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ), maViews.end() ); } @@ -158,7 +158,7 @@ void PointerSymbol::viewChanged( const UnoViewSharedPtr& rView ) maViews.begin(), maViews.end(), [&rView] - ( const ::std::pair< UnoViewSharedPtr, cppcanvas::CustomSpriteSharedPtr >& cp ) + ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ) ); OSL_ASSERT( aModifiedEntry != maViews.end() ); diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 966bfc37d421..0bebe2aea039 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -356,7 +356,7 @@ void RehearseTimingsActivity::viewRemoved( const UnoViewSharedPtr& rView ) maViews.erase( std::remove_if( maViews.begin(), maViews.end(), [&rView] - ( const ::std::pair< UnoViewSharedPtr, cppcanvas::CustomSpriteSharedPtr >& cp ) + ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ), maViews.end() ); } @@ -369,7 +369,7 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView ) maViews.begin(), maViews.end(), [&rView] - ( const ::std::pair< UnoViewSharedPtr, cppcanvas::CustomSpriteSharedPtr >& cp ) + ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ) ); diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index a0c53b948862..7f25df5715a8 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -149,7 +149,7 @@ namespace slideshow // sprites std::for_each( maAllShapes.begin(), maAllShapes.end(), - []( const ::std::pair< ShapeSharedPtr, LayerWeakPtr >& cp ) + []( const LayerShapeMap::value_type& cp ) { cp.first->clearAllViewLayers(); } ); for (LayerShapeMap::iterator @@ -258,7 +258,7 @@ namespace slideshow // render all shapes std::for_each( maAllShapes.begin(), maAllShapes.end(), - []( const ::std::pair< ShapeSharedPtr, LayerWeakPtr >& cp ) + []( const LayerShapeMap::value_type& cp ) { cp.first->render(); } ); } diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 796f1ce34124..a74253f647d4 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -66,15 +66,13 @@ void ShapeManagerImpl::activate( bool bSlideBackgoundPainted ) uno::Reference xDummyListener; std::for_each( mrGlobalListenersMap.begin(), mrGlobalListenersMap.end(), - [&xDummyListener, this]( const ::std::pair< ShapeEventListenerMap::key_type, - ShapeEventListenerMap::mapped_type >& cp ) + [&xDummyListener, this]( const ShapeEventListenerMap::value_type& cp ) { this->listenerAdded(xDummyListener, cp.first); } ); // clone cursor map std::for_each( mrGlobalCursorMap.begin(), mrGlobalCursorMap.end(), - [this]( const ::std::pair< ShapeCursorMap::key_type, - ShapeCursorMap::mapped_type >& cp ) + [this]( const ShapeCursorMap::value_type& cp ) { this->cursorChanged(cp.first, cp.second); } ); if( mpLayerManager ) diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 3972d5bad809..0d26285a5aec 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -581,7 +581,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r if( (aIter=std::find_if( maSlideBitmaps.begin(), aEnd, [&rView] - ( const ::std::pair< UnoViewSharedPtr, VectorOfSlideBitmaps >& cp ) + ( const VectorOfVectorOfSlideBitmaps::value_type& cp ) { return rView == cp.first; } ) ) == aEnd ) { // corresponding view not found - maybe view was not @@ -651,7 +651,7 @@ void SlideImpl::viewRemoved( const UnoViewSharedPtr& rView ) std::remove_if( maSlideBitmaps.begin(), aEnd, [&rView] - ( const ::std::pair< UnoViewSharedPtr, VectorOfSlideBitmaps >& cp ) + ( const VectorOfVectorOfSlideBitmaps::value_type& cp ) { return rView == cp.first; } ), aEnd ); } diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 9d5f285d226f..48da4c702c9c 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -150,7 +150,7 @@ void WaitSymbol::viewRemoved( const UnoViewSharedPtr& rView ) std::remove_if( maViews.begin(), maViews.end(), [&rView] - ( const ::std::pair< UnoViewSharedPtr, cppcanvas::CustomSpriteSharedPtr >& cp ) + ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ), maViews.end() ); } @@ -163,7 +163,7 @@ void WaitSymbol::viewChanged( const UnoViewSharedPtr& rView ) maViews.begin(), maViews.end(), [&rView] - ( const ::std::pair< UnoViewSharedPtr, cppcanvas::CustomSpriteSharedPtr >& cp ) + ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ) ); OSL_ASSERT( aModifiedEntry != maViews.end() ); diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index a64ac20cebd2..fbd1d2a27e5b 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -129,7 +129,7 @@ private: maViewLayers.begin(), maViewLayers.end(), [&rNewLayer] - ( const ::std::pair< ViewVector::key_type, ViewVector::mapped_type >& cp ) + ( const ViewVector::value_type& cp ) { return cp.first == rNewLayer; } ) ) throw std::exception(); @@ -138,7 +138,7 @@ private: maViewLayers.begin(), maViewLayers.end(), [&rNewLayer] - ( const ::std::pair< ViewVector::key_type, ViewVector::mapped_type >& cp ) + ( const ViewVector::value_type& cp ) { return cp.first == rNewLayer; } ) ); return true; } -- cgit