diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-03 12:08:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-03 14:42:43 +0200 |
| commit | 41aad592685b0b36c2e5f1033e7263aef406c28b (patch) | |
| tree | dbc83f9a33f1d714327dc2da5e8d9ecdaaddf87a /slideshow | |
| parent | 4afb80eaa0df58b78e2bfad892f9e7ce5e1bce7a (diff) | |
clang-tidy modernize-pass-by-value in slideshow
Change-Id: I89a56aa3d267f22665769ba073a47d1208d8b55d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137745
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow')
61 files changed, 230 insertions, 183 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 2dadfea49e1c..eb0f6fdd0840 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -38,6 +38,7 @@ #include <optional> #include <memory> +#include <utility> #include <vector> #include <algorithm> @@ -140,15 +141,15 @@ public: value, or start fresh each time. */ FromToByActivity( - const OptionalValueType& rFrom, + OptionalValueType aFrom, const OptionalValueType& rTo, const OptionalValueType& rBy, const ActivityParameters& rParms, - const ::std::shared_ptr< AnimationType >& rAnim, + ::std::shared_ptr< AnimationType > xAnim, const Interpolator< ValueType >& rInterpolator, bool bCumulative ) : BaseType( rParms ), - maFrom( rFrom ), + maFrom(std::move( aFrom )), maTo( rTo ), maBy( rBy ), mpFormula( rParms.mpFormula ), @@ -157,7 +158,7 @@ public: maPreviousValue(), maStartInterpolationValue(), mnIteration( 0 ), - mpAnim( rAnim ), + mpAnim(std::move( xAnim )), maInterpolator( rInterpolator ), mbDynamicStartValue( false ), mbCumulative( bCumulative ) @@ -508,13 +509,13 @@ public: ValuesActivity( const ValueVectorType& rValues, const ActivityParameters& rParms, - const std::shared_ptr<AnimationType>& rAnim, + std::shared_ptr<AnimationType> xAnim, const Interpolator< ValueType >& rInterpolator, bool bCumulative ) : BaseType( rParms ), maValues( rValues ), mpFormula( rParms.mpFormula ), - mpAnim( rAnim ), + mpAnim(std::move( xAnim )), maInterpolator( rInterpolator ), mbCumulative( bCumulative ) { @@ -864,9 +865,9 @@ public: Standard Activity parameter struct */ SimpleActivity( const ActivityParameters& rParms, - const NumberAnimationSharedPtr& rAnim ) : + NumberAnimationSharedPtr xAnim ) : ContinuousActivityBase( rParms ), - mpAnim( rAnim ) + mpAnim(std::move( xAnim )) { ENSURE_OR_THROW( mpAnim, "Invalid animation object" ); } diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 2e3b29d9dbc7..a0fa49e47620 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -28,6 +28,7 @@ #include <algorithm> #include <memory> +#include <utility> using namespace ::com::sun::star; @@ -35,8 +36,8 @@ using namespace ::com::sun::star; namespace slideshow::internal { ActivitiesQueue::ActivitiesQueue( - const std::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) : - mpTimer( pPresTimer ), + std::shared_ptr< ::canvas::tools::ElapsedTime > pPresTimer ) : + mpTimer(std::move( pPresTimer )), maCurrentActivitiesWaiting(), maCurrentActivitiesReinsert(), maDequeuedActivities() diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index 94ee9e313ec9..e46f49757358 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -30,16 +30,17 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> +#include <utility> using namespace ::com::sun::star; namespace slideshow::internal { - AnimatedSprite::AnimatedSprite( const ViewLayerSharedPtr& rViewLayer, + AnimatedSprite::AnimatedSprite( ViewLayerSharedPtr xViewLayer, const ::basegfx::B2DSize& rSpriteSizePixel, double nSpritePrio ) : - mpViewLayer( rViewLayer ), + mpViewLayer(std::move( xViewLayer )), mpSprite(), maEffectiveSpriteSizePixel( rSpriteSizePixel ), maContentPixelOffset(), diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 0d160e3f5513..c9aeea3157b0 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -36,6 +36,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <box2dtools.hxx> +#include <utility> using namespace ::com::sun::star; @@ -205,7 +206,7 @@ namespace slideshow::internal const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags, - const box2d::utils::Box2DWorldSharedPtr& pBox2DWorld ) : + box2d::utils::Box2DWorldSharedPtr pBox2DWorld ) : maPathPoly(), mpShape(), mpAttrLayer(), @@ -216,7 +217,7 @@ namespace slideshow::internal mbAnimationStarted( false ), mbAnimationFirstUpdate( true ), mnAdditive( nAdditive ), - mpBox2DWorld( pBox2DWorld ) + mpBox2DWorld(std::move( pBox2DWorld )) { ENSURE_OR_THROW( rShapeManager, "PathAnimation::PathAnimation(): Invalid ShapeManager" ); @@ -367,7 +368,7 @@ namespace slideshow::internal class PhysicsAnimation : public NumberAnimation { public: - PhysicsAnimation( const ::box2d::utils::Box2DWorldSharedPtr& pBox2DWorld, + PhysicsAnimation( ::box2d::utils::Box2DWorldSharedPtr pBox2DWorld, const double fDuration, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, @@ -382,7 +383,7 @@ namespace slideshow::internal mnFlags( nFlags ), mbAnimationStarted( false ), mpBox2DBody(), - mpBox2DWorld( pBox2DWorld ), + mpBox2DWorld(std::move( pBox2DWorld )), mfDuration(fDuration), maStartVelocity(rStartVelocity), mfDensity(fDensity), @@ -578,13 +579,13 @@ namespace slideshow::internal GenericAnimation( const ShapeManagerSharedPtr& rShapeManager, int nFlags, bool (ShapeAttributeLayer::*pIsValid)() const, - const ValueT& rDefaultValue, + ValueT aDefaultValue, ValueT (ShapeAttributeLayer::*pGetValue)() const, void (ShapeAttributeLayer::*pSetValue)( const ValueT& ), const ModifierFunctor& rGetterModifier, const ModifierFunctor& rSetterModifier, const AttributeType eAttrType, - const box2d::utils::Box2DWorldSharedPtr& pBox2DWorld ) : + box2d::utils::Box2DWorldSharedPtr pBox2DWorld ) : mpShape(), mpAttrLayer(), mpShapeManager( rShapeManager ), @@ -594,11 +595,11 @@ namespace slideshow::internal maGetterModifier( rGetterModifier ), maSetterModifier( rSetterModifier ), mnFlags( nFlags ), - maDefaultValue(rDefaultValue), + maDefaultValue(std::move(aDefaultValue)), mbAnimationStarted( false ), mbAnimationFirstUpdate( true ), meAttrType( eAttrType ), - mpBox2DWorld ( pBox2DWorld ) + mpBox2DWorld (std::move( pBox2DWorld )) { ENSURE_OR_THROW( rShapeManager, "GenericAnimation::GenericAnimation(): Invalid ShapeManager" ); diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index c6eb61d17e3c..1dcd4cf7181b 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -24,6 +24,7 @@ #include <eventqueue.hxx> #include "animationaudionode.hxx" #include <delayevent.hxx> +#include <utility> using namespace com::sun::star; @@ -106,8 +107,8 @@ struct NotifyAudioStopped EventMultiplexer & m_rEventMultiplexer; ::std::shared_ptr<BaseNode> m_pSelf; NotifyAudioStopped(EventMultiplexer & rEventMultiplexer, - ::std::shared_ptr<BaseNode> const& pSelf) - : m_rEventMultiplexer(rEventMultiplexer), m_pSelf(pSelf) { } + ::std::shared_ptr<BaseNode> pSelf) + : m_rEventMultiplexer(rEventMultiplexer), m_pSelf(std::move(pSelf)) { } void operator()() { diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx index 14a32aae4af9..a201c7c37441 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.cxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx @@ -25,6 +25,7 @@ #include "animationcolornode.hxx" #include <animationfactory.hxx> #include <activitiesfactory.hxx> +#include <utility> using namespace com::sun::star; @@ -40,8 +41,8 @@ namespace { class HSLWrapper : public HSLColorAnimation { public: - explicit HSLWrapper( const ColorAnimationSharedPtr& rAnimation ) - : mpAnimation( rAnimation ) + explicit HSLWrapper( ColorAnimationSharedPtr xAnimation ) + : mpAnimation(std::move( xAnimation )) { ENSURE_OR_THROW( mpAnimation, diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 5e98b63bbd65..9e812ecfc794 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -36,6 +36,7 @@ #include <sal/log.hxx> +#include <utility> #include <vector> #include <algorithm> @@ -313,12 +314,12 @@ private: }; BaseNode::BaseNode( const uno::Reference< animations::XAnimationNode >& xNode, - const BaseContainerNodeSharedPtr& rParent, + BaseContainerNodeSharedPtr xParent, const NodeContext& rContext ) : maContext( rContext.maContext ), maDeactivatingListeners(), mxAnimationNode( xNode ), - mpParent( rParent ), + mpParent(std::move( xParent )), mpSelf(), mpStateTransitionTable( nullptr ), mnStartDelay( rContext.mnStartDelay ), diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx index b3585af2e9b8..7e12bc4202d8 100644 --- a/slideshow/source/engine/animationnodes/setactivity.hxx +++ b/slideshow/source/engine/animationnodes/setactivity.hxx @@ -25,6 +25,7 @@ #include <animatableshape.hxx> #include <shapeattributelayer.hxx> #include <activitiesfactory.hxx> +#include <utility> namespace slideshow::internal { @@ -44,14 +45,14 @@ public: typedef typename AnimationT::ValueType ValueT; SetActivity( const ActivitiesFactory::CommonParameters& rParms, - const AnimationSharedPtrT& rAnimation, - const ValueT& rToValue ) - : mpAnimation( rAnimation ), + AnimationSharedPtrT xAnimation, + ValueT aToValue ) + : mpAnimation(std::move( xAnimation )), mpShape(), mpAttributeLayer(), mpEndEvent( rParms.mpEndEvent ), mrEventQueue( rParms.mrEventQueue ), - maToValue( rToValue ), + maToValue(std::move( aToValue )), mbIsActive(true) { ENSURE_OR_THROW( mpAnimation, "Invalid animation" ); diff --git a/slideshow/source/engine/box2dtools.cxx b/slideshow/source/engine/box2dtools.cxx index c6009afa6878..4e45bb47f543 100644 --- a/slideshow/source/engine/box2dtools.cxx +++ b/slideshow/source/engine/box2dtools.cxx @@ -22,6 +22,7 @@ #include <svx/svdpage.hxx> #include <svx/unoapi.hxx> +#include <utility> #define BOX2D_SLIDE_SIZE_IN_METERS 100.00f constexpr double fDefaultStaticBodyBounciness(0.1); @@ -772,7 +773,7 @@ Box2DBodySharedPtr box2DWorld::createStaticBody(const slideshow::internal::Shape } box2DBody::box2DBody(std::shared_ptr<b2Body> pBox2DBody, double fScaleFactor) - : mpBox2DBody(pBox2DBody) + : mpBox2DBody(std::move(pBox2DBody)) , mfScaleFactor(fScaleFactor) { } diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index 48a83d591437..ceeae5bb25f4 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/animations/EventTrigger.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <utility> using ::com::sun::star::uno::Reference; using namespace ::com::sun::star; @@ -41,7 +42,7 @@ class RewinderEventHandler : public EventHandler { public: typedef ::std::function<bool ()> Action; - explicit RewinderEventHandler (const Action& rAction) : maAction(rAction) {} + explicit RewinderEventHandler (Action aAction) : maAction(std::move(aAction)) {} private: const Action maAction; @@ -53,7 +54,7 @@ class RewinderAnimationEventHandler : public AnimationEventHandler { public: typedef ::std::function<bool (const AnimationNodeSharedPtr& rpNode)> Action; - explicit RewinderAnimationEventHandler (const Action& rAction) : maAction(rAction) {} + explicit RewinderAnimationEventHandler (Action aAction) : maAction(std::move(aAction)) {} private: const Action maAction; diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 2b53073c7bea..555be4d266c7 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -135,9 +135,9 @@ class PrioritizedHandlerEntry double mnPrio; public: - PrioritizedHandlerEntry( HandlerSharedPtrT const& pHandler, + PrioritizedHandlerEntry( HandlerSharedPtrT pHandler, double nPrio ) : - mpHandler(pHandler), + mpHandler(std::move(pHandler)), mnPrio(nPrio) {} diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index b63db471d5ef..86db21a1602d 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -27,6 +27,7 @@ #include <limits> #include <memory> +#include <utility> using namespace ::com::sun::star; @@ -42,12 +43,12 @@ namespace slideshow::internal EventQueue::EventQueue( - std::shared_ptr<canvas::tools::ElapsedTime> const & pPresTimer ) + std::shared_ptr<canvas::tools::ElapsedTime> pPresTimer ) : maMutex(), maEvents(), maNextEvents(), maNextNextEvents(), - mpTimer( pPresTimer ) + mpTimer(std::move( pPresTimer )) { } diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx index 0b4136f34635..f30b77eb0e5f 100644 --- a/slideshow/source/engine/expressionnodefactory.cxx +++ b/slideshow/source/engine/expressionnodefactory.cxx @@ -21,6 +21,7 @@ #include <expressionnodefactory.hxx> #include <algorithm> +#include <utility> /* Implementation of ExpressionNodeFactory class */ @@ -78,10 +79,10 @@ namespace slideshow::internal class BinaryExpressionBase : public ExpressionNode { public: - BinaryExpressionBase( const std::shared_ptr<ExpressionNode>& rFirstArg, - const std::shared_ptr<ExpressionNode>& rSecondArg ) : - mpFirstArg( rFirstArg ), - mpSecondArg( rSecondArg ) + BinaryExpressionBase( std::shared_ptr<ExpressionNode> pFirstArg, + std::shared_ptr<ExpressionNode> pSecondArg ) : + mpFirstArg(std::move( pFirstArg )), + mpSecondArg(std::move( pSecondArg )) { } diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index faef77988442..8eb02b528792 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -58,6 +58,7 @@ #include <tools/diagnose_ex.h> +#include <utility> #include <vcl/canvastools.hxx> #include <vcl/opengl/OpenGLContext.hxx> #include <vcl/opengl/OpenGLHelper.hxx> @@ -87,8 +88,8 @@ typedef cppu::WeakComponentImplHelper<presentation::XTransition> OGLTransitioner class TimerContext { public: - explicit TimerContext(OUString const& rWhat) - : m_aWhat(rWhat) + explicit TimerContext(OUString aWhat) + : m_aWhat(std::move(aWhat)) , m_StartTime(std::chrono::steady_clock::now()) { } diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx index 4bc230154ed6..d6614f7369bc 100644 --- a/slideshow/source/engine/pointersymbol.cxx +++ b/slideshow/source/engine/pointersymbol.cxx @@ -33,6 +33,7 @@ #include <eventmultiplexer.hxx> #include <algorithm> +#include <utility> using namespace com::sun::star; @@ -54,10 +55,10 @@ PointerSymbolSharedPtr PointerSymbol::create( const uno::Reference<rendering::XB return pRet; } -PointerSymbol::PointerSymbol( uno::Reference<rendering::XBitmap> const & xBitmap, +PointerSymbol::PointerSymbol( uno::Reference<rendering::XBitmap> xBitmap, ScreenUpdater& rScreenUpdater, const UnoViewContainer& rViewContainer ) : - mxBitmap(xBitmap), + mxBitmap(std::move(xBitmap)), maViews(), mrScreenUpdater( rScreenUpdater ), maPos(), diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx index b28ddcf09928..44e74cd12957 100644 --- a/slideshow/source/engine/pointersymbol.hxx +++ b/slideshow/source/engine/pointersymbol.hxx @@ -46,7 +46,7 @@ public: void viewsChanged(const css::geometry::RealPoint2D pos); private: - PointerSymbol( const css::uno::Reference<css::rendering::XBitmap>& xBitmap, + PointerSymbol( css::uno::Reference<css::rendering::XBitmap> xBitmap, ScreenUpdater& rScreenUpdater, const UnoViewContainer& rViewContainer ); diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index ba7c6243b30b..6cc16ad6e500 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -27,6 +27,7 @@ #include <osl/diagnose.h> #include <algorithm> +#include <utility> using namespace ::com::sun::star; @@ -67,7 +68,7 @@ namespace slideshow::internal */ AppletShape( const css::uno::Reference< css::drawing::XShape >& xShape, double nPrio, - const OUString& rServiceName, + OUString aServiceName, const char** pPropCopyTable, std::size_t nNumPropEntries, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; @@ -109,12 +110,12 @@ namespace slideshow::internal AppletShape::AppletShape( const uno::Reference< drawing::XShape >& xShape, double nPrio, - const OUString& rServiceName, + OUString aServiceName, const char** pPropCopyTable, std::size_t nNumPropEntries, const SlideShowContext& rContext ) : ExternalShapeBase( xShape, nPrio, rContext ), - maServiceName( rServiceName ), + maServiceName(std::move( aServiceName )), mpPropCopyTable( pPropCopyTable ), mnNumPropEntries( nNumPropEntries ), maViewAppletShapes(), diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 0b37071fb644..a59a57f0597f 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -24,6 +24,7 @@ #include <canvas/elapsedtime.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <utility> #include <vcl/canvastools.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/TextAnimationKind.hpp> @@ -122,7 +123,7 @@ class ActivityImpl : public Activity public: ActivityImpl( SlideShowContext const& rContext, - std::shared_ptr<WakeupEvent> const& pWakeupEvent, + std::shared_ptr<WakeupEvent> pWakeupEvent, std::shared_ptr<DrawShape> const& pDrawShape ); ActivityImpl(const ActivityImpl&) = delete; @@ -708,10 +709,10 @@ bool ActivityImpl::perform() ActivityImpl::ActivityImpl( SlideShowContext const& rContext, - std::shared_ptr<WakeupEvent> const& pWakeupEvent, + std::shared_ptr<WakeupEvent> pWakeupEvent, std::shared_ptr<DrawShape> const& pParentDrawShape ) : maContext(rContext), - mpWakeupEvent(pWakeupEvent), + mpWakeupEvent(std::move(pWakeupEvent)), mpParentDrawShape(pParentDrawShape), mpListener( std::make_shared<IntrinsicAnimationListener>(*this) ), maTimer(rContext.mrEventQueue.getTimer()), diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 22b65bf28e21..15c10e8ccbdf 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <o3tl/safeint.hxx> +#include <utility> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> #include <vcl/graph.hxx> @@ -394,12 +395,12 @@ namespace slideshow::internal } DrawShape::DrawShape( const uno::Reference< drawing::XShape >& xShape, - const uno::Reference< drawing::XDrawPage >& xContainingPage, + uno::Reference< drawing::XDrawPage > xContainingPage, double nPrio, const Graphic& rGraphic, const SlideShowContext& rContext ) : mxShape( xShape ), - mxPage( xContainingPage ), + mxPage(std::move( xContainingPage )), maAnimationFrames(), mnCurrFrame(0), mpCurrMtf(), diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index eb9030affde0..e775a891f679 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -249,7 +249,7 @@ namespace slideshow::internal events. */ DrawShape( const css::uno::Reference< css::drawing::XShape >& xShape, - const css::uno::Reference< css::drawing::XDrawPage >& xContainingPage, + css::uno::Reference< css::drawing::XDrawPage > xContainingPage, double nPrio, const Graphic& rGraphic, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index 7812301f97e6..8395efeb00a2 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -29,6 +29,7 @@ #include <tools.hxx> +#include <utility> #include <vector> class MetaAction; @@ -58,9 +59,9 @@ namespace slideshow::internal struct MtfAnimationFrame { - MtfAnimationFrame( const GDIMetaFileSharedPtr& rMtf, + MtfAnimationFrame( GDIMetaFileSharedPtr xMtf, double nDuration ) : - mpMtf( rMtf ), + mpMtf(std::move( xMtf )), mnDuration( nDuration ) { } diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index ab3065ac7138..92162eeb60ad 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/GraphicObject.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -79,7 +80,7 @@ class ShapeOfGroup : public Shape { public: ShapeOfGroup( ShapeSharedPtr const& pGroupShape, - uno::Reference<drawing::XShape> const& xShape, + uno::Reference<drawing::XShape> xShape, uno::Reference<beans::XPropertySet> const& xPropSet, double nPrio ); @@ -109,11 +110,11 @@ private: }; ShapeOfGroup::ShapeOfGroup( ShapeSharedPtr const& pGroupShape, - uno::Reference<drawing::XShape> const& xShape, + uno::Reference<drawing::XShape> xShape, uno::Reference<beans::XPropertySet> const& xPropSet, double nPrio ) : mpGroupShape(pGroupShape), - mxShape(xShape), + mxShape(std::move(xShape)), mnPrio(nPrio) { // read bound rect @@ -514,13 +515,13 @@ const PolyPolygonVector& ShapeImporter::getPolygons() const } ShapeImporter::ShapeImporter( uno::Reference<drawing::XDrawPage> const& xPage, - uno::Reference<drawing::XDrawPage> const& xActualPage, - uno::Reference<drawing::XDrawPagesSupplier> const& xPagesSupplier, + uno::Reference<drawing::XDrawPage> xActualPage, + uno::Reference<drawing::XDrawPagesSupplier> xPagesSupplier, const SlideShowContext& rContext, sal_Int32 nOrdNumStart, bool bConvertingMasterPage ) : - mxPage( xActualPage ), - mxPagesSupplier( xPagesSupplier ), + mxPage(std::move( xActualPage )), + mxPagesSupplier(std::move( xPagesSupplier )), mrContext( rContext ), maPolygons(), maShapesStack(), diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 736cb9d94c65..1acc6473ddc9 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -45,22 +45,23 @@ #include "viewappletshape.hxx" #include <tools.hxx> +#include <utility> using namespace ::com::sun::star; namespace slideshow::internal { - ViewAppletShape::ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, + ViewAppletShape::ViewAppletShape( ViewLayerSharedPtr xViewLayer, const uno::Reference< drawing::XShape >& rxShape, const OUString& rServiceName, const char** pPropCopyTable, std::size_t nNumPropEntries, - const uno::Reference< uno::XComponentContext >& rxContext ) : - mpViewLayer( rViewLayer ), + uno::Reference< uno::XComponentContext > xContext ) : + mpViewLayer(std::move( xViewLayer )), mxViewer(), mxFrame(), - mxComponentContext( rxContext ) + mxComponentContext(std::move( xContext )) { ENSURE_OR_THROW( rxShape.is(), "ViewAppletShape::ViewAppletShape(): Invalid Shape" ); ENSURE_OR_THROW( mpViewLayer, "ViewAppletShape::ViewAppletShape(): Invalid View" ); diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index 5d1b30743bef..bc349b950cad 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -72,12 +72,12 @@ namespace slideshow @param nNumPropEntries Number of property table entries (in pPropCopyTable) */ - ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, + ViewAppletShape( ViewLayerSharedPtr xViewLayer, const css::uno::Reference< css::drawing::XShape >& rxShape, const OUString& rServiceName, const char** pPropCopyTable, std::size_t nNumPropEntries, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + css::uno::Reference< css::uno::XComponentContext > xContext ); /** destroy the object */ diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index e0ca333adee2..fbeeb8f14805 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -36,6 +36,7 @@ #include <cppcanvas/basegfxfactory.hxx> #include <cppcanvas/renderer.hxx> #include <cppcanvas/bitmap.hxx> +#include <utility> using namespace ::com::sun::star; @@ -122,9 +123,9 @@ namespace slideshow::internal return mxBitmap.is(); } - ViewBackgroundShape::ViewBackgroundShape( const ViewLayerSharedPtr& rViewLayer, + ViewBackgroundShape::ViewBackgroundShape( ViewLayerSharedPtr xViewLayer, const ::basegfx::B2DRectangle& rShapeBounds ) : - mpViewLayer( rViewLayer ), + mpViewLayer(std::move( xViewLayer )), mxBitmap(), mpLastMtf(), maLastTransformation(), diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx index 0f5b296465aa..50d8339c7882 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx @@ -52,7 +52,7 @@ namespace slideshow::internal Bounds of the background shape, in document coordinate system. */ - ViewBackgroundShape( const ViewLayerSharedPtr& rViewLayer, + ViewBackgroundShape( ViewLayerSharedPtr xViewLayer, const ::basegfx::B2DRectangle& rShapeBounds ); /// Forbid copy construction ViewBackgroundShape(const ViewBackgroundShape&) = delete; diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 52a86be889d7..a1fb8916232e 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -22,6 +22,7 @@ #include <tools/diagnose_ex.h> #include <sal/log.hxx> +#include <utility> #include <vcl/canvastools.hxx> #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> @@ -55,15 +56,15 @@ using namespace ::com::sun::star; namespace slideshow::internal { ViewMediaShape::ViewMediaShape( const ViewLayerSharedPtr& rViewLayer, - const uno::Reference< drawing::XShape >& rxShape, - const uno::Reference< uno::XComponentContext >& rxContext ) : + uno::Reference< drawing::XShape > xShape, + uno::Reference< uno::XComponentContext > xContext ) : mpViewLayer( rViewLayer ), maWindowOffset( 0, 0 ), maBounds(), - mxShape( rxShape ), + mxShape(std::move( xShape )), mxPlayer(), mxPlayerWindow(), - mxComponentContext( rxContext ), + mxComponentContext(std::move( xContext )), mbIsSoundEnabled(true) { ENSURE_OR_THROW( mxShape.is(), "ViewMediaShape::ViewMediaShape(): Invalid Shape" ); diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index f8b672a00563..32515a47d864 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -64,8 +64,8 @@ namespace slideshow::internal The associated View object. */ ViewMediaShape( const ViewLayerSharedPtr& rViewLayer, - const css::uno::Reference< css::drawing::XShape >& rxShape, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + css::uno::Reference< css::drawing::XShape > xShape, + css::uno::Reference< css::uno::XComponentContext > xContext ); /** destroy the object */ diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index f2d909524c06..31be4608471e 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -39,6 +39,7 @@ #include "viewshape.hxx" #include <tools.hxx> +#include <utility> using namespace ::com::sun::star; @@ -705,8 +706,8 @@ namespace slideshow::internal } - ViewShape::ViewShape( const ViewLayerSharedPtr& rViewLayer ) : - mpViewLayer( rViewLayer ), + ViewShape::ViewShape( ViewLayerSharedPtr xViewLayer ) : + mpViewLayer(std::move( xViewLayer )), maRenderers(), mpSprite(), mbAnimationMode( false ), diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx index c7e1d564cba0..e77b8e27ba98 100644 --- a/slideshow/source/engine/shapes/viewshape.hxx +++ b/slideshow/source/engine/shapes/viewshape.hxx @@ -67,7 +67,7 @@ namespace slideshow::internal @param rView The associated View object. */ - explicit ViewShape( const ViewLayerSharedPtr& rViewLayer ); + explicit ViewShape( ViewLayerSharedPtr xViewLayer ); ///Forbid copy construction ViewShape(const ViewShape&) = delete; diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 5525195fe81f..b580428cd958 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -21,19 +21,20 @@ #include <tools/diagnose_ex.h> #include <shapesubset.hxx> +#include <utility> using namespace ::com::sun::star; namespace slideshow::internal { - ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, + ShapeSubset::ShapeSubset( AttributableShapeSharedPtr xOriginalShape, const DocTreeNode& rTreeNode, - const SubsettableShapeManagerSharedPtr& rShapeManager ) : - mpOriginalShape( rOriginalShape ), + SubsettableShapeManagerSharedPtr xShapeManager ) : + mpOriginalShape(std::move( xOriginalShape )), mpSubsetShape(), maTreeNode( rTreeNode ), - mpShapeManager( rShapeManager ) + mpShapeManager(std::move( xShapeManager )) { ENSURE_OR_THROW( mpShapeManager, "ShapeSubset::ShapeSubset(): Invalid shape manager" ); @@ -56,12 +57,12 @@ namespace slideshow::internal "ShapeSubset::ShapeSubset(): Subset is bigger than parent" ); } - ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, - const SubsettableShapeManagerSharedPtr& rShapeManager ) : - mpOriginalShape( rOriginalShape ), + ShapeSubset::ShapeSubset( AttributableShapeSharedPtr xOriginalShape, + SubsettableShapeManagerSharedPtr xShapeManager ) : + mpOriginalShape(std::move( xOriginalShape )), mpSubsetShape(), maTreeNode(), - mpShapeManager( rShapeManager ) + mpShapeManager(std::move( xShapeManager )) { ENSURE_OR_THROW( mpShapeManager, "ShapeSubset::ShapeSubset(): Invalid shape manager" ); diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index 01ce4efa4bcd..dc754f2a3428 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -23,6 +23,7 @@ #include <basegfx/range/b2dpolyrange.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> +#include <utility> #include <osl/diagnose.h> #include "layer.hxx" @@ -194,8 +195,8 @@ namespace slideshow::internal public: LayerEndUpdate( const LayerEndUpdate& ) = delete; LayerEndUpdate& operator=( const LayerEndUpdate& ) = delete; - explicit LayerEndUpdate( LayerSharedPtr const& rLayer ) : - mpLayer( rLayer ) + explicit LayerEndUpdate( LayerSharedPtr xLayer ) : + mpLayer(std::move( xLayer )) {} ~LayerEndUpdate() { if(mpLayer) mpLayer->endUpdate(); } diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 73f3fcce9c5a..d10709ffe26e 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -23,6 +23,7 @@ #include <basegfx/range/b2dpolyrange.hxx> #include <shape.hxx> +#include <utility> #include <view.hxx> #include <vector> @@ -228,10 +229,10 @@ namespace slideshow::internal struct ViewEntry { - ViewEntry( const ViewSharedPtr& rView, - const ViewLayerSharedPtr& rViewLayer ) : - mpView( rView ), - mpViewLayer( rViewLayer ) + ViewEntry( ViewSharedPtr xView, + ViewLayerSharedPtr xViewLayer ) : + mpView(std::move( xView )), + mpViewLayer(std::move( xViewLayer )) {} ViewSharedPtr mpView; diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 74a26d1e73b3..86ea5cce92da 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -25,6 +25,7 @@ #include <functional> #include <algorithm> +#include <utility> #include "layermanager.hxx" @@ -541,8 +542,8 @@ namespace slideshow::internal class DummyLayer : public ViewLayer { public: - explicit DummyLayer( const ::cppcanvas::CanvasSharedPtr& rCanvas ) : - mpCanvas( rCanvas ) + explicit DummyLayer( ::cppcanvas::CanvasSharedPtr xCanvas ) : + mpCanvas(std::move( xCanvas )) { } diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 1c730970e44f..8dacba3dc770 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -29,6 +29,7 @@ #include "shapemanagerimpl.hxx" #include <functional> +#include <utility> using namespace css; using namespace css::uno; @@ -38,13 +39,13 @@ using namespace css::system; namespace slideshow::internal { ShapeManagerImpl::ShapeManagerImpl( EventMultiplexer& rMultiplexer, - LayerManagerSharedPtr const& rLayerManager, + LayerManagerSharedPtr xLayerManager, CursorManager& rCursorManager, const ShapeEventListenerMap& rGlobalListenersMap, const ShapeCursorMap& rGlobalCursorMap, const Reference<XDrawPage>& xDrawPage ): mrMultiplexer(rMultiplexer), - mpLayerManager(rLayerManager), + mpLayerManager(std::move(xLayerManager)), mrCursorManager(rCursorManager), mrGlobalListenersMap(rGlobalListenersMap), mrGlobalCursorMap(rGlobalCursorMap), diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 20bbe0340242..976da3a303b4 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -61,7 +61,7 @@ public: registers its event handlers. */ ShapeManagerImpl( EventMultiplexer& rMultiplexer, - LayerManagerSharedPtr const& rLayerManager, + LayerManagerSharedPtr xLayerManager, CursorManager& rCursorManager, const ShapeEventListenerMap& rGlobalListenersMap, const ShapeCursorMap& rGlobalCursorMap, diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index d433b7af1409..95591cfb3e5a 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -22,14 +22,15 @@ #include "slideanimations.hxx" #include <animationnodefactory.hxx> +#include <utility> using namespace ::com::sun::star; namespace slideshow::internal { - SlideAnimations::SlideAnimations( const SlideShowContext& rContext, + SlideAnimations::SlideAnimations( SlideShowContext aContext, const ::basegfx::B2DVector& rSlideSize ) : - maContext( rContext ), + maContext(std::move( aContext )), maSlideSize( rSlideSize ), mpRootNode() { diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx index 3ebc1b21b0fc..ab1a1815d89a 100644 --- a/slideshow/source/engine/slide/slideanimations.hxx +++ b/slideshow/source/engine/slide/slideanimations.hxx @@ -47,7 +47,7 @@ namespace slideshow::internal @param rContext Slide show context, passing on common parameters */ - SlideAnimations( const SlideShowContext& rContext, + SlideAnimations( SlideShowContext aContext, const ::basegfx::B2DVector& rSlideSize ); ~SlideAnimations() COVERITY_NOEXCEPT_FALSE; diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 033af87565c4..7c7fb75630ec 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -48,6 +48,7 @@ #include "targetpropertiescreator.hxx" #include <tools.hxx> #include <box2dtools.hxx> +#include <utility> #include <vcl/graphicfilter.hxx> #include <svx/svdograf.hxx> @@ -66,8 +67,8 @@ class SlideImpl : public Slide, { public: SlideImpl( const uno::Reference<drawing::XDrawPage>& xDrawPage, - const uno::Reference<drawing::XDrawPagesSupplier>& xDrawPages, - const uno::Reference<animations::XAnimationNode>& xRootNode, + uno::Reference<drawing::XDrawPagesSupplier> xDrawPages, + uno::Reference<animations::XAnimationNode> xRootNode, EventQueue& rEventQueue, EventMultiplexer& rEventMultiplexer, ScreenUpdater& rScreenUpdater, @@ -287,8 +288,8 @@ void slideRenderer( SlideImpl const * pSlide, const UnoViewSharedPtr& rView ) SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDrawPage, - const uno::Reference<drawing::XDrawPagesSupplier>& xDrawPages, - const uno::Reference< animations::XAnimationNode >& xRootNode, + uno::Reference<drawing::XDrawPagesSupplier> xDrawPages, + uno::Reference< animations::XAnimationNode > xRootNode, EventQueue& rEventQueue, EventMultiplexer& rEventMultiplexer, ScreenUpdater& rScreenUpdater, @@ -307,8 +308,8 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDra bool bIntrinsicAnimationsAllowed, bool bDisableAnimationZOrder ) : mxDrawPage( xDrawPage ), - mxDrawPagesSupplier( xDrawPages ), - mxRootNode( xRootNode ), + mxDrawPagesSupplier(std::move( xDrawPages )), + mxRootNode(std::move( xRootNode )), mpLayerManager( std::make_shared<LayerManager>( rViewContainer, bDisableAnimationZOrder) ), diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index fdc45c3daac6..80f41cc4c795 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -25,6 +25,7 @@ #include <comphelper/sequence.hxx> #include <unordered_map> +#include <utility> #include <vector> #include "targetpropertiescreator.hxx" @@ -102,11 +103,11 @@ namespace slideshow::internal } NodeFunctor( XShapeToNamedValuesMap& rShapeHash, - const uno::Reference< drawing::XShape >& rTargetShape, + uno::Reference< drawing::XShape > xTargetShape, sal_Int16 nParagraphIndex, bool bInitial) : mrShapeHash( rShapeHash ), - mxTargetShape( rTargetShape ), + mxTargetShape(std::move( xTargetShape )), mnParagraphIndex( nParagraphIndex ), mbInitial( bInitial ) { diff --git a/slideshow/source/engine/slideshowcontext.cxx b/slideshow/source/engine/slideshowcontext.cxx index f0433b9d846b..4d600d8a2b58 100644 --- a/slideshow/source/engine/slideshowcontext.cxx +++ b/slideshow/source/engine/slideshowcontext.cxx @@ -28,6 +28,7 @@ #include <usereventqueue.hxx> #include <eventmultiplexer.hxx> #include <unoviewcontainer.hxx> +#include <utility> using namespace ::com::sun::star; @@ -44,8 +45,8 @@ SlideShowContext::SlideShowContext( SubsettableShapeManagerSharedPtr& rSubsettab CursorManager& rCursorManager, MediaFileManager& rMediaFileManager, const UnoViewContainer& rViewContainer, - const uno::Reference< - uno::XComponentContext>& rComponentContext, + uno::Reference< + uno::XComponentContext> xComponentContext, box2d::utils::Box2DWorldSharedPtr& rBox2DWorldPtr ) : mpSubsettableShapeManager( rSubsettableShapeManager ), mrEventQueue( rEventQueue ), @@ -56,7 +57,7 @@ SlideShowContext::SlideShowContext( SubsettableShapeManagerSharedPtr& rSubsettab mrCursorManager( rCursorManager ), mrMediaFileManager( rMediaFileManager ), mrViewContainer( rViewContainer ), - mxComponentContext( rComponentContext ), + mxComponentContext(std::move( xComponentContext )), mpBox2DWorld( rBox2DWorldPtr ) {} diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 75b15e5c7e8f..ec0e077d789a 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -82,6 +82,7 @@ #include "pointersymbol.hxx" #include <map> +#include <utility> #include <vector> #include <algorithm> @@ -200,7 +201,7 @@ class SlideShowImpl : private cppu::BaseMutex, { public: explicit SlideShowImpl( - uno::Reference<uno::XComponentContext> const& xContext ); + uno::Reference<uno::XComponentContext> xContext ); /** Notify that the transition phase of the current slide has ended. @@ -539,7 +540,7 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, }; SlideShowImpl::SlideShowImpl( - uno::Reference<uno::XComponentContext> const& xContext ) + uno::Reference<uno::XComponentContext> xContext ) : SlideShowImplBase(m_aMutex), maViewContainer(), maListenerContainer( m_aMutex ), @@ -563,7 +564,7 @@ SlideShowImpl::SlideShowImpl( mpWaitSymbol(), mpPointerSymbol(), mpCurrentSlideTransitionSound(), - mxComponentContext( xContext ), + mxComponentContext(std::move( xContext )), mxOptionalTransitionFactory(), mpCurrentSlide(), mpPrefetchSlide(), diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 013e089a065c..0e4f4388ac59 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <memory> +#include <utility> #include <vector> #include <algorithm> @@ -415,8 +416,8 @@ public: @param rLayerBounds Initial layer bounds, in view coordinate system */ - SlideViewLayer( const cppcanvas::SpriteCanvasSharedPtr& pCanvas, - const basegfx::B2DHomMatrix& rTransform, + SlideViewLayer( cppcanvas::SpriteCanvasSharedPtr pCanvas, + basegfx::B2DHomMatrix aTransform, const basegfx::B2DRange& rLayerBounds, const basegfx::B2DSize& rUserSize, View const* const pParentView) : @@ -425,8 +426,8 @@ public: maLayerBoundsPixel(), maClip(), maUserSize(rUserSize), - maTransformation(rTransform), - mpSpriteCanvas(pCanvas), + maTransformation(std::move(aTransform)), + mpSpriteCanvas(std::move(pCanvas)), mpSprite(), mpOutputCanvas(), mpParentView(pParentView) @@ -1026,10 +1027,10 @@ struct WeakRefWrapper uno::WeakReference<uno::XInterface> const m_wObj; std::function<void (SlideView&)> const m_func; - WeakRefWrapper(SlideView & rObj, std::function<void (SlideView&)> const& func) + WeakRefWrapper(SlideView & rObj, std::function<void (SlideView&)> func) : m_rObj(rObj) , m_wObj(static_cast<::cppu::OWeakObject*>(&rObj)) - , m_func(func) + , m_func(std::move(func)) { } diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 06a2b9639959..14d139342839 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -42,6 +42,7 @@ #include <functional> #include <algorithm> #include <stack> +#include <utility> /* Implementation of SmilFunctionParser class */ @@ -78,9 +79,9 @@ namespace slideshow::internal { public: ShapeBoundsFunctor( Generator aGenerator, - const ParserContextSharedPtr& rContext ) : + ParserContextSharedPtr xContext ) : maGenerator( aGenerator ), - mpContext( rContext ) + mpContext(std::move( xContext )) { ENSURE_OR_THROW( mpContext, "ShapeBoundsFunctor::ShapeBoundsFunctor(): Invalid context" ); @@ -111,9 +112,9 @@ namespace slideshow::internal { public: ConstantFunctor( double rValue, - const ParserContextSharedPtr& rContext ) : + ParserContextSharedPtr xContext ) : mnValue( rValue ), - mpContext( rContext ) + mpContext(std::move( xContext )) { ENSURE_OR_THROW( mpContext, "ConstantFunctor::ConstantFunctor(): Invalid context" ); @@ -135,8 +136,8 @@ namespace slideshow::internal class DoubleConstantFunctor { public: - explicit DoubleConstantFunctor( const ParserContextSharedPtr& rContext ) : - mpContext( rContext ) + explicit DoubleConstantFunctor( ParserContextSharedPtr xContext ) : + mpContext(std::move( xContext )) { ENSURE_OR_THROW( mpContext, "DoubleConstantFunctor::DoubleConstantFunctor(): Invalid context" ); @@ -158,8 +159,8 @@ namespace slideshow::internal class ValueTFunctor { public: - explicit ValueTFunctor( const ParserContextSharedPtr& rContext ) : - mpContext( rContext ) + explicit ValueTFunctor( ParserContextSharedPtr xContext ) : + mpContext(std::move( xContext )) { ENSURE_OR_THROW( mpContext, "ValueTFunctor::ValueTFunctor(): Invalid context" ); @@ -192,9 +193,9 @@ namespace slideshow::internal { public: UnaryFunctionExpression( const Functor& rFunctor, - const std::shared_ptr<ExpressionNode>& rArg ) : + std::shared_ptr<ExpressionNode> xArg ) : maFunctor( rFunctor ), - mpArg( rArg ) + mpArg(std::move( xArg )) { } @@ -215,9 +216,9 @@ namespace slideshow::internal public: UnaryFunctionFunctor( const Functor& rFunctor, - const ParserContextSharedPtr& rContext ) : + ParserContextSharedPtr xContext ) : maFunctor( rFunctor ), - mpContext( rContext ) + mpContext(std::move( xContext )) { ENSURE_OR_THROW( mpContext, "UnaryFunctionFunctor::UnaryFunctionFunctor(): Invalid context" ); @@ -289,9 +290,9 @@ namespace slideshow::internal { public: BinaryFunctionFunctor( const Generator& rGenerator, - const ParserContextSharedPtr& rContext ) : + ParserContextSharedPtr xContext ) : maGenerator( rGenerator ), - mpContext( rContext ) + mpContext(std::move( xContext )) { ENSURE_OR_THROW( mpContext, "BinaryFunctionFunctor::BinaryFunctionFunctor(): Invalid context" ); @@ -403,8 +404,8 @@ namespace slideshow::internal @param rParserContext Contains context info for the parser */ - explicit ExpressionGrammar( const ParserContextSharedPtr& rParserContext ) : - mpParserContext( rParserContext ) + explicit ExpressionGrammar( ParserContextSharedPtr xParserContext ) : + mpParserContext(std::move( xParserContext )) { } diff --git a/slideshow/source/engine/transitions/figurewipe.hxx b/slideshow/source/engine/transitions/figurewipe.hxx index 742d2dde29da..bccbe9895c39 100644 --- a/slideshow/source/engine/transitions/figurewipe.hxx +++ b/slideshow/source/engine/transitions/figurewipe.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_FIGUREWIPE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_FIGUREWIPE_HXX +#include <utility> + #include "parametricpolypolygon.hxx" @@ -35,7 +37,7 @@ public: static std::shared_ptr<FigureWipe> createHexagonWipe(); virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; - explicit FigureWipe( ::basegfx::B2DPolygon const & figure ) : m_figure(figure) {} + explicit FigureWipe( ::basegfx::B2DPolygon figure ) : m_figure(std::move(figure)) {} private: const ::basegfx::B2DPolygon m_figure; }; diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index 460f53cf4090..d3f5674633b4 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -27,23 +27,24 @@ #include <tools.hxx> #include <algorithm> +#include <utility> using namespace com::sun::star; namespace slideshow::internal { -SlideChangeBase::SlideChangeBase( std::optional<SlideSharedPtr> const & leavingSlide, +SlideChangeBase::SlideChangeBase( std::optional<SlideSharedPtr> leavingSlide, const SlideSharedPtr& pEnteringSlide, - const SoundPlayerSharedPtr& pSoundPlayer, + SoundPlayerSharedPtr pSoundPlayer, const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, bool bCreateLeavingSprites, bool bCreateEnteringSprites ) : - mpSoundPlayer( pSoundPlayer ), + mpSoundPlayer(std::move( pSoundPlayer )), mrEventMultiplexer(rEventMultiplexer), mrScreenUpdater(rScreenUpdater), - maLeavingSlide( leavingSlide ), + maLeavingSlide(std::move( leavingSlide )), mpEnteringSlide( pEnteringSlide ), maViewData(), mrViewContainer(rViewContainer), diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index e80145df6a4b..1d23d9ce7247 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SLIDECHANGEBASE_HXX #include <unoview.hxx> +#include <utility> #include <vieweventhandler.hxx> #include <numberanimation.hxx> #include <slide.hxx> @@ -72,9 +73,9 @@ protected: entering slides. */ SlideChangeBase( - ::std::optional<SlideSharedPtr> const & leavingSlide, + ::std::optional<SlideSharedPtr> leavingSlide, const SlideSharedPtr& pEnteringSlide, - const SoundPlayerSharedPtr& pSoundPlayer, + SoundPlayerSharedPtr pSoundPlayer, const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, @@ -84,8 +85,8 @@ protected: /// Info on a per-view basis struct ViewEntry { - explicit ViewEntry( const UnoViewSharedPtr& rView ) : - mpView( rView ) + explicit ViewEntry( UnoViewSharedPtr rView ) : + mpView(std::move( rView )) { } diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 3ec2c8089e6f..db9734acc352 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -35,6 +35,7 @@ #include "combtransition.hxx" #include <tools.hxx> #include <memory> +#include <utility> /*************************************************** @@ -84,8 +85,8 @@ class PluginSlideChange: public SlideChangeBase uno::Reference<presentation::XTransition> mxTransition; UnoViewSharedPtr mpView; - TransitionViewPair( uno::Reference<presentation::XTransition> const & xTransition, const UnoViewSharedPtr& rView ) - : mxTransition(xTransition), mpView(rView) + TransitionViewPair( uno::Reference<presentation::XTransition> xTransition, UnoViewSharedPtr xView ) + : mxTransition(std::move(xTransition)), mpView(std::move(xView)) { } @@ -113,8 +114,8 @@ public: const SlideSharedPtr& pEnteringSlide, const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, - const uno::Reference< - presentation::XTransitionFactory>& xFactory, + uno::Reference< + presentation::XTransitionFactory> xFactory, const SoundPlayerSharedPtr& pSoundPlayer, EventMultiplexer& rEventMultiplexer) : SlideChangeBase( leavingSlide_, @@ -128,7 +129,7 @@ public: mnTransitionType( nTransitionType ), mnTransitionSubType( nTransitionSubType ), mnTransitionFadeColor( rTransitionFadeColor ), - mxFactory( xFactory ) + mxFactory(std::move( xFactory )) { // create one transition per view for( const auto& rView : rViewContainer ) diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 83f1858e9294..ff54766aeb35 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -33,6 +33,7 @@ #include <eventmultiplexer.hxx> #include <algorithm> +#include <utility> using namespace com::sun::star; @@ -57,10 +58,10 @@ WaitSymbolSharedPtr WaitSymbol::create( const uno::Reference<rendering::XBitmap> return pRet; } -WaitSymbol::WaitSymbol( uno::Reference<rendering::XBitmap> const & xBitmap, +WaitSymbol::WaitSymbol( uno::Reference<rendering::XBitmap> xBitmap, ScreenUpdater& rScreenUpdater, const UnoViewContainer& rViewContainer ) : - mxBitmap(xBitmap), + mxBitmap(std::move(xBitmap)), maViews(), mrScreenUpdater( rScreenUpdater ), mbVisible(false) diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx index 1044d607659a..2c58121bd855 100644 --- a/slideshow/source/engine/waitsymbol.hxx +++ b/slideshow/source/engine/waitsymbol.hxx @@ -57,7 +57,7 @@ public: void hide() { setVisible(false); } private: - WaitSymbol( const css::uno::Reference<css::rendering::XBitmap>& xBitmap, + WaitSymbol( css::uno::Reference<css::rendering::XBitmap> xBitmap, ScreenUpdater& rScreenUpdater, const UnoViewContainer& rViewContainer ); diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx index 69852489c54a..7a06953fcabb 100644 --- a/slideshow/source/inc/activitiesfactory.hxx +++ b/slideshow/source/inc/activitiesfactory.hxx @@ -37,6 +37,7 @@ #include "pairanimation.hxx" #include <optional> +#include <utility> /* Definition of ActivitiesFactory class */ @@ -46,7 +47,7 @@ namespace slideshow::internal::ActivitiesFactory struct CommonParameters { CommonParameters( - const EventSharedPtr& rEndEvent, + EventSharedPtr xEndEvent, EventQueue& rEventQueue, ActivitiesQueue& rActivitiesQueue, double nMinDuration, @@ -55,9 +56,9 @@ namespace slideshow::internal::ActivitiesFactory ::std::optional<double> const& aRepeats, double nAcceleration, double nDeceleration, - const ShapeSharedPtr& rShape, + ShapeSharedPtr xShape, const ::basegfx::B2DVector& rSlideBounds ) - : mpEndEvent( rEndEvent ), + : mpEndEvent(std::move( xEndEvent )), mrEventQueue( rEventQueue ), mrActivitiesQueue( rActivitiesQueue ), mnMinDuration( nMinDuration ), @@ -65,7 +66,7 @@ namespace slideshow::internal::ActivitiesFactory maRepeats( aRepeats ), mnAcceleration( nAcceleration ), mnDeceleration( nDeceleration ), - mpShape( rShape ), + mpShape(std::move( xShape )), maSlideBounds( rSlideBounds ), mbAutoReverse( bAutoReverse ) {} diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx index 9fd3df83a9bb..f98480bb33a6 100644 --- a/slideshow/source/inc/activitiesqueue.hxx +++ b/slideshow/source/inc/activitiesqueue.hxx @@ -48,7 +48,7 @@ namespace slideshow::internal adjusting and holding global presentation time. */ explicit ActivitiesQueue( - const std::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ); + std::shared_ptr< ::canvas::tools::ElapsedTime > pPresTimer ); ~ActivitiesQueue(); ActivitiesQueue(const ActivitiesQueue&) = delete; ActivitiesQueue& operator=(const ActivitiesQueue&) = delete; diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx index 18d4eecb2a6d..8f02bd186230 100644 --- a/slideshow/source/inc/animatedsprite.hxx +++ b/slideshow/source/inc/animatedsprite.hxx @@ -59,7 +59,7 @@ namespace slideshow::internal Priority of the sprite. Must remain static over the lifetime of this object */ - AnimatedSprite( const ViewLayerSharedPtr& rViewLayer, + AnimatedSprite( ViewLayerSharedPtr xViewLayer, const ::basegfx::B2DSize& rSpriteSizePixel, double nSpritePrio ); AnimatedSprite(const AnimatedSprite&) = delete; diff --git a/slideshow/source/inc/basenode.hxx b/slideshow/source/inc/basenode.hxx index 668d9de93ad6..58b0ab559deb 100644 --- a/slideshow/source/inc/basenode.hxx +++ b/slideshow/source/inc/basenode.hxx @@ -28,6 +28,7 @@ #include "slideshowcontext.hxx" #include "shapesubset.hxx" +#include <utility> #include <vector> namespace slideshow::internal { @@ -42,9 +43,9 @@ namespace slideshow::internal { */ struct NodeContext { - NodeContext( const SlideShowContext& rContext, + NodeContext( SlideShowContext aContext, const ::basegfx::B2DVector& rSlideSize ) - : maContext( rContext ), + : maContext(std::move( aContext )), maSlideSize( rSlideSize ), mpMasterShapeSubset(), mnStartDelay(0.0), @@ -82,7 +83,7 @@ class BaseNode : public AnimationNode, { public: BaseNode( css::uno::Reference<css::animations::XAnimationNode> const& xNode, - BaseContainerNodeSharedPtr const& pParent, + BaseContainerNodeSharedPtr pParent, NodeContext const& rContext ); BaseNode(const BaseNode&) = delete; BaseNode& operator=(const BaseNode&) = delete; diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx index 631553915dca..fa2ebe253682 100644 --- a/slideshow/source/inc/delayevent.hxx +++ b/slideshow/source/inc/delayevent.hxx @@ -22,6 +22,7 @@ #include "event.hxx" #include <functional> +#include <utility> namespace slideshow::internal { @@ -39,12 +40,12 @@ public: ) : Event(rsDescription), mnTimeout(nTimeout), maFunc(func), mbWasFired(false) {} - Delay( const std::function<void ()>& func, + Delay( std::function<void ()> func, double nTimeout , const OUString& rsDescription ) : Event(rsDescription), mnTimeout(nTimeout), - maFunc(func), + maFunc(std::move(func)), mbWasFired(false) {} Delay(const Delay&) = delete; Delay& operator=(const Delay&) = delete; diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx index 9377bc9d7f25..37d93d0bfca9 100644 --- a/slideshow/source/inc/event.hxx +++ b/slideshow/source/inc/event.hxx @@ -22,6 +22,7 @@ #include "disposable.hxx" #include <rtl/ustring.hxx> #include <memory> +#include <utility> #include <vector> namespace slideshow::internal @@ -31,8 +32,8 @@ namespace slideshow::internal class Event : public Disposable { public: - Event(const OUString& rsDescription) - : msDescription(rsDescription) + Event(OUString sDescription) + : msDescription(std::move(sDescription)) { } diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx index fb0f1b8536eb..41c6201b60a2 100644 --- a/slideshow/source/inc/eventqueue.hxx +++ b/slideshow/source/inc/eventqueue.hxx @@ -26,6 +26,7 @@ #include <mutex> #include <queue> +#include <utility> #include <vector> @@ -40,8 +41,7 @@ namespace slideshow::internal { public: EventQueue( - std::shared_ptr< ::canvas::tools::ElapsedTime > - const & pPresTimer ); + std::shared_ptr< ::canvas::tools::ElapsedTime > pPresTimer ); ~EventQueue(); @@ -125,8 +125,8 @@ namespace slideshow::internal bool operator<( const EventEntry& ) const; // to leverage priority_queue's default compare - EventEntry( EventSharedPtr const& p, double t ) - : pEvent(p), nTime(t) {} + EventEntry( EventSharedPtr p, double t ) + : pEvent(std::move(p)), nTime(t) {} }; typedef ::std::priority_queue< EventEntry > ImplQueueType; diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx index a877e206f46b..8d9d9d087c6f 100644 --- a/slideshow/source/inc/interruptabledelayevent.hxx +++ b/slideshow/source/inc/interruptabledelayevent.hxx @@ -22,6 +22,8 @@ #include "delayevent.hxx" +#include <utility> + namespace slideshow::internal { /** Event, which delays calling passed Event's fire() method @@ -34,10 +36,10 @@ namespace slideshow::internal class DelayFacade : public Event { public: - DelayFacade( const EventSharedPtr& rEvent, + DelayFacade( EventSharedPtr xEvent, double nTimeout ) : Event("DelayFacade"), - mpEvent( rEvent ), + mpEvent(std::move( xEvent )), mnTimeout( nTimeout ) { } diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index 5254e0a9feaf..37598aa476bf 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -70,8 +70,8 @@ public: object imports the draw page. */ ShapeImporter( const css::uno::Reference< css::drawing::XDrawPage >& xPage, - const css::uno::Reference< css::drawing::XDrawPage >& xActualPage, - const css::uno::Reference< css::drawing::XDrawPagesSupplier>& xPagesSupplier, + css::uno::Reference< css::drawing::XDrawPage > xActualPage, + css::uno::Reference< css::drawing::XDrawPagesSupplier> xPagesSupplier, const SlideShowContext& rContext, sal_Int32 nOrdNumStart, bool bConvertingMasterPage ); diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx index ad420ef5538d..e65c47f4ea35 100644 --- a/slideshow/source/inc/shapesubset.hxx +++ b/slideshow/source/inc/shapesubset.hxx @@ -57,9 +57,9 @@ namespace slideshow::internal Manager object, where subsets are registered/unregistered */ - ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, + ShapeSubset( AttributableShapeSharedPtr xOriginalShape, const DocTreeNode& rTreeNode, - const SubsettableShapeManagerSharedPtr& rSubsetManager ); + SubsettableShapeManagerSharedPtr xSubsetManager ); /** Create a subset from another subset. @@ -83,8 +83,8 @@ namespace slideshow::internal Original shape, which will be represented as a whole by this object */ - ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, - const SubsettableShapeManagerSharedPtr& rShapeManager ); + ShapeSubset( AttributableShapeSharedPtr xOriginalShape, + SubsettableShapeManagerSharedPtr xShapeManager ); ~ShapeSubset(); diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx index 565f0ff411aa..f745c30f25da 100644 --- a/slideshow/source/inc/slideshowcontext.hxx +++ b/slideshow/source/inc/slideshowcontext.hxx @@ -93,7 +93,7 @@ namespace slideshow::internal CursorManager& rCursorManager, MediaFileManager& rMediaFileManager, const UnoViewContainer& rViewContainer, - const css::uno::Reference< css::uno::XComponentContext>& rComponentContext, + css::uno::Reference< css::uno::XComponentContext> xComponentContext, box2d::utils::Box2DWorldSharedPtr& rBox2DWorldPtr ); void dispose(); |