diff options
125 files changed, 483 insertions, 414 deletions
diff --git a/include/vcl/GraphicExternalLink.hxx b/include/vcl/GraphicExternalLink.hxx index ab9f2a69f4ca..9f825688b672 100644 --- a/include/vcl/GraphicExternalLink.hxx +++ b/include/vcl/GraphicExternalLink.hxx @@ -1,3 +1,5 @@ +#include <utility> + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. @@ -20,8 +22,8 @@ public: GraphicExternalLink() {} - GraphicExternalLink(OUString const& rURL) - : msURL(rURL) + GraphicExternalLink(OUString aURL) + : msURL(std::move(aURL)) { } }; diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx index 7ebaa274e047..4ee6b4f5d3df 100644 --- a/include/vcl/GraphicObject.hxx +++ b/include/vcl/GraphicObject.hxx @@ -158,7 +158,7 @@ private: public: GraphicObject(); - GraphicObject( const Graphic& rGraphic ); + GraphicObject( Graphic aGraphic ); GraphicObject( const GraphicObject& rCacheObj ); ~GraphicObject(); diff --git a/include/vcl/VectorGraphicSearch.hxx b/include/vcl/VectorGraphicSearch.hxx index 4601a1f5ac1d..fe1fcd5d739a 100644 --- a/include/vcl/VectorGraphicSearch.hxx +++ b/include/vcl/VectorGraphicSearch.hxx @@ -57,7 +57,7 @@ private: bool searchPDF(std::shared_ptr<VectorGraphicData> const& rData); public: - VectorGraphicSearch(Graphic const& rGraphic); + VectorGraphicSearch(Graphic aGraphic); ~VectorGraphicSearch(); bool search(OUString const& rSearchString, VectorGraphicSearchOptions const& rOptions = VectorGraphicSearchOptions()); diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index d27ffdaa8559..165f0dc6ca05 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -107,7 +107,7 @@ public: Bitmap(); Bitmap( const Bitmap& rBitmap ); Bitmap( const Size& rSizePixel, vcl::PixelFormat ePixelFormat, const BitmapPalette* pPal = nullptr ); - explicit Bitmap( std::shared_ptr<SalBitmap> const & xSalBitmap ); + explicit Bitmap( std::shared_ptr<SalBitmap> xSalBitmap ); virtual ~Bitmap(); Bitmap& operator=( const Bitmap& rBitmap ); diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index ddae54a1dc8d..041e4c5c3fd0 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -15,6 +15,7 @@ #include <unotools/resmgr.hxx> #include <tools/fldunit.hxx> #include <vcl/dllapi.h> +#include <utility> #include <vcl/window.hxx> #include <vcl/vclptr.hxx> #include <vcl/toolboxid.hxx> @@ -56,9 +57,9 @@ struct ComboBoxTextItem { OUString m_sItem; OString m_sId; - ComboBoxTextItem(const OUString& rItem, const OString& rId) - : m_sItem(rItem) - , m_sId(rId) + ComboBoxTextItem(OUString sItem, OString sId) + : m_sItem(std::move(sItem)) + , m_sId(std::move(sId)) { } }; @@ -74,8 +75,8 @@ public: public: VclBuilder(vcl::Window* pParent, const OUString& sUIRootDir, const OUString& sUIFile, - const OString& sID = OString(), - const css::uno::Reference<css::frame::XFrame>& rFrame + OString sID = OString(), + css::uno::Reference<css::frame::XFrame> xFrame = css::uno::Reference<css::frame::XFrame>(), bool bLegacy = true, const NotebookBarAddonsItem* pNotebookBarAddonsItem = nullptr); @@ -142,8 +143,8 @@ private: OString m_sID; VclPtr<vcl::Window> m_pWindow; PackingData m_aPackingData; - WinAndId(const OString &rId, vcl::Window *pWindow, bool bVertical) - : m_sID(rId) + WinAndId(OString sId, vcl::Window *pWindow, bool bVertical) + : m_sID(std::move(sId)) , m_pWindow(pWindow) , m_aPackingData(bVertical) { @@ -155,7 +156,7 @@ private: { OString m_sID; VclPtr<Menu> m_pMenu; - MenuAndId(const OString &rId, Menu *pMenu); + MenuAndId(OString sId, Menu *pMenu); }; std::vector<MenuAndId> m_aMenus; @@ -163,9 +164,9 @@ private: { OString m_sID; OString m_sValue; - StringPair(const OString &rId, const OString &rValue) - : m_sID(rId) - , m_sValue(rValue) + StringPair(OString sId, OString sValue) + : m_sID(std::move(sId)) + , m_sValue(std::move(sValue)) { } }; @@ -174,9 +175,9 @@ private: { OString m_sID; OUString m_sValue; - UStringPair(const OString &rId, const OUString &rValue) - : m_sID(rId) - , m_sValue(rValue) + UStringPair(OString sId, OUString sValue) + : m_sID(std::move(sId)) + , m_sValue(std::move(sValue)) { } }; @@ -188,9 +189,9 @@ private: OString m_sID; OUString m_sValue; bool m_bRadio; - ButtonImageWidgetMap(const OString &rId, const OUString &rValue, bool bRadio) - : m_sID(rId) - , m_sValue(rValue) + ButtonImageWidgetMap(OString sId, OUString sValue, bool bRadio) + : m_sID(std::move(sId)) + , m_sValue(std::move(sValue)) , m_bRadio(bRadio) { } @@ -206,9 +207,9 @@ private: OString m_sID; OUString m_sValue; sal_Int32 m_nActiveId; - ComboBoxModelMap(const OString &rId, const OUString &rValue, sal_Int32 nActiveId) - : m_sID(rId) - , m_sValue(rValue) + ComboBoxModelMap(OString sId, OUString sValue, sal_Int32 nActiveId) + : m_sID(std::move(sId)) + , m_sValue(std::move(sValue)) , m_nActiveId(nActiveId) { } diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx index 883147fad491..5d40cefc661d 100644 --- a/include/vcl/commandevent.hxx +++ b/include/vcl/commandevent.hxx @@ -102,7 +102,7 @@ private: bool mbOnlyCursor; public: - CommandExtTextInputData( const OUString& rText, + CommandExtTextInputData( OUString aText, const ExtTextInputAttr* pTextAttr, sal_Int32 nCursorPos, sal_uInt16 nCursorFlags, diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx index 670c085cf495..7e83cd799c3c 100644 --- a/include/vcl/errinf.hxx +++ b/include/vcl/errinf.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_ERRINF_HXX #include <rtl/ustring.hxx> +#include <utility> #include <vcl/errcode.hxx> #include <vcl/dllapi.h> #include <o3tl/typed_flags_set.hxx> @@ -178,7 +179,7 @@ class SAL_WARN_UNUSED VCL_DLLPUBLIC StringErrorInfo final : public DynamicErrorI { public: StringErrorInfo(ErrCode nUserId, - const OUString& aStringP, + OUString aStringP, DialogMask nMask = DialogMask::NONE); const OUString& GetErrorString() const { return aString; } @@ -191,9 +192,9 @@ private: class SAL_WARN_UNUSED VCL_DLLPUBLIC TwoStringErrorInfo final : public DynamicErrorInfo { public: - TwoStringErrorInfo(ErrCode nUserID, const OUString & rTheArg1, - const OUString & rTheArg2, DialogMask nMask): - DynamicErrorInfo(nUserID, nMask), aArg1(rTheArg1), aArg2(rTheArg2) {} + TwoStringErrorInfo(ErrCode nUserID, OUString aTheArg1, + OUString aTheArg2, DialogMask nMask): + DynamicErrorInfo(nUserID, nMask), aArg1(std::move(aTheArg1)), aArg2(std::move(aTheArg2)) {} const OUString& GetArg1() const { return aArg1; } const OUString& GetArg2() const { return aArg2; } diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx index 3026f105fbfb..e66c7e2a4d72 100644 --- a/include/vcl/font/Feature.hxx +++ b/include/vcl/font/Feature.hxx @@ -66,13 +66,13 @@ private: public: FeatureDefinition(); - FeatureDefinition(uint32_t nCode, OUString const& rDescription, + FeatureDefinition(uint32_t nCode, OUString aDescription, FeatureParameterType eType = FeatureParameterType::BOOL, std::vector<FeatureParameter>&& rEnumParameters = std::vector<FeatureParameter>{}, uint32_t nDefault = 0); FeatureDefinition(uint32_t nCode, TranslateId pDescriptionID, - OUString const& rNumericPart = OUString()); + OUString aNumericPart = OUString()); FeatureDefinition(uint32_t nCode, TranslateId pDescriptionID, std::vector<FeatureParameter> aEnumParameters); diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx index ade1da6e715c..ae4735376e14 100644 --- a/include/vcl/fontcharmap.hxx +++ b/include/vcl/fontcharmap.hxx @@ -147,7 +147,7 @@ private: int findRangeIndex( sal_UCS4 ) const; - FontCharMap( ImplFontCharMapRef const & pIFCMap ); + FontCharMap( ImplFontCharMapRef pIFCMap ); // prevent assignment and copy construction FontCharMap( const FontCharMap& ) = delete; diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 30228f339cd7..852f418d7ef7 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -73,7 +73,7 @@ private: public: GfxLink(); explicit GfxLink(std::unique_ptr<sal_uInt8[]> pBuf, sal_uInt32 nBufSize, GfxLinkType nType); - explicit GfxLink(BinaryDataContainer const & rDataConainer, GfxLinkType nType); + explicit GfxLink(BinaryDataContainer aDataConainer, GfxLinkType nType); bool operator==( const GfxLink& ) const; diff --git a/include/vcl/glyphitemcache.hxx b/include/vcl/glyphitemcache.hxx index 30921e6920a0..0b2c4a43b793 100644 --- a/include/vcl/glyphitemcache.hxx +++ b/include/vcl/glyphitemcache.hxx @@ -78,8 +78,8 @@ private: vcl::text::ComplexTextLayoutFlags layoutMode; LanguageType digitLanguage; size_t hashValue; - CachedGlyphsKey(const VclPtr<const OutputDevice>& dev, const OUString& t, sal_Int32 i, - sal_Int32 l, tools::Long w); + CachedGlyphsKey(const VclPtr<const OutputDevice>& dev, OUString t, sal_Int32 i, sal_Int32 l, + tools::Long w); bool operator==(const CachedGlyphsKey& other) const; }; struct CachedGlyphsHash diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index 932df413cc58..ab2371bb795b 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -76,9 +76,9 @@ public: See accessor method descriptions for argument description */ - SvtGraphicStroke( const tools::Polygon& rPath, - const tools::PolyPolygon& rStartArrow, - const tools::PolyPolygon& rEndArrow, + SvtGraphicStroke( tools::Polygon aPath, + tools::PolyPolygon aStartArrow, + tools::PolyPolygon aEndArrow, double fTransparency, double fStrokeWidth, CapType aCap, @@ -275,7 +275,7 @@ public: See accessor method descriptions for argument description */ - SvtGraphicFill( const tools::PolyPolygon& rPath, + SvtGraphicFill( tools::PolyPolygon aPath, Color aFillColor, double fTransparency, FillRule aFillRule, @@ -288,7 +288,7 @@ public: Color aGradient1stColor, // TODO: vector of colors and offsets Color aGradient2ndColor, sal_Int32 aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. - const Graphic& aFillGraphic ); + Graphic aFillGraphic ); // accessors /// Query path to fill diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx index e5368da08547..9f6e43bb6a54 100644 --- a/include/vcl/i18nhelp.hxx +++ b/include/vcl/i18nhelp.hxx @@ -57,7 +57,7 @@ class VCL_DLLPUBLIC I18nHelper public: - I18nHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ); + I18nHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext, LanguageTag aLanguageTag ); ~I18nHelper(); sal_Int32 CompareString( const OUString& rStr1, const OUString& rStr2 ) const; diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx index 0623920039a3..6245d2928802 100644 --- a/include/vcl/imap.hxx +++ b/include/vcl/imap.hxx @@ -63,7 +63,7 @@ private: public: ImageMap() {}; - ImageMap( const OUString& rName ); + ImageMap( OUString aName ); ImageMap( const ImageMap& rImageMap ); // all IMapObjects are destroyed in the destructor diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx index 54498a65cc34..6e517fddb88a 100644 --- a/include/vcl/imapobj.hxx +++ b/include/vcl/imapobj.hxx @@ -80,11 +80,11 @@ protected: public: IMapObject(); - IMapObject( const OUString& rURL, - const OUString& rAltText, - const OUString& rDesc, - const OUString& rTarget, - const OUString& rName, + IMapObject( OUString aURL, + OUString aAltText, + OUString aDesc, + OUString aTarget, + OUString aName, bool bActive ); virtual ~IMapObject() {}; diff --git a/include/vcl/inetimg.hxx b/include/vcl/inetimg.hxx index 64d64c122553..99c9436d2fd5 100644 --- a/include/vcl/inetimg.hxx +++ b/include/vcl/inetimg.hxx @@ -22,6 +22,7 @@ #include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <sot/formats.hxx> +#include <utility> class INetImage @@ -33,12 +34,12 @@ class INetImage public: INetImage( - const OUString& rImageURL, - const OUString& rTargetURL, - const OUString& rTargetFrame ) - : aImageURL( rImageURL ), - aTargetURL( rTargetURL ), - aTargetFrame( rTargetFrame ) + OUString _aImageURL, + OUString _aTargetURL, + OUString _aTargetFrame ) + : aImageURL(std::move( _aImageURL )), + aTargetURL(std::move( _aTargetURL )), + aTargetFrame(std::move( _aTargetFrame )) {} INetImage() {} diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index 25d057b91b99..3d2f620ed0c6 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_INPUTCTX_HXX #include <vcl/dllapi.h> +#include <utility> #include <vcl/font.hxx> #include <o3tl/typed_flags_set.hxx> @@ -48,8 +49,8 @@ public: InputContext( const InputContext& rInputContext ) : maFont( rInputContext.maFont ) { mnOptions = rInputContext.mnOptions; } - InputContext( const vcl::Font& rFont, InputContextFlags nOptions = InputContextFlags::NONE ) : - maFont( rFont ) + InputContext( vcl::Font aFont, InputContextFlags nOptions = InputContextFlags::NONE ) : + maFont(std::move( aFont )) { mnOptions = nOptions; } const vcl::Font& GetFont() const { return maFont; } diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 397bde8838a8..290a2ad2acd2 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <optional> +#include <utility> namespace vcl { @@ -114,7 +115,7 @@ namespace vcl css::uno::Reference<I> m_xI; virtual void doCleanup() override { set(nullptr); } public: - DeleteUnoReferenceOnDeinit(const css::uno::Reference<I>& r_xI ) : m_xI( r_xI ) { + DeleteUnoReferenceOnDeinit(css::uno::Reference<I> _xI ) : m_xI(std::move( _xI )) { addDeinitContainer( this ); } css::uno::Reference<I> get() { return m_xI; } diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 3ac267aae3fc..1719fca6ff6d 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -175,7 +175,7 @@ public: MetaLineAction( const Point& rStart, const Point& rEnd ); MetaLineAction( const Point& rStart, const Point& rEnd, - const LineInfo& rLineInfo ); + LineInfo aLineInfo ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -397,8 +397,8 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - explicit MetaPolyLineAction( const tools::Polygon& ); - explicit MetaPolyLineAction( const tools::Polygon&, const LineInfo& ); + explicit MetaPolyLineAction( tools::Polygon ); + explicit MetaPolyLineAction( tools::Polygon , LineInfo ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -427,7 +427,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - explicit MetaPolygonAction( const tools::Polygon& ); + explicit MetaPolygonAction( tools::Polygon ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -454,7 +454,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - explicit MetaPolyPolygonAction( const tools::PolyPolygon& ); + explicit MetaPolyPolygonAction( tools::PolyPolygon ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -484,7 +484,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - MetaTextAction( const Point& rPt, const OUString& rStr, + MetaTextAction( const Point& rPt, OUString aStr, sal_Int32 nIndex, sal_Int32 nLen ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; @@ -515,10 +515,10 @@ private: public: MetaTextArrayAction(); MetaTextArrayAction( const MetaTextArrayAction& rAction ); - MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, - const std::vector<sal_Int32>& rDXAry, sal_Int32 nIndex, + MetaTextArrayAction( const Point& rStartPt, OUString aStr, + std::vector<sal_Int32> rDXAry, sal_Int32 nIndex, sal_Int32 nLen ); - MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, + MetaTextArrayAction( const Point& rStartPt, OUString aStr, o3tl::span<const sal_Int32> pDXAry, sal_Int32 nIndex, sal_Int32 nLen ); @@ -564,7 +564,7 @@ public: virtual rtl::Reference<MetaAction> Clone() const override; MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, - const OUString& rStr, + OUString aStr, sal_Int32 nIndex, sal_Int32 nLen ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; @@ -603,7 +603,7 @@ public: virtual rtl::Reference<MetaAction> Clone() const override; MetaTextRectAction( const tools::Rectangle& rRect, - const OUString& rStr, DrawTextFlags nStyle ); + OUString aStr, DrawTextFlags nStyle ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1005,7 +1005,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - MetaGradientAction( const tools::Rectangle& rRect, const Gradient& rGradient ); + MetaGradientAction( const tools::Rectangle& rRect, Gradient aGradient ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1035,7 +1035,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - MetaGradientExAction( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); + MetaGradientExAction( tools::PolyPolygon rPolyPoly, Gradient aGradient ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1065,7 +1065,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - MetaHatchAction( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); + MetaHatchAction( tools::PolyPolygon aPolyPoly, const Hatch& rHatch ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1096,7 +1096,7 @@ public: virtual rtl::Reference<MetaAction> Clone() const override; MetaWallpaperAction( const tools::Rectangle& rRect, - const Wallpaper& rPaper ); + Wallpaper aPaper ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1125,7 +1125,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - MetaClipRegionAction( const vcl::Region& rRegion, bool bClip ); + MetaClipRegionAction( vcl::Region aRegion, bool bClip ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1181,7 +1181,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - explicit MetaISectRegionClipRegionAction( const vcl::Region& ); + explicit MetaISectRegionClipRegionAction( vcl::Region ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1456,7 +1456,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - explicit MetaFontAction( const vcl::Font& ); + explicit MetaFontAction( vcl::Font ); virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1548,7 +1548,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() const override; - MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ); + MetaTransparentAction( tools::PolyPolygon aPolyPoly, sal_uInt16 nTransPercent ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1583,7 +1583,7 @@ public: virtual rtl::Reference<MetaAction> Clone() const override; MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, - const Size& rSize, const Gradient& rGradient ); + const Size& rSize, Gradient aGradient ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1621,7 +1621,7 @@ public: virtual rtl::Reference<MetaAction> Clone() const override; MetaEPSAction( const Point& rPoint, const Size& rSize, - const GfxLink& rGfxLink, const GDIMetaFile& rSubst ); + GfxLink aGfxLink, const GDIMetaFile& rSubst ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -1681,7 +1681,7 @@ private: public: explicit MetaCommentAction(); explicit MetaCommentAction( const MetaCommentAction& rAct ); - explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0, const sal_uInt8* pData = nullptr, sal_uInt32 nDataSize = 0 ); + explicit MetaCommentAction( OString aComment, sal_Int32 nValue = 0, const sal_uInt8* pData = nullptr, sal_uInt32 nDataSize = 0 ); virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index e919b8ee234b..ebd6067788e8 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -29,6 +29,7 @@ #include <i18nutil/paper.hxx> #include <vcl/dllapi.h> +#include <utility> #include <vcl/PrinterSupport.hxx> #include <vcl/errcode.hxx> #include <vcl/outdev.hxx> @@ -541,9 +542,9 @@ public: bool mbInternalOnly; bool mbEnabled; - UIControlOptions( const OUString& i_rDependsOnName = OUString(), + UIControlOptions( OUString i_DependsOnName = OUString(), sal_Int32 i_nDependsOnEntry = -1, bool i_bAttachToDependency = false) - : maDependsOnName( i_rDependsOnName ) + : maDependsOnName(std::move( i_DependsOnName )) , mnDependsOnEntry( i_nDependsOnEntry ) , mbAttachToDependency( i_bAttachToDependency ) , mbInternalOnly( false ) diff --git a/include/vcl/salctype.hxx b/include/vcl/salctype.hxx index 71f256b1986e..c52128aef51d 100644 --- a/include/vcl/salctype.hxx +++ b/include/vcl/salctype.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> +#include <utility> #include <vcl/graph.hxx> enum class ConvertDataFormat @@ -51,8 +52,8 @@ public: SvStream& mrStm; ConvertDataFormat mnFormat; - ConvertData( const Graphic& rGraphic, SvStream& rStm, ConvertDataFormat nFormat ) : - maGraphic( rGraphic ), mrStm( rStm ), mnFormat( nFormat ) {} + ConvertData( Graphic aGraphic, SvStream& rStm, ConvertDataFormat nFormat ) : + maGraphic(std::move( aGraphic )), mrStm( rStm ), mnFormat( nFormat ) {} }; typedef sal_uLong (*SALGRFCVTPROC)( void* pInst, diff --git a/include/vcl/test/GraphicsRenderTests.hxx b/include/vcl/test/GraphicsRenderTests.hxx index 014f0d71ea37..f931d947e26b 100644 --- a/include/vcl/test/GraphicsRenderTests.hxx +++ b/include/vcl/test/GraphicsRenderTests.hxx @@ -9,6 +9,7 @@ */ #pragma once +#include <utility> #include <vcl/bitmap.hxx> #include <vcl/dllapi.h> #include <vcl/test/TestResult.hxx> @@ -25,8 +26,8 @@ class VCL_PLUGIN_PUBLIC VclTestResult public: VclTestResult(OUString atestName, OUString atestStatus, Bitmap atestBitmap) - : m_aTestName(atestName) - , m_aTestStatus(atestStatus) + : m_aTestName(std::move(atestName)) + , m_aTestStatus(std::move(atestStatus)) , m_aResultantBitmap(atestBitmap) { } diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx index 907a6fdd8852..bcbbb3d3843f 100644 --- a/include/vcl/textdata.hxx +++ b/include/vcl/textdata.hxx @@ -131,7 +131,7 @@ struct TEIMEInfos sal_Int32 nLen; bool bWasCursorOverwrite; - TEIMEInfos(const TextPaM& rPos, const OUString& rOldTextAfterStartPos); + TEIMEInfos(const TextPaM& rPos, OUString aOldTextAfterStartPos); ~TEIMEInfos(); void CopyAttribs(const ExtTextInputAttr* pA, sal_Int32 nL); diff --git a/include/vcl/textfilter.hxx b/include/vcl/textfilter.hxx index 603daafd97c8..0113b28bcedc 100644 --- a/include/vcl/textfilter.hxx +++ b/include/vcl/textfilter.hxx @@ -22,7 +22,7 @@ public: virtual OUString filter(const OUString& rText); - TextFilter(const OUString& rForbiddenChars = OUString(" ")); + TextFilter(OUString aForbiddenChars = OUString(" ")); virtual ~TextFilter(); }; diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 29bc302d4d43..9b7255db8638 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -57,7 +57,7 @@ private: SvMemoryStream maHTMLStream; public: - explicit TETextDataObject( const OUString& rText ); + explicit TETextDataObject( OUString aText ); SvMemoryStream& GetHTMLStream() { return maHTMLStream; } diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index af2978ce3bdb..06d3bffa0a51 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -26,6 +26,7 @@ #include <optional> #include <memory> +#include <utility> namespace vcl { @@ -65,8 +66,8 @@ public: } private: - explicit GenericSolarThreadExecutor( FuncT const& func ) - : m_func(func), m_result() {} + explicit GenericSolarThreadExecutor( FuncT func ) + : m_func(std::move(func)), m_result() {} virtual void doIt() override { @@ -103,8 +104,8 @@ public: } private: - explicit GenericSolarThreadExecutor( FuncT const& func ) - : m_func(func) {} + explicit GenericSolarThreadExecutor( FuncT func ) + : m_func(std::move(func)) {} virtual void doIt() override { diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx index 502d16d09917..ca96bc8e5718 100644 --- a/include/vcl/toolkit/ivctrl.hxx +++ b/include/vcl/toolkit/ivctrl.hxx @@ -108,7 +108,7 @@ class SvxIconChoiceCtrlEntry } public: - SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage ); + SvxIconChoiceCtrlEntry( OUString aText, Image aImage ); const Image& GetImage () const { return aImage; } void SetText ( const OUString& rText ) { aText = rText; } diff --git a/include/vcl/toolkit/svlbitm.hxx b/include/vcl/toolkit/svlbitm.hxx index f02c4125a13b..2c7f092c08ec 100644 --- a/include/vcl/toolkit/svlbitm.hxx +++ b/include/vcl/toolkit/svlbitm.hxx @@ -112,7 +112,7 @@ protected: OUString maText; public: - SvLBoxString(const OUString& rText); + SvLBoxString(OUString aText); SvLBoxString(); virtual ~SvLBoxString() override; diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index 58b43426e07b..bdd8754a9e8a 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -42,6 +42,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <memory> #include <mutex> +#include <utility> namespace com::sun::star::datatransfer::dnd { class XDragGestureRecognizer; } namespace com::sun::star::io { class XInputStream; } @@ -103,9 +104,9 @@ struct AcceptDropEvent AcceptDropEvent( sal_Int8 nAction, const Point& rPosPixel, - const css::datatransfer::dnd::DropTargetDragEvent& rDragEvent ) : + css::datatransfer::dnd::DropTargetDragEvent aDragEvent ) : maPosPixel( rPosPixel ), - maDragEvent( rDragEvent ), + maDragEvent(std::move( aDragEvent )), mnAction( nAction ), mbLeaving( false ), mbDefault( false ) {} @@ -120,9 +121,9 @@ struct ExecuteDropEvent ExecuteDropEvent( sal_Int8 nAction, const Point& rPosPixel, - const css::datatransfer::dnd::DropTargetDropEvent& rDropEvent ) : + css::datatransfer::dnd::DropTargetDropEvent aDropEvent ) : maPosPixel( rPosPixel ), - maDropEvent( rDropEvent ), + maDropEvent(std::move( aDropEvent )), mnAction( nAction ), mbDefault( false ) {} }; diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx index 978c31ecf8f6..b9dee333df59 100644 --- a/include/vcl/unohelp2.hxx +++ b/include/vcl/unohelp2.hxx @@ -40,7 +40,7 @@ namespace vcl::unohelper { OUString maText; public: - TextDataObject( const OUString& rText ); + TextDataObject( OUString aText ); virtual ~TextDataObject() override; // css::uno::XInterface diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx index 465690c5640b..0e9f9fec20e7 100644 --- a/include/vcl/vectorgraphicdata.hxx +++ b/include/vcl/vectorgraphicdata.hxx @@ -87,7 +87,7 @@ private: public: VectorGraphicData(const OUString& rPath, VectorGraphicDataType eVectorDataType); VectorGraphicData( - const BinaryDataContainer& rDataContainer, + BinaryDataContainer aDataContainer, VectorGraphicDataType eVectorDataType, sal_Int32 nPageIndex = -1); ~VectorGraphicData(); diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index bfd9ba30b189..e020f0e3b1b4 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -18,6 +18,7 @@ #include <tools/gen.hxx> #include <tools/link.hxx> #include <vcl/dllapi.h> +#include <utility> #include <vcl/vclenum.hxx> #include <vcl/font.hxx> #include <vcl/vclptr.hxx> @@ -491,8 +492,8 @@ public: class VCL_DLLPUBLIC ScreenShotEntry { public: - ScreenShotEntry(const OString& rHelpId, const basegfx::B2IRange& rB2IRange) - : msHelpId(rHelpId) + ScreenShotEntry(OString aHelpId, const basegfx::B2IRange& rB2IRange) + : msHelpId(std::move(aHelpId)) , maB2IRange(rB2IRange) { } @@ -666,19 +667,19 @@ struct VCL_DLLPUBLIC ComboBoxEntry OUString sString; OUString sId; OUString sImage; - ComboBoxEntry(const OUString& rString) - : sString(rString) + ComboBoxEntry(OUString _aString) + : sString(std::move(_aString)) { } - ComboBoxEntry(const OUString& rString, const OUString& rId) - : sString(rString) - , sId(rId) + ComboBoxEntry(OUString _aString, OUString _aId) + : sString(std::move(_aString)) + , sId(std::move(_aId)) { } - ComboBoxEntry(const OUString& rString, const OUString& rId, const OUString& rImage) - : sString(rString) - , sId(rId) - , sImage(rImage) + ComboBoxEntry(OUString _aString, OUString _aId, OUString _aImage) + : sString(std::move(_aString)) + , sId(std::move(_aId)) + , sImage(std::move(_aImage)) { } }; diff --git a/vcl/headless/BitmapHelper.cxx b/vcl/headless/BitmapHelper.cxx index 2b9c670dfb3f..ddd7e10db689 100644 --- a/vcl/headless/BitmapHelper.cxx +++ b/vcl/headless/BitmapHelper.cxx @@ -19,6 +19,7 @@ #include <headless/BitmapHelper.hxx> #include <svdata.hxx> +#include <utility> BitmapHelper::BitmapHelper(const SalBitmap& rSourceBitmap, const bool bForceARGB32) #ifdef HAVE_CAIRO_FORMAT_RGB24_888 @@ -161,9 +162,9 @@ sal_Int64 estimateUsageInBytesForSurfaceHelper(const SurfaceHelper* pHelper) SystemDependentData_BitmapHelper::SystemDependentData_BitmapHelper( basegfx::SystemDependentDataManager& rSystemDependentDataManager, - const std::shared_ptr<BitmapHelper>& rBitmapHelper) + std::shared_ptr<BitmapHelper> xBitmapHelper) : basegfx::SystemDependentData(rSystemDependentDataManager) - , maBitmapHelper(rBitmapHelper) + , maBitmapHelper(std::move(xBitmapHelper)) { } @@ -174,9 +175,9 @@ sal_Int64 SystemDependentData_BitmapHelper::estimateUsageInBytes() const SystemDependentData_MaskHelper::SystemDependentData_MaskHelper( basegfx::SystemDependentDataManager& rSystemDependentDataManager, - const std::shared_ptr<MaskHelper>& rMaskHelper) + std::shared_ptr<MaskHelper> xMaskHelper) : basegfx::SystemDependentData(rSystemDependentDataManager) - , maMaskHelper(rMaskHelper) + , maMaskHelper(std::move(xMaskHelper)) { } diff --git a/vcl/inc/ImplLayoutArgs.hxx b/vcl/inc/ImplLayoutArgs.hxx index fa94562ca86c..a94557afeb36 100644 --- a/vcl/inc/ImplLayoutArgs.hxx +++ b/vcl/inc/ImplLayoutArgs.hxx @@ -45,7 +45,7 @@ public: ImplLayoutRuns maFallbackRuns; ImplLayoutArgs(OUString const& rStr, int nMinCharPos, int nEndCharPos, SalLayoutFlags nFlags, - LanguageTag const& rLanguageTag, vcl::text::TextLayoutCache const* pLayoutCache); + LanguageTag aLanguageTag, vcl::text::TextLayoutCache const* pLayoutCache); void SetLayoutWidth(DeviceCoordinate nWidth); void SetDXArray(const DeviceCoordinate* pDXArray); diff --git a/vcl/inc/SwapFile.hxx b/vcl/inc/SwapFile.hxx index bcfa0232c62c..64060fd306a9 100644 --- a/vcl/inc/SwapFile.hxx +++ b/vcl/inc/SwapFile.hxx @@ -24,6 +24,7 @@ #include <tools/stream.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/ucbstreamhelper.hxx> +#include <utility> namespace vcl { @@ -33,8 +34,8 @@ private: INetURLObject maSwapURL; public: - SwapFile(INetURLObject const& rSwapURL) - : maSwapURL(rSwapURL) + SwapFile(INetURLObject aSwapURL) + : maSwapURL(std::move(aSwapURL)) { } diff --git a/vcl/inc/bubblewindow.hxx b/vcl/inc/bubblewindow.hxx index 1a6077b02980..12254d2dbb80 100644 --- a/vcl/inc/bubblewindow.hxx +++ b/vcl/inc/bubblewindow.hxx @@ -41,8 +41,8 @@ private: void RecalcTextRects(); public: - BubbleWindow( vcl::Window* pParent, const OUString& rTitle, - const OUString& rText, const Image& rImage ); + BubbleWindow( vcl::Window* pParent, OUString aTitle, + OUString aText, Image aImage ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; diff --git a/vcl/inc/driverblocklist.hxx b/vcl/inc/driverblocklist.hxx index 542677aa3454..f3fc81c6642d 100644 --- a/vcl/inc/driverblocklist.hxx +++ b/vcl/inc/driverblocklist.hxx @@ -92,9 +92,8 @@ enum VersionComparisonOp struct DriverInfo { - DriverInfo(OperatingSystem os, const OUString& vendor, VersionComparisonOp op, - uint64_t driverVersion, bool bAllowListed = false, - const char* suggestedVersion = nullptr); + DriverInfo(OperatingSystem os, OUString vendor, VersionComparisonOp op, uint64_t driverVersion, + bool bAllowListed = false, const char* suggestedVersion = nullptr); DriverInfo(); @@ -117,7 +116,7 @@ struct DriverInfo class VCL_DLLPUBLIC Parser { public: - Parser(const OUString& rURL, std::vector<DriverInfo>& rDriverList, VersionType versionType); + Parser(OUString aURL, std::vector<DriverInfo>& rDriverList, VersionType versionType); bool parse(); private: diff --git a/vcl/inc/font/FontSelectPattern.hxx b/vcl/inc/font/FontSelectPattern.hxx index 7cf1506b873f..8e21cf5696bc 100644 --- a/vcl/inc/font/FontSelectPattern.hxx +++ b/vcl/inc/font/FontSelectPattern.hxx @@ -40,7 +40,7 @@ class PhysicalFontFace; class VCL_DLLPUBLIC FontSelectPattern : public FontAttributes { public: - FontSelectPattern(const vcl::Font&, const OUString& rSearchName, + FontSelectPattern(const vcl::Font&, OUString aSearchName, const Size&, float fExactHeight, bool bNonAntialias = false); #ifdef _WIN32 FontSelectPattern( const PhysicalFontFace&, const Size&, diff --git a/vcl/inc/font/PhysicalFontFamily.hxx b/vcl/inc/font/PhysicalFontFamily.hxx index fa0036b8599a..bcb8c9dedbb9 100644 --- a/vcl/inc/font/PhysicalFontFamily.hxx +++ b/vcl/inc/font/PhysicalFontFamily.hxx @@ -62,7 +62,7 @@ class PhysicalFontFaceCollection; class VCL_PLUGIN_PUBLIC PhysicalFontFamily { public: - PhysicalFontFamily(const OUString& rSearchName); + PhysicalFontFamily(OUString aSearchName); ~PhysicalFontFamily(); // Avoid implicitly defined copy constructors/assignments for the DLLPUBLIC class (they may diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx b/vcl/inc/graphic/GraphicFormatDetector.hxx index dc1bbf0b3e08..bf1dff37a5db 100644 --- a/vcl/inc/graphic/GraphicFormatDetector.hxx +++ b/vcl/inc/graphic/GraphicFormatDetector.hxx @@ -51,7 +51,7 @@ public: OUString msDetectedFormat; - GraphicFormatDetector(SvStream& rStream, OUString const& rFormatExtension); + GraphicFormatDetector(SvStream& rStream, OUString aFormatExtension); bool detect(); diff --git a/vcl/inc/graphic/UnoBinaryDataContainer.hxx b/vcl/inc/graphic/UnoBinaryDataContainer.hxx index 5447c4bdc923..f1e123dad8d8 100644 --- a/vcl/inc/graphic/UnoBinaryDataContainer.hxx +++ b/vcl/inc/graphic/UnoBinaryDataContainer.hxx @@ -20,6 +20,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <utility> #include <vcl/BinaryDataContainer.hxx> class UnoBinaryDataContainer final @@ -29,8 +30,8 @@ private: BinaryDataContainer maBinaryDataContainer; public: - UnoBinaryDataContainer(BinaryDataContainer const& rBinaryDataContainer) - : maBinaryDataContainer(rBinaryDataContainer) + UnoBinaryDataContainer(BinaryDataContainer aBinaryDataContainer) + : maBinaryDataContainer(std::move(aBinaryDataContainer)) { } diff --git a/vcl/inc/headless/BitmapHelper.hxx b/vcl/inc/headless/BitmapHelper.hxx index cffa0b21d50b..c86a79239d47 100644 --- a/vcl/inc/headless/BitmapHelper.hxx +++ b/vcl/inc/headless/BitmapHelper.hxx @@ -54,7 +54,7 @@ private: public: SystemDependentData_BitmapHelper( basegfx::SystemDependentDataManager& rSystemDependentDataManager, - const std::shared_ptr<BitmapHelper>& rBitmapHelper); + std::shared_ptr<BitmapHelper> xBitmapHelper); const std::shared_ptr<BitmapHelper>& getBitmapHelper() const { return maBitmapHelper; }; virtual sal_Int64 estimateUsageInBytes() const override; @@ -67,7 +67,7 @@ private: public: SystemDependentData_MaskHelper(basegfx::SystemDependentDataManager& rSystemDependentDataManager, - const std::shared_ptr<MaskHelper>& rMaskHelper); + std::shared_ptr<MaskHelper> xMaskHelper); const std::shared_ptr<MaskHelper>& getMaskHelper() const { return maMaskHelper; }; virtual sal_Int64 estimateUsageInBytes() const override; diff --git a/vcl/inc/image.h b/vcl/inc/image.h index 633c38c4a34e..c049e27072e7 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -40,7 +40,7 @@ private: public: ImplImage(const BitmapEx& rBitmapEx); - ImplImage(const OUString &aStockName); + ImplImage(OUString aStockName); bool isStock() const { diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index dbeee7208c9d..6007dcc63ed1 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -90,8 +90,8 @@ public: ImpGraphic(); ImpGraphic( const ImpGraphic& rImpGraphic ); ImpGraphic( ImpGraphic&& rImpGraphic ) noexcept; - ImpGraphic( const GraphicExternalLink& rExternalLink); - ImpGraphic(std::shared_ptr<GfxLink> const& rGfxLink, sal_Int32 nPageIndex = 0); + ImpGraphic( GraphicExternalLink aExternalLink); + ImpGraphic(std::shared_ptr<GfxLink> xGfxLink, sal_Int32 nPageIndex = 0); ImpGraphic( const BitmapEx& rBmpEx ); ImpGraphic(const std::shared_ptr<VectorGraphicData>& rVectorGraphicDataPtr); ImpGraphic( const Animation& rAnimation ); diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx index e3389f74bf86..d02e5652971f 100644 --- a/vcl/inc/implimagetree.hxx +++ b/vcl/inc/implimagetree.hxx @@ -47,10 +47,10 @@ struct ImageRequestParameters bool mbWriteImageToCache; sal_Int32 mnScalePercentage; - ImageRequestParameters(const OUString & rName, const OUString & rStyle, BitmapEx& rBitmap, bool bLocalized, + ImageRequestParameters(OUString aName, OUString aStyle, BitmapEx& rBitmap, bool bLocalized, ImageLoadFlags eFlags, sal_Int32 nScalePercentage) - : msName(rName) - , msStyle(rStyle) + : msName(std::move(aName)) + , msStyle(std::move(aStyle)) , mrBitmap(rBitmap) , mbLocalized(bLocalized) , meFlags(eFlags) @@ -107,8 +107,8 @@ private: maLinkHash.reserve(50); } - IconSet(const OUString & rURL) - : maURL(rURL) + IconSet(OUString aURL) + : maURL(std::move(aURL)) { maLinkHash.reserve(50); } diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index 6a7a9632a27c..8945a499b39f 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -11,6 +11,7 @@ #include <comphelper/string.hxx> #include <osl/mutex.hxx> +#include <utility> #include <vcl/weld.hxx> #include <vcl/jsdialog/executor.hxx> #include <vcl/sysdata.hxx> @@ -80,7 +81,7 @@ public: JSDialogMessageInfo(jsdialog::MessageType eType, VclPtr<vcl::Window> pWindow, std::unique_ptr<jsdialog::ActionDataMap> pData) : m_eType(eType) - , m_pWindow(pWindow) + , m_pWindow(std::move(pWindow)) , m_pData(std::move(pData)) { } diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index 6846a4272976..fca82a20cf05 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -23,6 +23,7 @@ #include <sal/config.h> #include <o3tl/safeint.hxx> +#include <utility> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/floatwin.hxx> #include <vcl/quickselectionengine.hxx> @@ -60,9 +61,9 @@ struct ImplEntryType tools::Long getHeightWithMargin() const; - ImplEntryType( const OUString& rStr, const Image& rImage ) : - maStr( rStr ), - maImage( rImage ), + ImplEntryType( OUString aStr, Image aImage ) : + maStr(std::move( aStr )), + maImage(std::move( aImage )), mnFlags( ListBoxEntryFlags::NONE ), mnHeight( 0 ) { @@ -70,8 +71,8 @@ struct ImplEntryType mpUserData = nullptr; } - ImplEntryType( const OUString& rStr ) : - maStr( rStr ), + ImplEntryType( OUString aStr ) : + maStr(std::move( aStr )), mnFlags( ListBoxEntryFlags::NONE ), mnHeight( 0 ) { diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx index 20e8c7b66084..dee6e712b2bc 100644 --- a/vcl/inc/messagedialog.hxx +++ b/vcl/inc/messagedialog.hxx @@ -40,7 +40,7 @@ private: virtual void StateChanged(StateChangedType nType) override; public: - MessageDialog(vcl::Window* pParent, const OUString& rMessage, VclMessageType eMessageType, + MessageDialog(vcl::Window* pParent, OUString aMessage, VclMessageType eMessageType, VclButtonsType eButtonsType); virtual bool set_property(const OString& rKey, const OUString& rValue) override; OUString const& get_primary_text() const; diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx index 228df387fb6d..b72e497446d6 100644 --- a/vcl/inc/pdf/pdfwriter_impl.hxx +++ b/vcl/inc/pdf/pdfwriter_impl.hxx @@ -1067,7 +1067,7 @@ i12626 void appendStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); void appendNonStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); public: - PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >&, PDFWriter& ); + PDFWriterImpl( PDFWriter::PDFWriterContext aContext, const css::uno::Reference< css::beans::XMaterialHolder >&, PDFWriter& ); ~PDFWriterImpl() override; void dispose() override; diff --git a/vcl/inc/ppdparser.hxx b/vcl/inc/ppdparser.hxx index cd565ef761eb..1222bc1704a7 100644 --- a/vcl/inc/ppdparser.hxx +++ b/vcl/inc/ppdparser.hxx @@ -83,7 +83,7 @@ private: void eraseValue( const OUString& rOption ); public: - PPDKey( const OUString& rKey ); + PPDKey( OUString aKey ); ~PPDKey(); PPDValue* insertValue(const OUString& rOption, PPDValueType eType, bool bCustomOption = false); @@ -163,8 +163,8 @@ private: // translations std::unique_ptr<PPDTranslator> m_pTranslator; - PPDParser( const OUString& rFile ); - PPDParser(const OUString& rFile, const std::vector<PPDKey*>& keys); + PPDParser( OUString aFile ); + PPDParser(OUString aFile, const std::vector<PPDKey*>& keys); void parseOrderDependency(const OString& rLine); void parseOpenUI(const OString& rLine, std::string_view rPPDGroup); diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 5b96417476e0..38fc8e76ef97 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -93,7 +93,7 @@ namespace vcl } }; - PrintDialog(weld::Window*, const std::shared_ptr<PrinterController>&); + PrintDialog(weld::Window*, std::shared_ptr<PrinterController> ); virtual ~PrintDialog() override; bool isPrintToFile() const; diff --git a/vcl/inc/qt5/QtClipboard.hxx b/vcl/inc/qt5/QtClipboard.hxx index 69c2f7a27d9e..f07414bfbc70 100644 --- a/vcl/inc/qt5/QtClipboard.hxx +++ b/vcl/inc/qt5/QtClipboard.hxx @@ -53,7 +53,7 @@ class QtClipboard final static bool isOwner(const QClipboard::Mode aMode); static bool isSupported(const QClipboard::Mode aMode); - explicit QtClipboard(const OUString& aModeString, const QClipboard::Mode aMode); + explicit QtClipboard(OUString aModeString, const QClipboard::Mode aMode); private Q_SLOTS: void handleChanged(QClipboard::Mode mode); diff --git a/vcl/inc/qt5/QtFilePicker.hxx b/vcl/inc/qt5/QtFilePicker.hxx index 20ee52e83ea0..58824adbbd48 100644 --- a/vcl/inc/qt5/QtFilePicker.hxx +++ b/vcl/inc/qt5/QtFilePicker.hxx @@ -87,7 +87,7 @@ protected: public: // use non-native file dialog by default; there's no easy way to add custom widgets // in a generic way in the native one - explicit QtFilePicker(css::uno::Reference<css::uno::XComponentContext> const& context, + explicit QtFilePicker(css::uno::Reference<css::uno::XComponentContext> context, QFileDialog::FileMode, bool bUseNative = false); virtual ~QtFilePicker() override; diff --git a/vcl/inc/qt5/QtFontFace.hxx b/vcl/inc/qt5/QtFontFace.hxx index 5b0460443e90..2df5ab7eb009 100644 --- a/vcl/inc/qt5/QtFontFace.hxx +++ b/vcl/inc/qt5/QtFontFace.hxx @@ -64,7 +64,7 @@ private: typedef enum { Font, FontDB } FontIdType; QtFontFace(const QtFontFace&); - QtFontFace(const FontAttributes&, const QString& rFontID, const FontIdType); + QtFontFace(const FontAttributes&, QString rFontID, const FontIdType); const QString m_aFontId; const FontIdType m_eFontIdType; diff --git a/vcl/inc/qt5/QtSvpSurface.hxx b/vcl/inc/qt5/QtSvpSurface.hxx index 2c2b29cff386..d86553643e76 100644 --- a/vcl/inc/qt5/QtSvpSurface.hxx +++ b/vcl/inc/qt5/QtSvpSurface.hxx @@ -26,7 +26,7 @@ class QtSvpSurface final : public Surface public: /// takes over ownership of passed cairo_surface - explicit QtSvpSurface(const CairoSurfaceSharedPtr& pSurface); + explicit QtSvpSurface(CairoSurfaceSharedPtr pSurface); /// create surface on subarea of given drawable explicit QtSvpSurface(const QtSvpGraphics* pGraphics, int x, int y, int width, int height); ~QtSvpSurface() override; diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 25a022b39c2a..50c1e9f4bc8a 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_VCL_INC_SALMENU_HXX #define INCLUDED_VCL_INC_SALMENU_HXX +#include <utility> #include <vcl/menu.hxx> #include <vcl/image.hxx> @@ -44,8 +45,8 @@ struct SalMenuButtonItem OUString maToolTipText; SalMenuButtonItem() : mnId( 0 ) {} - SalMenuButtonItem( sal_uInt16 i_nId, const Image& rImg, const OUString& i_rTTText ) - : mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {} + SalMenuButtonItem( sal_uInt16 i_nId, Image aImg, OUString i_TTText ) + : mnId( i_nId ), maImage(std::move( aImg )), maToolTipText(std::move( i_TTText )) {} }; class VCL_PLUGIN_PUBLIC SalMenuItem diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 10377e664b13..387a0ba0037e 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -68,12 +68,12 @@ struct ImplToolItem mbExpand:1; ImplToolItem(); - ImplToolItem( ToolBoxItemId nItemId, const Image& rImage, + ImplToolItem( ToolBoxItemId nItemId, Image aImage, ToolBoxItemBits nItemBits ); - ImplToolItem( ToolBoxItemId nItemId, const OUString& rTxt, + ImplToolItem( ToolBoxItemId nItemId, OUString aTxt, ToolBoxItemBits nItemBits ); - ImplToolItem( ToolBoxItemId nItemId, const Image& rImage, - const OUString& rTxt, + ImplToolItem( ToolBoxItemId nItemId, Image aImage, + OUString aTxt, ToolBoxItemBits nItemBits ); // returns the size of an item, taking toolbox orientation into account diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx index 9f4feb3fa3f9..525bd35dc6f2 100644 --- a/vcl/inc/unx/freetype_glyphcache.hxx +++ b/vcl/inc/unx/freetype_glyphcache.hxx @@ -45,7 +45,7 @@ public: private: friend class FreetypeManager; - explicit FreetypeFontFile( const OString& rNativeFileName ); + explicit FreetypeFontFile( OString aNativeFileName ); const OString maNativeFileName; unsigned char* mpFileMap; @@ -79,7 +79,7 @@ public: private: friend class FreetypeManager; - explicit FreetypeFontInfo(const FontAttributes&, FreetypeFontFile* const pFontFile, + explicit FreetypeFontInfo(FontAttributes , FreetypeFontFile* const pFontFile, int nFaceNum, int nFaceVariation, sal_IntPtr nFontId); FT_FaceRec_* maFaceFT; diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index b6120e2899ee..8c2d0e6400ef 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -145,7 +145,7 @@ private: friend class FreetypeFontInstance; friend class FreetypeManager; - explicit FreetypeFont(FreetypeFontInstance&, const std::shared_ptr<FreetypeFontInfo>& rFontInfo); + explicit FreetypeFont(FreetypeFontInstance&, std::shared_ptr<FreetypeFontInfo> rFontInfo); void ApplyGlyphTransform(bool bVertical, FT_Glyph) const; diff --git a/vcl/inc/widgetdraw/WidgetDefinition.hxx b/vcl/inc/widgetdraw/WidgetDefinition.hxx index 65a4dcb32c29..b38b985ca229 100644 --- a/vcl/inc/widgetdraw/WidgetDefinition.hxx +++ b/vcl/inc/widgetdraw/WidgetDefinition.hxx @@ -167,10 +167,9 @@ public: OString msButtonValue; OString msExtra; - WidgetDefinitionState(OString const& sEnabled, OString const& sFocused, OString const& sPressed, - OString const& sRollover, OString const& sDefault, - OString const& sSelected, OString const& sButtonValue, - OString const& sExtra); + WidgetDefinitionState(OString sEnabled, OString sFocused, OString sPressed, OString sRollover, + OString sDefault, OString sSelected, OString sButtonValue, + OString sExtra); std::vector<std::shared_ptr<WidgetDrawAction>> mpWidgetDrawActions; diff --git a/vcl/inc/widgetdraw/WidgetDefinitionReader.hxx b/vcl/inc/widgetdraw/WidgetDefinitionReader.hxx index 49ecfac7a6ed..fe2ebb6d613c 100644 --- a/vcl/inc/widgetdraw/WidgetDefinitionReader.hxx +++ b/vcl/inc/widgetdraw/WidgetDefinitionReader.hxx @@ -34,7 +34,7 @@ private: const std::shared_ptr<WidgetDefinitionState>& rStates); public: - WidgetDefinitionReader(OUString const& rDefinitionFile, OUString const& rResourcePath); + WidgetDefinitionReader(OUString aDefinitionFile, OUString aResourcePath); bool read(WidgetDefinition& rWidgetDefinition); }; diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 810425a7cf40..bb8919b7241f 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -10,6 +10,7 @@ #include <jsdialog/jsdialogbuilder.hxx> #include <sal/log.hxx> #include <comphelper/lok.hxx> +#include <utility> #include <vcl/tabpage.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/dialog.hxx> @@ -55,9 +56,9 @@ void response_help(vcl::Window* pWindow) JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr<vcl::Window> aNotifierWindow, VclPtr<vcl::Window> aContentWindow, std::string sTypeOfJSON) : Idle("JSDialog notify") - , m_aNotifierWindow(aNotifierWindow) - , m_aContentWindow(aContentWindow) - , m_sTypeOfJSON(sTypeOfJSON) + , m_aNotifierWindow(std::move(aNotifierWindow)) + , m_aContentWindow(std::move(aContentWindow)) + , m_sTypeOfJSON(std::move(sTypeOfJSON)) , m_bForce(false) { SetPriority(TaskPriority::POST_PAINT); diff --git a/vcl/qt5/QtClipboard.cxx b/vcl/qt5/QtClipboard.cxx index 5d1a167a92a2..c9a7683c422d 100644 --- a/vcl/qt5/QtClipboard.cxx +++ b/vcl/qt5/QtClipboard.cxx @@ -22,12 +22,13 @@ #include <cassert> #include <map> +#include <utility> -QtClipboard::QtClipboard(const OUString& aModeString, const QClipboard::Mode aMode) +QtClipboard::QtClipboard(OUString aModeString, const QClipboard::Mode aMode) : cppu::WeakComponentImplHelper<css::datatransfer::clipboard::XSystemClipboard, css::datatransfer::clipboard::XFlushableClipboard, XServiceInfo>(m_aMutex) - , m_aClipboardName(aModeString) + , m_aClipboardName(std::move(aModeString)) , m_aClipboardMode(aMode) , m_bOwnClipboardChange(false) , m_bDoClear(false) diff --git a/vcl/qt5/QtFilePicker.cxx b/vcl/qt5/QtFilePicker.cxx index 392e4f800925..8a13ec67235c 100644 --- a/vcl/qt5/QtFilePicker.cxx +++ b/vcl/qt5/QtFilePicker.cxx @@ -65,6 +65,7 @@ #include <unx/geninst.h> #include <fpicker/strings.hrc> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; @@ -84,10 +85,10 @@ uno::Sequence<OUString> FilePicker_getSupportedServiceNames() } } -QtFilePicker::QtFilePicker(css::uno::Reference<css::uno::XComponentContext> const& context, +QtFilePicker::QtFilePicker(css::uno::Reference<css::uno::XComponentContext> context, QFileDialog::FileMode eMode, bool bUseNative) : QtFilePicker_Base(m_aHelperMutex) - , m_context(context) + , m_context(std::move(context)) , m_bIsFolderPicker(eMode == QFileDialog::Directory) , m_pParentWidget(nullptr) , m_pFileDialog(new QFileDialog(nullptr, {}, QDir::homePath())) diff --git a/vcl/qt5/QtFontFace.cxx b/vcl/qt5/QtFontFace.cxx index 291d7e90fdef..e97bee11d078 100644 --- a/vcl/qt5/QtFontFace.cxx +++ b/vcl/qt5/QtFontFace.cxx @@ -35,6 +35,7 @@ #include <QtGui/QFontDatabase> #include <QtGui/QFontInfo> #include <QtGui/QRawFont> +#include <utility> using namespace vcl; @@ -160,10 +161,9 @@ QtFontFace* QtFontFace::fromQFontDatabase(const QString& aFamily, const QString& FontIdType::FontDB); } -QtFontFace::QtFontFace(const FontAttributes& rFA, const QString& rFontID, - const FontIdType eFontIdType) +QtFontFace::QtFontFace(const FontAttributes& rFA, QString aFontID, const FontIdType eFontIdType) : PhysicalFontFace(rFA) - , m_aFontId(rFontID) + , m_aFontId(std::move(aFontID)) , m_eFontIdType(eFontIdType) , m_bFontCapabilitiesRead(false) { diff --git a/vcl/qt5/QtSvpSurface.cxx b/vcl/qt5/QtSvpSurface.cxx index a2a39c12b387..944110847267 100644 --- a/vcl/qt5/QtSvpSurface.cxx +++ b/vcl/qt5/QtSvpSurface.cxx @@ -33,10 +33,10 @@ Size get_surface_size(cairo_surface_t* surface) namespace cairo { -QtSvpSurface::QtSvpSurface(const CairoSurfaceSharedPtr& pSurface) +QtSvpSurface::QtSvpSurface(CairoSurfaceSharedPtr pSurface) : m_pGraphics(nullptr) , m_pCairoContext(nullptr) - , m_pSurface(pSurface) + , m_pSurface(std::move(pSurface)) { } diff --git a/vcl/qt5/QtXAccessible.cxx b/vcl/qt5/QtXAccessible.cxx index c8ef055a2429..25c0c5e9e120 100644 --- a/vcl/qt5/QtXAccessible.cxx +++ b/vcl/qt5/QtXAccessible.cxx @@ -17,12 +17,13 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <sal/log.hxx> +#include <utility> using namespace css::accessibility; using namespace css::uno; QtXAccessible::QtXAccessible(Reference<XAccessible> xAccessible) - : m_xAccessible(xAccessible) + : m_xAccessible(std::move(xAccessible)) { } diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 1ed017b77895..d497cdba4fba 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -25,13 +25,14 @@ #include <rtl/ustrbuf.hxx> +#include <utility> #include <vcl/i18nhelp.hxx> using namespace ::com::sun::star; -vcl::I18nHelper::I18nHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ) +vcl::I18nHelper::I18nHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext, LanguageTag aLanguageTag ) : - maLanguageTag( rLanguageTag) + maLanguageTag(std::move( aLanguageTag)) { m_xContext = rxContext; mpLocaleDataWrapper = nullptr; diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index c034b88bc285..1e3f53e368eb 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -639,7 +639,7 @@ private: public: SalFlashAttention(VclPtr<vcl::Window> xWidget) - : m_xWidget(xWidget) + : m_xWidget(std::move(xWidget)) , m_aFlashTimer("SalFlashAttention") , m_bOrigControlBackground(false) , m_nFlashCount(1) diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index a1b37b27d464..5fb78dad31f0 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -25,6 +25,7 @@ #include <cppuhelper/compbase.hxx> #include <tools/diagnose_ex.h> +#include <utility> #include <vcl/svapp.hxx> #include <factory.hxx> @@ -59,8 +60,8 @@ class VCLSession: bool m_bInteractionDone; bool m_bSaveDone; - explicit Listener( const css::uno::Reference< XSessionManagerListener >& xListener ) - : m_xListener( xListener ), + explicit Listener( css::uno::Reference< XSessionManagerListener > xListener ) + : m_xListener(std::move( xListener )), m_bInteractionRequested( false ), m_bInteractionDone( false ), m_bSaveDone( false ) diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index a88a62611ac6..fe2159767a8c 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -32,6 +32,7 @@ #include <i18nlangtag/mslangid.hxx> #include <unotools/syslocale.hxx> #include <unotools/syslocaleoptions.hxx> +#include <utility> #include <vcl/QueueInfo.hxx> #include <vcl/svapp.hxx> #include <vcl/vclmain.hxx> @@ -246,8 +247,8 @@ namespace { class DesktopEnvironmentContext: public cppu::WeakImplHelper< css::uno::XCurrentContext > { public: - explicit DesktopEnvironmentContext( const css::uno::Reference< css::uno::XCurrentContext > & ctx) - : m_xNextContext( ctx ) {} + explicit DesktopEnvironmentContext( css::uno::Reference< css::uno::XCurrentContext > ctx) + : m_xNextContext(std::move( ctx )) {} // XCurrentContext virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) override; diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index 47cfab4bcf9d..5bdb6c8388e5 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -18,6 +18,7 @@ */ #include <sal/log.hxx> +#include <utility> #include <vcl/unohelp2.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> @@ -34,7 +35,7 @@ using namespace ::com::sun::star; namespace vcl::unohelper { - TextDataObject::TextDataObject( const OUString& rText ) : maText( rText ) + TextDataObject::TextDataObject( OUString aText ) : maText(std::move( aText )) { } diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx index 3c40dd8f9832..a02179aea0f6 100644 --- a/vcl/source/bitmap/bitmap.cxx +++ b/vcl/source/bitmap/bitmap.cxx @@ -23,6 +23,7 @@ #include <osl/diagnose.h> #include <tools/helpers.hxx> +#include <utility> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/outdev.hxx> @@ -67,8 +68,8 @@ Bitmap::Bitmap(const Bitmap& rBitmap) { } -Bitmap::Bitmap(std::shared_ptr<SalBitmap> const & pSalBitmap) - : mxSalBmp(pSalBitmap) +Bitmap::Bitmap(std::shared_ptr<SalBitmap> pSalBitmap) + : mxSalBmp(std::move(pSalBitmap)) , maPrefMapMode(MapMode(MapUnit::MapPixel)) , maPrefSize(mxSalBmp->GetSize()) { diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 7bcc11266719..2f7fa72f8d12 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/builder.hxx> #include <vcl/event.hxx> #include <vcl/cursor.hxx> @@ -120,14 +121,14 @@ struct Impl_IMEInfos bool bCursor; bool bWasCursorOverwrite; - Impl_IMEInfos(sal_Int32 nPos, const OUString& rOldTextAfterStartPos); + Impl_IMEInfos(sal_Int32 nPos, OUString aOldTextAfterStartPos); void CopyAttribs(const ExtTextInputAttr* pA, sal_Int32 nL); void DestroyAttribs(); }; -Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos) - : aOldTextAfterStartPos(rOldTextAfterStartPos), +Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, OUString _aOldTextAfterStartPos) + : aOldTextAfterStartPos(std::move(_aOldTextAfterStartPos)), nPos(nP), nLen(0), bCursor(true), @@ -2275,8 +2276,8 @@ void Edit::ImplHideDDCursor() } } -TextFilter::TextFilter(const OUString &rForbiddenChars) - : sForbiddenChars(rForbiddenChars) +TextFilter::TextFilter(OUString _aForbiddenChars) + : sForbiddenChars(std::move(_aForbiddenChars)) { } diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index 54b64373cde0..b344e270572e 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -18,6 +18,7 @@ */ +#include <utility> #include <vcl/toolkit/ivctrl.hxx> #include "imivctl.hxx" #include <vcl/accessiblefactory.hxx> @@ -53,10 +54,10 @@ void collectUIInformation( const OUString& aID, const OUString& aPos) | \*****************************************************************************/ -SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const OUString& rText, - const Image& rImage ) - : aImage(rImage) - , aText(rText) +SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( OUString _aText, + Image _aImage ) + : aImage(std::move(_aImage)) + , aText(std::move(_aText)) , nPos(0) , pblink(nullptr) , pflink(nullptr) diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index 3cf859704281..bf29c1443de7 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -23,6 +23,7 @@ #include <cstddef> +#include <utility> #include <vcl/textdata.hxx> #include "textdat2.hxx" @@ -316,8 +317,8 @@ TextHint::TextHint( SfxHintId Id, sal_Int32 nValue ) : SfxHint( Id ), mnValue(nV { } -TEIMEInfos::TEIMEInfos( const TextPaM& rPos, const OUString& rOldTextAfterStartPos ) - : aOldTextAfterStartPos(rOldTextAfterStartPos) +TEIMEInfos::TEIMEInfos( const TextPaM& rPos, OUString _aOldTextAfterStartPos ) + : aOldTextAfterStartPos(std::move(_aOldTextAfterStartPos)) , aPos(rPos) , nLen(0) , bWasCursorOverwrite(false) diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 9e0c80b96815..c25b6d44ceb3 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -22,6 +22,7 @@ #include <osl/diagnose.h> #include <sal/log.hxx> #include <rtl/ustrbuf.hxx> +#include <utility> // compare function called by QuickSort static bool CompareStart( const std::unique_ptr<TextCharAttrib>& pFirst, const std::unique_ptr<TextCharAttrib>& pSecond ) @@ -132,8 +133,8 @@ void TextCharAttribList::DeleteEmptyAttribs() mbHasEmptyAttribs = false; } -TextNode::TextNode( const OUString& rText ) : - maText( rText ) +TextNode::TextNode( OUString aText ) : + maText(std::move( aText )) { } diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index 11657463e82a..9857c09f1033 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -72,7 +72,7 @@ class TextNode void CollapseAttribs( sal_Int32 nIndex, sal_Int32 nDelChars ); public: - TextNode( const OUString& rText ); + TextNode( OUString aText ); TextNode( const TextNode& ) = delete; void operator=( const TextNode& ) = delete; diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index 729a130ad456..e537f6701435 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -78,7 +78,7 @@ private: OUString maText; public: - TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); + TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, OUString aStr ); virtual void Undo() override; virtual void Redo() override; @@ -95,7 +95,7 @@ private: OUString maText; public: - TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); + TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, OUString aStr ); virtual void Undo() override; virtual void Redo() override; diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx index 89dd0c50f316..9bc85b73911d 100644 --- a/vcl/source/edit/textundo.cxx +++ b/vcl/source/edit/textundo.cxx @@ -22,6 +22,7 @@ #include <strings.hrc> #include <sal/log.hxx> +#include <utility> #include <vcl/texteng.hxx> #include <vcl/textview.hxx> #include <vcl/textdata.hxx> @@ -248,9 +249,9 @@ OUString TextUndoSplitPara::GetComment () const return VclResId(STR_TEXTUNDO_SPLITPARA); } -TextUndoInsertChars::TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ) +TextUndoInsertChars::TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, OUString aStr ) : TextUndo( pTextEngine ), - maTextPaM( rTextPaM ), maText( rStr ) + maTextPaM( rTextPaM ), maText(std::move( aStr )) { } @@ -296,9 +297,9 @@ OUString TextUndoInsertChars::GetComment () const return VclResId(STR_TEXTUNDO_INSERTCHARS).replaceAll("$1", sText); } -TextUndoRemoveChars::TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ) +TextUndoRemoveChars::TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, OUString aStr ) : TextUndo( pTextEngine ), - maTextPaM( rTextPaM ), maText( rStr ) + maTextPaM( rTextPaM ), maText(std::move( aStr )) { } diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index ef83beab49ca..78454f0ce495 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -20,6 +20,7 @@ #include <memory> #include <i18nutil/searchopt.hxx> #include <o3tl/deleter.hxx> +#include <utility> #include <vcl/textview.hxx> #include <vcl/texteng.hxx> #include <vcl/settings.hxx> @@ -62,7 +63,7 @@ #include <algorithm> #include <cstddef> -TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) +TETextDataObject::TETextDataObject( OUString aText ) : maText(std::move( aText )) { } diff --git a/vcl/source/filter/GraphicFormatDetector.cxx b/vcl/source/filter/GraphicFormatDetector.cxx index 6ef3d3015817..6d7f897de0d4 100644 --- a/vcl/source/filter/GraphicFormatDetector.cxx +++ b/vcl/source/filter/GraphicFormatDetector.cxx @@ -25,6 +25,7 @@ #include <graphic/DetectorTools.hxx> #include <tools/solar.h> #include <tools/zcodec.hxx> +#include <utility> constexpr sal_uInt32 SVG_CHECK_SIZE = 2048; constexpr sal_uInt32 WMF_EMF_CHECK_SIZE = 44; @@ -337,9 +338,9 @@ bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen) } // end anonymous namespace -GraphicFormatDetector::GraphicFormatDetector(SvStream& rStream, OUString const& rFormatExtension) +GraphicFormatDetector::GraphicFormatDetector(SvStream& rStream, OUString aFormatExtension) : mrStream(rStream) - , maExtension(rFormatExtension) + , maExtension(std::move(aFormatExtension)) , mnFirstLong(0) , mnSecondLong(0) , mnStreamPosition(0) diff --git a/vcl/source/font/Feature.cxx b/vcl/source/font/Feature.cxx index ba4b09a5def0..ac2592f12f99 100644 --- a/vcl/source/font/Feature.cxx +++ b/vcl/source/font/Feature.cxx @@ -94,11 +94,11 @@ FeatureDefinition::FeatureDefinition() { } -FeatureDefinition::FeatureDefinition(uint32_t nCode, OUString const& rDescription, +FeatureDefinition::FeatureDefinition(uint32_t nCode, OUString aDescription, FeatureParameterType eType, std::vector<FeatureParameter>&& rEnumParameters, uint32_t nDefault) - : m_sDescription(rDescription) + : m_sDescription(std::move(aDescription)) , m_nCode(nCode) , m_nDefault(nDefault) , m_eType(eType) @@ -107,9 +107,9 @@ FeatureDefinition::FeatureDefinition(uint32_t nCode, OUString const& rDescriptio } FeatureDefinition::FeatureDefinition(uint32_t nCode, TranslateId pDescriptionID, - OUString const& rNumericPart) + OUString aNumericPart) : m_pDescriptionID(pDescriptionID) - , m_sNumericPart(rNumericPart) + , m_sNumericPart(std::move(aNumericPart)) , m_nCode(nCode) , m_nDefault(0) , m_eType(FeatureParameterType::BOOL) diff --git a/vcl/source/font/FontSelectPattern.cxx b/vcl/source/font/FontSelectPattern.cxx index 23e7673c8da2..30c2c9aaa574 100644 --- a/vcl/source/font/FontSelectPattern.cxx +++ b/vcl/source/font/FontSelectPattern.cxx @@ -21,6 +21,7 @@ #include <o3tl/safeint.hxx> #include <tools/gen.hxx> +#include <utility> #include <vcl/font.hxx> #include <font/FontSelectPattern.hxx> @@ -34,8 +35,8 @@ const char FontSelectPattern::FEAT_PREFIX = ':'; const char FontSelectPattern::FEAT_SEPARATOR = '&'; FontSelectPattern::FontSelectPattern( const vcl::Font& rFont, - const OUString& rSearchName, const Size& rSize, float fExactHeight, bool bNonAntialias) - : maSearchName( rSearchName ) + OUString aSearchName, const Size& rSize, float fExactHeight, bool bNonAntialias) + : maSearchName(std::move( aSearchName )) , mnWidth( rSize.Width() ) , mnHeight( rSize.Height() ) , mfExactHeight( fExactHeight) diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index b402cd6185e8..b95cbc117bd7 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -24,6 +24,7 @@ #include <font/PhysicalFontFaceCollection.hxx> #include <font/PhysicalFontCollection.hxx> +#include <utility> namespace vcl::font { @@ -92,8 +93,8 @@ static ImplFontAttrs lcl_IsCJKFont( const OUString& rFontName ) return ImplFontAttrs::None; } -PhysicalFontFamily::PhysicalFontFamily( const OUString& rSearchName ) -: maSearchName( rSearchName ), +PhysicalFontFamily::PhysicalFontFamily( OUString aSearchName ) +: maSearchName(std::move( aSearchName )), mnTypeFaces( FontTypeFaces::NONE ), meFamily( FAMILY_DONTKNOW ), mePitch( PITCH_DONTKNOW ), diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 7ca3e56a2f8c..d1d022c26eed 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -15,6 +15,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/fontcharmap.hxx> #include <impfontcharmap.hxx> #include <rtl/textcvt.h> @@ -431,8 +432,8 @@ FontCharMap::FontCharMap() { } -FontCharMap::FontCharMap( ImplFontCharMapRef const & pIFCMap ) - : mpImplFontCharMap( pIFCMap ) +FontCharMap::FontCharMap( ImplFontCharMapRef pIFCMap ) + : mpImplFontCharMap(std::move( pIFCMap )) { } diff --git a/vcl/source/gdi/WidgetDefinition.cxx b/vcl/source/gdi/WidgetDefinition.cxx index 3c93f1ac5601..bd6019815e0f 100644 --- a/vcl/source/gdi/WidgetDefinition.cxx +++ b/vcl/source/gdi/WidgetDefinition.cxx @@ -8,6 +8,7 @@ * */ +#include <utility> #include <widgetdraw/WidgetDefinition.hxx> #include <sal/config.h> @@ -122,18 +123,17 @@ WidgetDefinitionPart::getStates(ControlType eType, ControlPart ePart, ControlSta return aStatesToAdd; } -WidgetDefinitionState::WidgetDefinitionState(OString const& sEnabled, OString const& sFocused, - OString const& sPressed, OString const& sRollover, - OString const& sDefault, OString const& sSelected, - OString const& sButtonValue, OString const& sExtra) - : msEnabled(sEnabled) - , msFocused(sFocused) - , msPressed(sPressed) - , msRollover(sRollover) - , msDefault(sDefault) - , msSelected(sSelected) - , msButtonValue(sButtonValue) - , msExtra(sExtra) +WidgetDefinitionState::WidgetDefinitionState(OString sEnabled, OString sFocused, OString sPressed, + OString sRollover, OString sDefault, OString sSelected, + OString sButtonValue, OString sExtra) + : msEnabled(std::move(sEnabled)) + , msFocused(std::move(sFocused)) + , msPressed(std::move(sPressed)) + , msRollover(std::move(sRollover)) + , msDefault(std::move(sDefault)) + , msSelected(std::move(sSelected)) + , msButtonValue(std::move(sButtonValue)) + , msExtra(std::move(sExtra)) { } diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx b/vcl/source/gdi/WidgetDefinitionReader.cxx index 4f68c35e4de5..6227e15dad08 100644 --- a/vcl/source/gdi/WidgetDefinitionReader.cxx +++ b/vcl/source/gdi/WidgetDefinitionReader.cxx @@ -8,6 +8,7 @@ * */ +#include <utility> #include <widgetdraw/WidgetDefinitionReader.hxx> #include <sal/config.h> @@ -185,10 +186,9 @@ bool getControlTypeForXmlString(OString const& rString, ControlType& reType) } // end anonymous namespace -WidgetDefinitionReader::WidgetDefinitionReader(OUString const& rDefinitionFile, - OUString const& rResourcePath) - : m_rDefinitionFile(rDefinitionFile) - , m_rResourcePath(rResourcePath) +WidgetDefinitionReader::WidgetDefinitionReader(OUString aDefinitionFile, OUString aResourcePath) + : m_rDefinitionFile(std::move(aDefinitionFile)) + , m_rResourcePath(std::move(aResourcePath)) { } diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index e959e465149a..39467b25dc69 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -20,6 +20,7 @@ #include <sal/log.hxx> #include <tools/stream.hxx> #include <tools/vcompat.hxx> +#include <utility> #include <vcl/graph.hxx> #include <vcl/gfxlink.hxx> #include <vcl/graphicfilter.hxx> @@ -45,10 +46,10 @@ GfxLink::GfxLink(std::unique_ptr<sal_uInt8[]> pBuf, sal_uInt32 nSize, GfxLinkTyp { } -GfxLink::GfxLink(BinaryDataContainer const & rDataConainer, GfxLinkType nType) +GfxLink::GfxLink(BinaryDataContainer aDataConainer, GfxLinkType nType) : meType(nType) , mnUserId(0) - , maDataContainer(rDataConainer) + , maDataContainer(std::move(aDataConainer)) , maHash(0) , mbPrefMapModeValid(false) , mbPrefSizeValid(false) diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index b14f4263cfcb..8308da0415f5 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -19,6 +19,7 @@ #include <tools/stream.hxx> #include <tools/vcompat.hxx> +#include <utility> #include <vcl/TypeSerializer.hxx> #include <vcl/graphictools.hxx> @@ -37,18 +38,18 @@ SvtGraphicStroke::SvtGraphicStroke() : { } -SvtGraphicStroke::SvtGraphicStroke( const tools::Polygon& rPath, - const tools::PolyPolygon& rStartArrow, - const tools::PolyPolygon& rEndArrow, +SvtGraphicStroke::SvtGraphicStroke( tools::Polygon aPath, + tools::PolyPolygon aStartArrow, + tools::PolyPolygon aEndArrow, double fTransparency, double fStrokeWidth, CapType aCap, JoinType aJoin, double fMiterLimit, DashArray&& rDashArray ) : - maPath( rPath ), - maStartArrow( rStartArrow ), - maEndArrow( rEndArrow ), + maPath(std::move( aPath )), + maStartArrow(std::move( aStartArrow )), + maEndArrow(std::move( aEndArrow )), mfTransparency( fTransparency ), mfStrokeWidth( fStrokeWidth ), maCapType( aCap ), @@ -171,7 +172,7 @@ SvtGraphicFill::SvtGraphicFill() : { } -SvtGraphicFill::SvtGraphicFill( const tools::PolyPolygon& rPath, +SvtGraphicFill::SvtGraphicFill( tools::PolyPolygon aPath, Color aFillColor, double fTransparency, FillRule aFillRule, @@ -184,8 +185,8 @@ SvtGraphicFill::SvtGraphicFill( const tools::PolyPolygon& rPath, Color aGradient1stColor, Color aGradient2ndColor, sal_Int32 aGradientStepCount, - const Graphic& aFillGraphic ) : - maPath( rPath ), + Graphic aFillGraphic ) : + maPath(std::move( aPath )), maFillColor( aFillColor ), mfTransparency( fTransparency ), maFillRule( aFillRule ), @@ -198,7 +199,7 @@ SvtGraphicFill::SvtGraphicFill( const tools::PolyPolygon& rPath, maGradient1stColor( aGradient1stColor ), maGradient2ndColor( aGradient2ndColor ), maGradientStepCount( aGradientStepCount ), - maFillGraphic( aFillGraphic ) + maFillGraphic(std::move( aFillGraphic )) { } diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx index 124ae16f2e20..94da485276ae 100644 --- a/vcl/source/gdi/impglyphitem.cxx +++ b/vcl/source/gdi/impglyphitem.cxx @@ -18,6 +18,7 @@ */ #include <impglyphitem.hxx> +#include <utility> #include <vcl/glyphitemcache.hxx> #include <vcl/vcllayout.hxx> #include <vcl/lazydelete.hxx> @@ -488,9 +489,9 @@ SalLayoutGlyphsCache::GetLayoutGlyphs(VclPtr<const OutputDevice> outputDevice, c } SalLayoutGlyphsCache::CachedGlyphsKey::CachedGlyphsKey( - const VclPtr<const OutputDevice>& outputDevice, const OUString& t, sal_Int32 i, sal_Int32 l, + const VclPtr<const OutputDevice>& outputDevice, OUString t, sal_Int32 i, sal_Int32 l, tools::Long w) - : text(t) + : text(std::move(t)) , index(i) , len(l) , logicWidth(w) diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 5d7740e2c440..b790b4d40c14 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -31,6 +31,7 @@ #include <unotools/ucbhelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/tempfile.hxx> +#include <utility> #include <vcl/filter/SvmReader.hxx> #include <vcl/filter/SvmWriter.hxx> #include <vcl/outdev.hxx> @@ -64,9 +65,9 @@ private: OUString maOriginURL; public: - ImpSwapFile(INetURLObject const & rSwapURL, OUString const & rOriginURL) + ImpSwapFile(INetURLObject const & rSwapURL, OUString aOriginURL) : SwapFile(rSwapURL) - , maOriginURL(rOriginURL) + , maOriginURL(std::move(aOriginURL)) { } @@ -134,8 +135,8 @@ ImpGraphic::ImpGraphic(ImpGraphic&& rImpGraphic) noexcept rImpGraphic.mbDummyContext = false; } -ImpGraphic::ImpGraphic(std::shared_ptr<GfxLink> const & rGfxLink, sal_Int32 nPageIndex) - : mpGfxLink(rGfxLink) +ImpGraphic::ImpGraphic(std::shared_ptr<GfxLink> xGfxLink, sal_Int32 nPageIndex) + : mpGfxLink(std::move(xGfxLink)) , meType(GraphicType::Bitmap) , mnSizeBytes(0) , mbSwapOut(true) @@ -151,12 +152,12 @@ ImpGraphic::ImpGraphic(std::shared_ptr<GfxLink> const & rGfxLink, sal_Int32 nPag maSwapInfo.mnPageIndex = nPageIndex; } -ImpGraphic::ImpGraphic(GraphicExternalLink const & rGraphicExternalLink) : +ImpGraphic::ImpGraphic(GraphicExternalLink aGraphicExternalLink) : meType ( GraphicType::Default ), mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ), - maGraphicExternalLink(rGraphicExternalLink), + maGraphicExternalLink(std::move(aGraphicExternalLink)), maLastUsed (std::chrono::high_resolution_clock::now()), mbPrepared (false) { diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 9a85d805b41a..f9d698b420e4 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -24,6 +24,7 @@ #include <tools/stream.hxx> #include <tools/vcompat.hxx> #include <tools/helpers.hxx> +#include <utility> #include <vcl/dibtools.hxx> #include <vcl/filter/SvmReader.hxx> #include <vcl/filter/SvmWriter.hxx> @@ -191,9 +192,9 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : {} MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, - const LineInfo& rLineInfo ) : + LineInfo aLineInfo ) : MetaAction ( MetaActionType::LINE ), - maLineInfo ( rLineInfo ), + maLineInfo (std::move( aLineInfo )), maStartPt ( rStart ), maEndPt ( rEnd ) {} @@ -451,15 +452,15 @@ MetaPolyLineAction::MetaPolyLineAction() : MetaPolyLineAction::~MetaPolyLineAction() {} -MetaPolyLineAction::MetaPolyLineAction( const tools::Polygon& rPoly ) : +MetaPolyLineAction::MetaPolyLineAction( tools::Polygon aPoly ) : MetaAction ( MetaActionType::POLYLINE ), - maPoly ( rPoly ) + maPoly (std::move( aPoly )) {} -MetaPolyLineAction::MetaPolyLineAction( const tools::Polygon& rPoly, const LineInfo& rLineInfo ) : +MetaPolyLineAction::MetaPolyLineAction( tools::Polygon aPoly, LineInfo aLineInfo ) : MetaAction ( MetaActionType::POLYLINE ), - maLineInfo ( rLineInfo ), - maPoly ( rPoly ) + maLineInfo (std::move( aLineInfo )), + maPoly (std::move( aPoly )) {} void MetaPolyLineAction::Execute( OutputDevice* pOut ) @@ -493,9 +494,9 @@ MetaPolygonAction::MetaPolygonAction() : MetaPolygonAction::~MetaPolygonAction() {} -MetaPolygonAction::MetaPolygonAction( const tools::Polygon& rPoly ) : +MetaPolygonAction::MetaPolygonAction( tools::Polygon aPoly ) : MetaAction ( MetaActionType::POLYGON ), - maPoly ( rPoly ) + maPoly (std::move( aPoly )) {} void MetaPolygonAction::Execute( OutputDevice* pOut ) @@ -525,9 +526,9 @@ MetaPolyPolygonAction::MetaPolyPolygonAction() : MetaPolyPolygonAction::~MetaPolyPolygonAction() {} -MetaPolyPolygonAction::MetaPolyPolygonAction( const tools::PolyPolygon& rPolyPoly ) : +MetaPolyPolygonAction::MetaPolyPolygonAction( tools::PolyPolygon aPolyPoly ) : MetaAction ( MetaActionType::POLYPOLYGON ), - maPolyPoly ( rPolyPoly ) + maPolyPoly (std::move( aPolyPoly )) {} void MetaPolyPolygonAction::Execute( OutputDevice* pOut ) @@ -560,11 +561,11 @@ MetaTextAction::MetaTextAction() : MetaTextAction::~MetaTextAction() {} -MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, +MetaTextAction::MetaTextAction( const Point& rPt, OUString aStr, sal_Int32 nIndex, sal_Int32 nLen ) : MetaAction ( MetaActionType::TEXT ), maPt ( rPt ), - maStr ( rStr ), + maStr (std::move( aStr )), mnIndex ( nIndex ), mnLen ( nLen ) {} @@ -606,27 +607,27 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : } MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, - const OUString& rStr, - const std::vector<sal_Int32>& rDXAry, + OUString aStr, + std::vector<sal_Int32> aDXAry, sal_Int32 nIndex, sal_Int32 nLen ) : MetaAction ( MetaActionType::TEXTARRAY ), maStartPt ( rStartPt ), - maStr ( rStr ), - maDXAry ( rDXAry ), + maStr (std::move( aStr )), + maDXAry (std::move( aDXAry )), mnIndex ( nIndex ), mnLen ( nLen ) { } MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, - const OUString& rStr, + OUString aStr, o3tl::span<const sal_Int32> pDXAry, sal_Int32 nIndex, sal_Int32 nLen ) : MetaAction ( MetaActionType::TEXTARRAY ), maStartPt ( rStartPt ), - maStr ( rStr ), + maStr (std::move( aStr )), maDXAry ( pDXAry.begin(), pDXAry.end() ), mnIndex ( nIndex ), mnLen ( nLen ) @@ -679,11 +680,11 @@ MetaStretchTextAction::~MetaStretchTextAction() {} MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, - const OUString& rStr, + OUString aStr, sal_Int32 nIndex, sal_Int32 nLen ) : MetaAction ( MetaActionType::STRETCHTEXT ), maPt ( rPt ), - maStr ( rStr ), + maStr (std::move( aStr )), mnWidth ( nWidth ), mnIndex ( nIndex ), mnLen ( nLen ) @@ -718,10 +719,10 @@ MetaTextRectAction::~MetaTextRectAction() {} MetaTextRectAction::MetaTextRectAction( const tools::Rectangle& rRect, - const OUString& rStr, DrawTextFlags nStyle ) : + OUString aStr, DrawTextFlags nStyle ) : MetaAction ( MetaActionType::TEXTRECT ), maRect ( rRect ), - maStr ( rStr ), + maStr (std::move( aStr )), mnStyle ( nStyle ) {} @@ -1183,10 +1184,10 @@ MetaGradientAction::MetaGradientAction() : MetaGradientAction::~MetaGradientAction() {} -MetaGradientAction::MetaGradientAction( const tools::Rectangle& rRect, const Gradient& rGradient ) : +MetaGradientAction::MetaGradientAction( const tools::Rectangle& rRect, Gradient aGradient ) : MetaAction ( MetaActionType::GRADIENT ), maRect ( rRect ), - maGradient ( rGradient ) + maGradient (std::move( aGradient )) {} void MetaGradientAction::Execute( OutputDevice* pOut ) @@ -1213,10 +1214,10 @@ MetaGradientExAction::MetaGradientExAction() : MetaAction ( MetaActionType::GRADIENTEX ) {} -MetaGradientExAction::MetaGradientExAction( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) : +MetaGradientExAction::MetaGradientExAction( tools::PolyPolygon aPolyPoly, Gradient aGradient ) : MetaAction ( MetaActionType::GRADIENTEX ), - maPolyPoly ( rPolyPoly ), - maGradient ( rGradient ) + maPolyPoly (std::move( aPolyPoly )), + maGradient (std::move( aGradient )) {} MetaGradientExAction::~MetaGradientExAction() @@ -1253,9 +1254,9 @@ MetaHatchAction::MetaHatchAction() : MetaHatchAction::~MetaHatchAction() {} -MetaHatchAction::MetaHatchAction( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) : +MetaHatchAction::MetaHatchAction( tools::PolyPolygon aPolyPoly, const Hatch& rHatch ) : MetaAction ( MetaActionType::HATCH ), - maPolyPoly ( rPolyPoly ), + maPolyPoly (std::move( aPolyPoly )), maHatch ( rHatch ) {} @@ -1288,10 +1289,10 @@ MetaWallpaperAction::~MetaWallpaperAction() {} MetaWallpaperAction::MetaWallpaperAction( const tools::Rectangle& rRect, - const Wallpaper& rPaper ) : + Wallpaper aPaper ) : MetaAction ( MetaActionType::WALLPAPER ), maRect ( rRect ), - maWallpaper ( rPaper ) + maWallpaper (std::move( aPaper )) {} void MetaWallpaperAction::Execute( OutputDevice* pOut ) @@ -1322,9 +1323,9 @@ MetaClipRegionAction::MetaClipRegionAction() : MetaClipRegionAction::~MetaClipRegionAction() {} -MetaClipRegionAction::MetaClipRegionAction( const vcl::Region& rRegion, bool bClip ) : +MetaClipRegionAction::MetaClipRegionAction( vcl::Region aRegion, bool bClip ) : MetaAction ( MetaActionType::CLIPREGION ), - maRegion ( rRegion ), + maRegion (std::move( aRegion )), mbClip ( bClip ) {} @@ -1390,9 +1391,9 @@ MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction() : MetaISectRegionClipRegionAction::~MetaISectRegionClipRegionAction() {} -MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const vcl::Region& rRegion ) : +MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( vcl::Region aRegion ) : MetaAction ( MetaActionType::ISECTREGIONCLIPREGION ), - maRegion ( rRegion ) + maRegion (std::move( aRegion )) { } @@ -1664,9 +1665,9 @@ MetaFontAction::MetaFontAction() : MetaFontAction::~MetaFontAction() {} -MetaFontAction::MetaFontAction( const vcl::Font& rFont ) : +MetaFontAction::MetaFontAction( vcl::Font aFont ) : MetaAction ( MetaActionType::FONT ), - maFont ( rFont ) + maFont (std::move( aFont )) { // #96876: because RTL_TEXTENCODING_SYMBOL is often set at the StarSymbol font, // we change the textencoding to RTL_TEXTENCODING_UNICODE here, which seems @@ -1769,9 +1770,9 @@ MetaTransparentAction::MetaTransparentAction() : MetaTransparentAction::~MetaTransparentAction() {} -MetaTransparentAction::MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : +MetaTransparentAction::MetaTransparentAction( tools::PolyPolygon aPolyPoly, sal_uInt16 nTransPercent ) : MetaAction ( MetaActionType::Transparent ), - maPolyPoly ( rPolyPoly ), + maPolyPoly (std::move( aPolyPoly )), mnTransPercent ( nTransPercent ) {} @@ -1804,12 +1805,12 @@ MetaFloatTransparentAction::~MetaFloatTransparentAction() {} MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, - const Size& rSize, const Gradient& rGradient ) : + const Size& rSize, Gradient aGradient ) : MetaAction ( MetaActionType::FLOATTRANSPARENT ), maMtf ( rMtf ), maPoint ( rPos ), maSize ( rSize ), - maGradient ( rGradient ) + maGradient (std::move( aGradient )) {} void MetaFloatTransparentAction::Execute( OutputDevice* pOut ) @@ -1843,9 +1844,9 @@ MetaEPSAction::~MetaEPSAction() {} MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, - const GfxLink& rGfxLink, const GDIMetaFile& rSubst ) : + GfxLink aGfxLink, const GDIMetaFile& rSubst ) : MetaAction ( MetaActionType::EPS ), - maGfxLink ( rGfxLink ), + maGfxLink (std::move( aGfxLink )), maSubst ( rSubst ), maPoint ( rPoint ), maSize ( rSize ) @@ -1916,9 +1917,9 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : ImplInitDynamicData( rAct.mpData.get(), rAct.mnDataSize ); } -MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : +MetaCommentAction::MetaCommentAction( OString aComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : MetaAction ( MetaActionType::COMMENT ), - maComment ( rComment ), + maComment (std::move( aComment )), mnValue ( nValue ) { ImplInitDynamicData( pData, nDataSize ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index ae78eda251e5..514b0506ac68 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -59,6 +59,7 @@ #include <tools/urlobj.hxx> #include <tools/zcodec.hxx> #include <svl/cryptosign.hxx> +#include <utility> #include <vcl/bitmapex.hxx> #include <vcl/canvastools.hxx> #include <vcl/cvtgrf.hxx> @@ -1191,7 +1192,7 @@ double PDFPage::getHeight() const return fRet; } -PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, +PDFWriterImpl::PDFWriterImpl( PDFWriter::PDFWriterContext aContext, const css::uno::Reference< css::beans::XMaterialHolder >& xEnc, PDFWriter& i_rOuterFace) : VirtualDevice(Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::NONE, OUTDEV_PDF), @@ -1208,7 +1209,7 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, m_nSignatureLastByteRangeNoOffset( 0 ), m_nResourceDict( -1 ), m_nFontDictObject( -1 ), - m_aContext(rContext), + m_aContext(std::move(aContext)), m_aFile(m_aContext.URL), m_bOpen(false), m_DocDigest(::comphelper::HashType::MD5), diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index c02023dd1aef..3a467484d00f 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -27,6 +27,7 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> +#include <utility> #include <vcl/metaact.hxx> #include <vcl/print.hxx> #include <vcl/printer/Options.hxx> @@ -302,9 +303,9 @@ struct PrintJobAsync std::shared_ptr<PrinterController> mxController; JobSetup maInitSetup; - PrintJobAsync(const std::shared_ptr<PrinterController>& i_xController, + PrintJobAsync(std::shared_ptr<PrinterController> i_xController, const JobSetup& i_rInitSetup) - : mxController( i_xController ), maInitSetup( i_rInitSetup ) + : mxController(std::move( i_xController )), maInitSetup( i_rInitSetup ) {} DECL_LINK( ExecJob, void*, void ); diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx index 9ad27f9cacd8..8f1514450111 100644 --- a/vcl/source/gdi/vectorgraphicdata.cxx +++ b/vcl/source/gdi/vectorgraphicdata.cxx @@ -20,6 +20,7 @@ #include <tools/diagnose_ex.h> #include <tools/stream.hxx> #include <sal/log.hxx> +#include <utility> #include <vcl/vectorgraphicdata.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -293,10 +294,10 @@ std::pair<VectorGraphicData::State, size_t> VectorGraphicData::getSizeBytes() co } VectorGraphicData::VectorGraphicData( - const BinaryDataContainer& rDataContainer, + BinaryDataContainer aDataContainer, VectorGraphicDataType eVectorDataType, sal_Int32 nPageIndex) -: maDataContainer(rDataContainer), +: maDataContainer(std::move(aDataContainer)), mbSequenceCreated(false), mNestedBitmapSize(0), meType(eVectorDataType), diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx index 413355e60680..4eac9f772bd2 100644 --- a/vcl/source/graphic/GraphicObject.cxx +++ b/vcl/source/graphic/GraphicObject.cxx @@ -25,6 +25,7 @@ #include <osl/diagnose.h> #include <tools/fract.hxx> #include <tools/helpers.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/metaact.hxx> #include <vcl/GraphicObject.hxx> @@ -292,16 +293,16 @@ struct GrfSimpleCacheObj Graphic maGraphic; GraphicAttr maAttr; - GrfSimpleCacheObj( const Graphic& rGraphic, const GraphicAttr& rAttr ) : - maGraphic( rGraphic ), maAttr( rAttr ) {} + GrfSimpleCacheObj( Graphic aGraphic, const GraphicAttr& rAttr ) : + maGraphic(std::move( aGraphic )), maAttr( rAttr ) {} }; GraphicObject::GraphicObject() { } -GraphicObject::GraphicObject(const Graphic& rGraphic) - : maGraphic(rGraphic) +GraphicObject::GraphicObject(Graphic aGraphic) + : maGraphic(std::move(aGraphic)) { } diff --git a/vcl/source/graphic/VectorGraphicSearch.cxx b/vcl/source/graphic/VectorGraphicSearch.cxx index 710c6e5f52e6..6d26fd861fd7 100644 --- a/vcl/source/graphic/VectorGraphicSearch.cxx +++ b/vcl/source/graphic/VectorGraphicSearch.cxx @@ -8,6 +8,7 @@ * */ +#include <utility> #include <vcl/VectorGraphicSearch.hxx> #include <vcl/filter/PDFiumLibrary.hxx> @@ -191,9 +192,9 @@ public: ~Implementation() { mpSearchContext.reset(); } }; -VectorGraphicSearch::VectorGraphicSearch(Graphic const& rGraphic) +VectorGraphicSearch::VectorGraphicSearch(Graphic aGraphic) : mpImplementation(std::make_unique<VectorGraphicSearch::Implementation>()) - , maGraphic(rGraphic) + , maGraphic(std::move(aGraphic)) { } diff --git a/vcl/source/helper/driverblocklist.cxx b/vcl/source/helper/driverblocklist.cxx index 855376dc1fb5..e17b45e7a922 100644 --- a/vcl/source/helper/driverblocklist.cxx +++ b/vcl/source/helper/driverblocklist.cxx @@ -13,6 +13,7 @@ #include <string_view> #include <sal/log.hxx> +#include <utility> #ifdef _WIN32 #if !defined WIN32_LEAN_AND_MEAN @@ -179,10 +180,10 @@ std::string_view GetVendorNameFromId(uint32_t id) } } -Parser::Parser(const OUString& rURL, std::vector<DriverInfo>& rDriverList, VersionType versionType) +Parser::Parser(OUString aURL, std::vector<DriverInfo>& rDriverList, VersionType versionType) : meBlockType(BlockType::UNKNOWN) , mrDriverList(rDriverList) - , maURL(rURL) + , maURL(std::move(aURL)) , mVersionType(versionType) { } @@ -558,8 +559,8 @@ namespace { struct compareIgnoreAsciiCase { - explicit compareIgnoreAsciiCase(const OUString& rString) - : maString(rString) + explicit compareIgnoreAsciiCase(OUString aString) + : maString(std::move(aString)) { } @@ -585,11 +586,11 @@ DriverInfo::DriverInfo() { } -DriverInfo::DriverInfo(OperatingSystem os, const OUString& vendor, VersionComparisonOp op, +DriverInfo::DriverInfo(OperatingSystem os, OUString vendor, VersionComparisonOp op, uint64_t driverVersion, bool bAllowlisted, const char* suggestedVersion /* = nullptr */) : meOperatingSystem(os) - , maAdapterVendor(vendor) + , maAdapterVendor(std::move(vendor)) , mbAllowlisted(bAllowlisted) , meComparisonOp(op) , mnDriverVersion(driverVersion) diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx index a5637c3bb452..65ce3ca0c441 100644 --- a/vcl/source/image/ImplImage.cxx +++ b/vcl/source/image/ImplImage.cxx @@ -18,6 +18,7 @@ */ #include <sal/log.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/bitmapex.hxx> #include <vcl/settings.hxx> @@ -35,9 +36,9 @@ ImplImage::ImplImage(const BitmapEx &rBitmapEx) { } -ImplImage::ImplImage(const OUString &aStockName) +ImplImage::ImplImage(OUString aStockName) : maBitmapChecksum(0) - , maStockName(aStockName) + , maStockName(std::move(aStockName)) { } diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 5f2d1e94af6a..94105a48545d 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -46,6 +46,7 @@ #include <tools/urlobj.hxx> #include <implimagetree.hxx> +#include <utility> #include <vcl/bitmapex.hxx> #include <vcl/dibtools.hxx> #include <vcl/settings.hxx> @@ -647,8 +648,8 @@ class FolderFileAccess : public ::cppu::WeakImplHelper<css::container::XNameAcce public: uno::Reference< uno::XComponentContext > mxContext; OUString maURL; - FolderFileAccess(uno::Reference< uno::XComponentContext > const & context, OUString const & url) - : mxContext(context), maURL(url) {} + FolderFileAccess(uno::Reference< uno::XComponentContext > context, OUString url) + : mxContext(std::move(context)), maURL(std::move(url)) {} // XElementAccess virtual css::uno::Type SAL_CALL getElementType() override { return cppu::UnoType<io::XInputStream>::get(); } virtual sal_Bool SAL_CALL hasElements() override { return true; } diff --git a/vcl/source/text/ImplLayoutArgs.cxx b/vcl/source/text/ImplLayoutArgs.cxx index dbdc6e18f5a0..80e85a66dc26 100644 --- a/vcl/source/text/ImplLayoutArgs.cxx +++ b/vcl/source/text/ImplLayoutArgs.cxx @@ -24,13 +24,14 @@ #include <algorithm> #include <memory> +#include <utility> namespace vcl::text { ImplLayoutArgs::ImplLayoutArgs(const OUString& rStr, int nMinCharPos, int nEndCharPos, - SalLayoutFlags nFlags, const LanguageTag& rLanguageTag, + SalLayoutFlags nFlags, LanguageTag aLanguageTag, vcl::text::TextLayoutCache const* const pLayoutCache) - : maLanguageTag(rLanguageTag) + : maLanguageTag(std::move(aLanguageTag)) , mnFlags(nFlags) , mrStr(rStr) , mnMinCharPos(nMinCharPos) diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx index 84a0717c6252..034d9655f7af 100644 --- a/vcl/source/treelist/imap.cxx +++ b/vcl/source/treelist/imap.cxx @@ -21,6 +21,7 @@ #include <tools/urlobj.hxx> #include <tools/fract.hxx> #include <tools/GenericTypeSerializer.hxx> +#include <utility> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/mapmod.hxx> @@ -51,13 +52,13 @@ IMapObject::IMapObject() { } -IMapObject::IMapObject( const OUString& rURL, const OUString& rAltText, const OUString& rDesc, - const OUString& rTarget, const OUString& rName, bool bURLActive ) -: aURL( rURL ) -, aAltText( rAltText ) -, aDesc( rDesc ) -, aTarget( rTarget ) -, aName( rName ) +IMapObject::IMapObject( OUString _aURL, OUString _aAltText, OUString _aDesc, + OUString _aTarget, OUString _aName, bool bURLActive ) +: aURL(std::move( _aURL )) +, aAltText(std::move( _aAltText )) +, aDesc(std::move( _aDesc )) +, aTarget(std::move( _aTarget )) +, aName(std::move( _aName )) , bActive( bURLActive ) , nReadVersion( 0 ) { @@ -550,8 +551,8 @@ bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj ) |* \******************************************************************************/ -ImageMap::ImageMap( const OUString& rName ) -: aName( rName ) +ImageMap::ImageMap( OUString _aName ) +: aName(std::move( _aName )) { } diff --git a/vcl/source/treelist/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx index 75d2bb4cf03a..ef6250a767cd 100644 --- a/vcl/source/treelist/svlbitm.cxx +++ b/vcl/source/treelist/svlbitm.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/toolkit/treelistbox.hxx> #include <vcl/toolkit/svlbitm.hxx> #include <vcl/toolkit/treelistentry.hxx> @@ -167,11 +168,11 @@ bool SvLBoxButtonData::IsRadio() const { // *************************************************************** -SvLBoxString::SvLBoxString(const OUString& rStr) +SvLBoxString::SvLBoxString(OUString aStr) : mbEmphasized(false) , mbCustom(false) , mfAlign(0.0) - , maText(rStr) + , maText(std::move(aStr)) { } diff --git a/vcl/source/window/bubblewindow.cxx b/vcl/source/window/bubblewindow.cxx index 1a4a46a3fea2..00a20714e0cf 100644 --- a/vcl/source/window/bubblewindow.cxx +++ b/vcl/source/window/bubblewindow.cxx @@ -18,6 +18,7 @@ */ #include <rtl/ustrbuf.hxx> +#include <utility> #include <vcl/menubarupdateicon.hxx> #include <vcl/lineinfo.hxx> #include <vcl/settings.hxx> @@ -33,15 +34,15 @@ #define TEXT_MAX_WIDTH 300 #define TEXT_MAX_HEIGHT 200 -BubbleWindow::BubbleWindow( vcl::Window* pParent, const OUString& rTitle, - const OUString& rText, const Image& rImage ) +BubbleWindow::BubbleWindow( vcl::Window* pParent, OUString aTitle, + OUString aText, Image aImage ) : FloatingWindow( pParent, WB_SYSTEMWINDOW | WB_OWNERDRAWDECORATION | WB_NOBORDER ) - , maBubbleTitle( rTitle ) - , maBubbleText( rText ) - , maBubbleImage( rImage ) + , maBubbleTitle(std::move( aTitle )) + , maBubbleText(std::move( aText )) + , maBubbleImage(std::move( aImage )) , maMaxTextSize( TEXT_MAX_WIDTH, TEXT_MAX_HEIGHT ) , mnTipOffset( 0 ) { diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index d25426cedbe7..0afa10535670 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -24,6 +24,7 @@ #include <sal/log.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/resmgr.hxx> +#include <utility> #include <vcl/builder.hxx> #include <vcl/dialoghelper.hxx> #include <vcl/menu.hxx> @@ -442,19 +443,19 @@ namespace weld } VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUString& sUIFile, - const OString& sID, const css::uno::Reference<css::frame::XFrame>& rFrame, + OString sID, css::uno::Reference<css::frame::XFrame> xFrame, bool bLegacy, const NotebookBarAddonsItem* pNotebookBarAddonsItem) : m_pNotebookBarAddonsItem(pNotebookBarAddonsItem ? new NotebookBarAddonsItem(*pNotebookBarAddonsItem) : new NotebookBarAddonsItem{}) - , m_sID(sID) + , m_sID(std::move(sID)) , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8)) , m_pStringReplace(Translate::GetReadStringHook()) , m_pParent(pParent) , m_bToplevelParentFound(false) , m_bLegacy(bLegacy) , m_pParserState(new ParserState) - , m_xFrame(rFrame) + , m_xFrame(std::move(xFrame)) { m_bToplevelHasDeferredInit = pParent && ((pParent->IsSystemWindow() && static_cast<SystemWindow*>(pParent)->isDeferredInit()) || @@ -4394,8 +4395,8 @@ VclBuilder::ParserState::ParserState() , m_nLastMenuItemId(0) {} -VclBuilder::MenuAndId::MenuAndId(const OString &rId, Menu *pMenu) - : m_sID(rId) +VclBuilder::MenuAndId::MenuAndId(OString aId, Menu *pMenu) + : m_sID(std::move(aId)) , m_pMenu(pMenu) {} diff --git a/vcl/source/window/commandevent.cxx b/vcl/source/window/commandevent.cxx index 812409ca1307..e38b526a623d 100644 --- a/vcl/source/window/commandevent.cxx +++ b/vcl/source/window/commandevent.cxx @@ -19,12 +19,13 @@ #include <string.h> +#include <utility> #include <vcl/commandevent.hxx> -CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, +CommandExtTextInputData::CommandExtTextInputData( OUString aText, const ExtTextInputAttr* pTextAttr, sal_Int32 nCursorPos, sal_uInt16 nCursorFlags, bool bOnlyCursor) - : maText(rText) + : maText(std::move(aText)) { if ( pTextAttr && !maText.isEmpty() ) { diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx index 71191122b2c5..7dc1b3253874 100644 --- a/vcl/source/window/errinf.cxx +++ b/vcl/source/window/errinf.cxx @@ -21,6 +21,7 @@ #include <sal/log.hxx> #include <tools/debug.hxx> +#include <utility> #include <vcl/errinf.hxx> #include <algorithm> @@ -321,8 +322,8 @@ DialogMask DynamicErrorInfo::GetDialogMask() const } StringErrorInfo::StringErrorInfo( - ErrCode nArgUserId, const OUString& aStringP, DialogMask nMask) -: DynamicErrorInfo(nArgUserId, nMask), aString(aStringP) + ErrCode nArgUserId, OUString aStringP, DialogMask nMask) +: DynamicErrorInfo(nArgUserId, nMask), aString(std::move(aStringP)) { } diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 258ea8dc1105..facfeb8c71f0 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -36,6 +36,7 @@ #include <o3tl/enumrange.hxx> #include <o3tl/string_view.hxx> #include <tools/stream.hxx> +#include <utility> #include <vcl/builder.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/cvtgrf.hxx> @@ -2440,7 +2441,7 @@ MessageDialog::MessageDialog(vcl::Window* pParent, WinBits nStyle) } MessageDialog::MessageDialog(vcl::Window* pParent, - const OUString &rMessage, + OUString aMessage, VclMessageType eMessageType, VclButtonsType eButtonsType) : Dialog(pParent, WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE) @@ -2451,7 +2452,7 @@ MessageDialog::MessageDialog(vcl::Window* pParent, , m_pImage(nullptr) , m_pPrimaryMessage(nullptr) , m_pSecondaryMessage(nullptr) - , m_sPrimaryString(rMessage) + , m_sPrimaryString(std::move(aMessage)) { SetType(WindowType::MESSBOX); create_owned_areas(); diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index 25af6fc6db8e..e02dddc6f024 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/vclenum.hxx> #include <vcl/glyphitem.hxx> #include <vcl/image.hxx> @@ -72,12 +73,12 @@ struct MenuItemData , bHiddenOnGUI(false) { } - MenuItemData( const OUString& rStr ) + MenuItemData( OUString aStr ) : nId(0) , eType(MenuItemType::DONTKNOW) , nBits(MenuItemBits::NONE) , pSubMenu(nullptr) - , aText(rStr) + , aText(std::move(aStr)) , nUserValue(nullptr) , aUserValueReleaseFunc(nullptr) , aImage() diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index b2b3cf67a46d..87ee7f0891c2 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -24,6 +24,7 @@ #include <unotools/localedatawrapper.hxx> #include <officecfg/Office/Common.hxx> +#include <utility> #include <vcl/QueueInfo.hxx> #include <vcl/commandevent.hxx> #include <vcl/decoview.hxx> @@ -526,9 +527,9 @@ Size const & PrintDialog::getJobPageSize() return maFirstPageSize; } -PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptr<PrinterController>& i_rController) +PrintDialog::PrintDialog(weld::Window* i_pWindow, std::shared_ptr<PrinterController> i_xController) : GenericDialogController(i_pWindow, "vcl/ui/printdialog.ui", "PrintDialog") - , maPController( i_rController ) + , maPController(std::move( i_xController )) , mxTabCtrl(m_xBuilder->weld_notebook("tabcontrol")) , mxScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow")) , mxPageLayoutFrame(m_xBuilder->weld_frame("layoutframe")) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 5a1112da5c6a..5237aec9365f 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -18,6 +18,7 @@ */ #include <sal/config.h> +#include <utility> #include <vcl/uitest/logger.hxx> #include <sal/log.hxx> @@ -110,24 +111,24 @@ ImplToolItem::ImplToolItem() init(ToolBoxItemId(0), ToolBoxItemBits::NONE, true); } -ImplToolItem::ImplToolItem( ToolBoxItemId nItemId, const Image& rImage, +ImplToolItem::ImplToolItem( ToolBoxItemId nItemId, Image aImage, ToolBoxItemBits nItemBits ) : - maImage( rImage ) + maImage(std::move( aImage )) { init(nItemId, nItemBits, false); } -ImplToolItem::ImplToolItem( ToolBoxItemId nItemId, const OUString& rText, +ImplToolItem::ImplToolItem( ToolBoxItemId nItemId, OUString aText, ToolBoxItemBits nItemBits ) : - maText( rText ) + maText(std::move( aText )) { init(nItemId, nItemBits, false); } -ImplToolItem::ImplToolItem( ToolBoxItemId nItemId, const Image& rImage, - const OUString& rText, ToolBoxItemBits nItemBits ) : - maImage( rImage ), - maText( rText ) +ImplToolItem::ImplToolItem( ToolBoxItemId nItemId, Image aImage, + OUString aText, ToolBoxItemBits nItemBits ) : + maImage(std::move( aImage )), + maText(std::move( aText )) { init(nItemId, nItemBits, false); } diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx index 17b34442bd47..6ff9c8bd205c 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx @@ -22,6 +22,7 @@ #include "cairo_xlib_cairo.hxx" +#include <utility> #include <vcl/sysdata.hxx> #include <vcl/bitmap.hxx> #include <vcl/virdev.hxx> @@ -94,11 +95,11 @@ namespace cairo * Set the mpSurface as pSurface **/ X11Surface::X11Surface( const X11SysData& rSysData, - const X11PixmapSharedPtr& rPixmap, - const CairoSurfaceSharedPtr& pSurface ) : + X11PixmapSharedPtr rPixmap, + CairoSurfaceSharedPtr pSurface ) : maSysData(rSysData), - mpPixmap(rPixmap), - mpSurface(pSurface) + mpPixmap(std::move(rPixmap)), + mpSurface(std::move(pSurface)) {} /** @@ -112,9 +113,9 @@ namespace cairo * * Set the mpSurface as pSurface **/ - X11Surface::X11Surface( const CairoSurfaceSharedPtr& pSurface ) : + X11Surface::X11Surface( CairoSurfaceSharedPtr pSurface ) : maSysData(), - mpSurface(pSurface) + mpSurface(std::move(pSurface)) {} /** diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx index c44fde437a32..e8f6cd28ea18 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx @@ -66,11 +66,11 @@ namespace cairo { X11PixmapSharedPtr mpPixmap; CairoSurfaceSharedPtr mpSurface; - X11Surface( const X11SysData& rSysData, const X11PixmapSharedPtr& rPixmap, const CairoSurfaceSharedPtr& pSurface ); + X11Surface( const X11SysData& rSysData, X11PixmapSharedPtr aPixmap, CairoSurfaceSharedPtr pSurface ); public: /// takes over ownership of passed cairo_surface - explicit X11Surface( const CairoSurfaceSharedPtr& pSurface ); + explicit X11Surface( CairoSurfaceSharedPtr pSurface ); /// create surface on subarea of given drawable X11Surface( const X11SysData& rSysData, int x, int y, int width, int height ); /// create surface for given bitmap data diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index bb7d3e10e474..cd5e771d4c96 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <o3tl/safeint.hxx> +#include <utility> #include <vcl/fontcharmap.hxx> #include <unx/freetype_glyphcache.hxx> @@ -72,8 +73,8 @@ static FT_Library aLibFT = nullptr; static int nDefaultPrioEmbedded = 2; static int nDefaultPrioAntiAlias = 1; -FreetypeFontFile::FreetypeFontFile( const OString& rNativeFileName ) -: maNativeFileName( rNativeFileName ), +FreetypeFontFile::FreetypeFontFile( OString aNativeFileName ) +: maNativeFileName(std::move( aNativeFileName )), mpFileMap( nullptr ), mnFileSize( 0 ), mnRefCount( 0 ), @@ -144,7 +145,7 @@ void FreetypeFontFile::Unmap() } } -FreetypeFontInfo::FreetypeFontInfo( const FontAttributes& rDevFontAttributes, +FreetypeFontInfo::FreetypeFontInfo( FontAttributes aDevFontAttributes, FreetypeFontFile* const pFontFile, int nFaceNum, int nFaceVariation, sal_IntPtr nFontId) : maFaceFT( nullptr ), @@ -153,7 +154,7 @@ FreetypeFontInfo::FreetypeFontInfo( const FontAttributes& rDevFontAttributes, mnFaceVariation( nFaceVariation ), mnRefCount( 0 ), mnFontId( nFontId ), - maDevFontAttributes( rDevFontAttributes ) + maDevFontAttributes(std::move( aDevFontAttributes )) { // prefer font with low ID maDevFontAttributes.IncreaseQualityBy( 10000 - nFontId ); @@ -410,12 +411,12 @@ rtl::Reference<LogicalFontInstance> FreetypeFontFace::CreateFontInstance(const v // FreetypeFont -FreetypeFont::FreetypeFont(FreetypeFontInstance& rFontInstance, const std::shared_ptr<FreetypeFontInfo>& rFI) +FreetypeFont::FreetypeFont(FreetypeFontInstance& rFontInstance, std::shared_ptr<FreetypeFontInfo> xFI) : mrFontInstance(rFontInstance), mnCos( 0x10000), mnSin( 0 ), mnPrioAntiAlias(nDefaultPrioAntiAlias), - mxFontInfo(rFI), + mxFontInfo(std::move(xFI)), mnLoadFlags( 0 ), maFaceFT( nullptr ), maSizeFT( nullptr ), diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index b84ba0befc4c..5c17874c4dfb 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -44,6 +44,7 @@ #include <rtl/ustring.hxx> #include <sal/log.hxx> +#include <utility> #include <vcl/gdimtf.hxx> #include <vcl/idle.hxx> #include <vcl/printer/Options.hxx> @@ -948,8 +949,8 @@ struct PDFPrintFile OUString maTmpURL; PDFNewJobParameters maParameters; - PDFPrintFile( const OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters ) - : maTmpURL( i_rURL ) + PDFPrintFile( OUString i_URL, const PDFNewJobParameters& i_rNewParameters ) + : maTmpURL(std::move( i_URL )) , maParameters( i_rNewParameters ) {} }; diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 56ee475e701e..0ff7366fab6c 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -22,6 +22,7 @@ #include <strings.hrc> #include <officecfg/Office/Common.hxx> +#include <utility> using namespace psp; @@ -67,9 +68,9 @@ void RTSDialog::insertAllPPDValues(weld::ComboBox& rBox, const PPDParser* pParse * RTSDialog */ -RTSDialog::RTSDialog(const PrinterInfo& rJobData, weld::Window* pParent) +RTSDialog::RTSDialog(PrinterInfo aJobData, weld::Window* pParent) : GenericDialogController(pParent, "vcl/ui/printerpropertiesdialog.ui", "PrinterPropertiesDialog") - , m_aJobData(rJobData) + , m_aJobData(std::move(aJobData)) , m_bDataModified(false) , m_xTabControl(m_xBuilder->weld_notebook("tabcontrol")) , m_xOKButton(m_xBuilder->weld_button("ok")) diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index bcf86670d0b6..4052bb50aa03 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -52,7 +52,7 @@ class RTSDialog : public weld::GenericDialogController void insertAllPPDValues(weld::ComboBox&, const psp::PPDParser*, const psp::PPDKey*); public: - RTSDialog(const ::psp::PrinterInfo& rJobData, weld::Window* pParent); + RTSDialog(::psp::PrinterInfo aJobData, weld::Window* pParent); virtual ~RTSDialog() override; const ::psp::PrinterInfo& getSetup() const { return m_aJobData; } diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index c16d257e2f04..af27c61610c2 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -26,6 +26,7 @@ #include <i18nlangtag/languagetag.hxx> #include <ppdparser.hxx> #include <strhelper.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -592,8 +593,8 @@ const PPDParser* PPDParser::getParser( const OUString& rFile ) return pNewParser; } -PPDParser::PPDParser(const OUString& rFile, const std::vector<PPDKey*>& keys) - : m_aFile(rFile) +PPDParser::PPDParser(OUString aFile, const std::vector<PPDKey*>& keys) + : m_aFile(std::move(aFile)) , m_bColorDevice(false) , m_bType42Capable(false) , m_nLanguageLevel(0) @@ -698,8 +699,8 @@ PPDParser::PPDParser(const OUString& rFile, const std::vector<PPDKey*>& keys) m_bColorDevice = pKey->countValues() > 1; } -PPDParser::PPDParser( const OUString& rFile ) : - m_aFile( rFile ), +PPDParser::PPDParser( OUString aFile ) : + m_aFile(std::move( aFile )), m_bColorDevice( false ), m_bType42Capable( false ), m_nLanguageLevel( 0 ), @@ -1568,8 +1569,8 @@ OUString PPDParser::translateOption( const OUString& i_rKey, * PPDKey */ -PPDKey::PPDKey( const OUString& rKey ) : - m_aKey( rKey ), +PPDKey::PPDKey( OUString aKey ) : + m_aKey(std::move( aKey )), m_pDefaultValue( nullptr ), m_bQueryValue( false ), m_bUIOption( false ), diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx index 183ea20a0a4a..21ccd7cfab1a 100644 --- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx @@ -43,6 +43,7 @@ #include <unx/gtk/gtkdata.hxx> #include <unx/gtk/gtkinst.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <o3tl/string_view.hxx> @@ -367,9 +368,9 @@ protected: css::uno::Sequence< css::beans::StringPair > m_aSubFilters; public: - FilterEntry( const OUString& _rTitle, const OUString& _rFilter ) - :m_sTitle( _rTitle ) - ,m_sFilter( _rFilter ) + FilterEntry( OUString _aTitle, OUString _aFilter ) + :m_sTitle(std::move( _aTitle )) + ,m_sFilter(std::move( _aFilter )) { } diff --git a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx index 68172ad10f94..5810a545f4ea 100644 --- a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> @@ -104,13 +105,13 @@ GtkWindow* RunDialog::GetTransientFor() return GTK_WINDOW(widget_get_toplevel(pFrame->getWindow())); } -RunDialog::RunDialog(GtkWidget *pDialog, const uno::Reference<awt::XExtendedToolkit>& rToolkit, - const uno::Reference<frame::XDesktop>& rDesktop) +RunDialog::RunDialog(GtkWidget *pDialog, uno::Reference<awt::XExtendedToolkit> xToolkit, + uno::Reference<frame::XDesktop> xDesktop) : cppu::WeakComponentImplHelper<awt::XTopWindowListener, frame::XTerminateListener>(maLock) , mpDialog(pDialog) , mbTerminateDesktop(false) - , mxToolkit(rToolkit) - , mxDesktop(rDesktop) + , mxToolkit(std::move(xToolkit)) + , mxDesktop(std::move(xDesktop)) { } @@ -168,8 +169,8 @@ namespace private: css::uno::Reference<css::frame::XDesktop> mxDesktop; public: - ExecuteInfo(const css::uno::Reference<css::frame::XDesktop>& rDesktop) - : mxDesktop(rDesktop) + ExecuteInfo(css::uno::Reference<css::frame::XDesktop> xDesktop) + : mxDesktop(std::move(xDesktop)) { } void terminate() @@ -225,10 +226,10 @@ IMPL_STATIC_LINK(RunDialog, TerminateDesktop, void*, p, void) delete pExecuteInfo; } -SalGtkPicker::SalGtkPicker( const uno::Reference<uno::XComponentContext>& xContext ) +SalGtkPicker::SalGtkPicker( uno::Reference<uno::XComponentContext> xContext ) : m_pParentWidget(nullptr) , m_pDialog(nullptr) - , m_xContext(xContext) + , m_xContext(std::move(xContext)) { } diff --git a/vcl/unx/gtk3/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk3/fpicker/SalGtkPicker.hxx index 7da0ba04e31c..cb11445dae79 100644 --- a/vcl/unx/gtk3/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk3/fpicker/SalGtkPicker.hxx @@ -51,7 +51,7 @@ class SalGtkPicker { public: - SalGtkPicker( const css::uno::Reference<css::uno::XComponentContext>& xContext ); + SalGtkPicker( css::uno::Reference<css::uno::XComponentContext> xContext ); virtual ~SalGtkPicker(); protected: osl::Mutex m_rbHelperMtx; @@ -113,8 +113,8 @@ public: virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override; public: RunDialog(GtkWidget *pDialog, - const css::uno::Reference<css::awt::XExtendedToolkit>& rToolkit, - const css::uno::Reference<css::frame::XDesktop>& rDesktop); + css::uno::Reference<css::awt::XExtendedToolkit> xToolkit, + css::uno::Reference<css::frame::XDesktop> xDesktop); virtual ~RunDialog() override; gint run(); void cancel(); diff --git a/vcl/unx/gtk3/gtkcairo.cxx b/vcl/unx/gtk3/gtkcairo.cxx index 202e3244d617..b77711384ac2 100644 --- a/vcl/unx/gtk3/gtkcairo.cxx +++ b/vcl/unx/gtk3/gtkcairo.cxx @@ -9,6 +9,7 @@ #include "gtkcairo.hxx" +#include <utility> #include <vcl/sysdata.hxx> #include <vcl/virdev.hxx> @@ -38,10 +39,10 @@ namespace cairo * * Set the mpSurface as pSurface **/ - Gtk3Surface::Gtk3Surface(const CairoSurfaceSharedPtr& pSurface) + Gtk3Surface::Gtk3Surface(CairoSurfaceSharedPtr pSurface) : mpGraphics(nullptr) , cr(nullptr) - , mpSurface(pSurface) + , mpSurface(std::move(pSurface)) {} /** diff --git a/vcl/unx/gtk3/gtkcairo.hxx b/vcl/unx/gtk3/gtkcairo.hxx index 1b4ed6d32c01..c5912181fc21 100644 --- a/vcl/unx/gtk3/gtkcairo.hxx +++ b/vcl/unx/gtk3/gtkcairo.hxx @@ -25,7 +25,7 @@ namespace cairo { CairoSurfaceSharedPtr mpSurface; public: /// takes over ownership of passed cairo_surface - explicit Gtk3Surface(const CairoSurfaceSharedPtr& pSurface); + explicit Gtk3Surface(CairoSurfaceSharedPtr pSurface); /// create surface on subarea of given drawable explicit Gtk3Surface(const GtkSalGraphics* pGraphics, int x, int y, int width, int height); diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 1b4809fb57a2..4bd3573bb420 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -27,6 +27,7 @@ #include <unx/gtk/gtksalmenu.hxx> #include <headless/svpvd.hxx> #include <headless/svpbmp.hxx> +#include <utility> #include <vcl/builder.hxx> #include <vcl/inputtypes.hxx> #include <vcl/specialchars.hxx> @@ -17622,10 +17623,10 @@ private: DECL_LINK(SettingsChangedHdl, VclWindowEvent&, void); public: - GtkInstanceDrawingArea(GtkDrawingArea* pDrawingArea, GtkInstanceBuilder* pBuilder, const a11yref& rA11y, bool bTakeOwnership) + GtkInstanceDrawingArea(GtkDrawingArea* pDrawingArea, GtkInstanceBuilder* pBuilder, a11yref xA11y, bool bTakeOwnership) : GtkInstanceWidget(GTK_WIDGET(pDrawingArea), pBuilder, bTakeOwnership) , m_pDrawingArea(pDrawingArea) - , m_xAccessible(rA11y) + , m_xAccessible(std::move(xA11y)) #if !GTK_CHECK_VERSION(4, 0, 0) , m_pAccessible(nullptr) #endif |