diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-07-12 15:52:29 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-07-13 09:22:40 +0200 |
commit | 54a97eb9ddd66294f303189ca12ef726177453cb (patch) | |
tree | fc068c028f44ef859021bf4b1a66daa29491a20d /include/vcl | |
parent | 72f631977435a704008a55d3be6489ba619e3064 (diff) |
clang-tidy modernize-pass-by-value in vcl
Change-Id: I9ddb786eb88213c53cf53067ced6899ca40ac6e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137000
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl')
32 files changed, 124 insertions, 111 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)) { } }; |