formula/source/core/api/token.cxx | 9 +++++---- include/formula/token.hxx | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-)
New commits: commit 26fbf6eef19e2746c28d2f1584505d5e10a295cc Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Jun 22 09:00:52 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Jun 23 09:58:23 2022 +0200 clang-tidy modernize-pass-by-value in formula Change-Id: I275f96bb8b24838538ac88532508ad7dbd127eae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136271 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 9a22d9cd2205..04078302efa1 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -33,6 +33,7 @@ #include <formula/compiler.hxx> #include <svl/sharedstringpool.hxx> #include <memory> +#include <utility> namespace formula { @@ -1933,8 +1934,8 @@ bool FormulaTypedDoubleToken::operator==( const FormulaToken& r ) const return FormulaDoubleToken::operator==( r ) && mnType == r.GetDoubleType(); } -FormulaStringToken::FormulaStringToken( const svl::SharedString& r ) : - FormulaToken( svString ), maString( r ) +FormulaStringToken::FormulaStringToken( svl::SharedString r ) : + FormulaToken( svString ), maString(std::move( r )) { } @@ -1961,8 +1962,8 @@ bool FormulaStringToken::operator==( const FormulaToken& r ) const return FormulaToken::operator==( r ) && maString == r.GetString(); } -FormulaStringOpToken::FormulaStringOpToken( OpCode e, const svl::SharedString& r ) : - FormulaByteToken( e, 0, svString, ParamClass::Unknown ), maString( r ) {} +FormulaStringOpToken::FormulaStringOpToken( OpCode e, svl::SharedString r ) : + FormulaByteToken( e, 0, svString, ParamClass::Unknown ), maString(std::move( r )) {} FormulaStringOpToken::FormulaStringOpToken( const FormulaStringOpToken& r ) : FormulaByteToken( r ), maString( r.maString ) {} diff --git a/include/formula/token.hxx b/include/formula/token.hxx index ebb08e6d7c17..f534b2c5c801 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -24,6 +24,7 @@ #include <cstring> #include <memory> +#include <utility> #include <vector> #include <formula/formuladllapi.h> @@ -336,7 +337,7 @@ class FORMULA_DLLPUBLIC FormulaStringToken final : public FormulaToken { svl::SharedString maString; public: - FormulaStringToken( const svl::SharedString& r ); + FormulaStringToken( svl::SharedString r ); FormulaStringToken( const FormulaStringToken& r ); virtual FormulaToken* Clone() const override; @@ -352,7 +353,7 @@ class FORMULA_DLLPUBLIC FormulaStringOpToken final : public FormulaByteToken { svl::SharedString maString; public: - FormulaStringOpToken( OpCode e, const svl::SharedString& r ); + FormulaStringOpToken( OpCode e, svl::SharedString r ); FormulaStringOpToken( const FormulaStringOpToken& r ); virtual FormulaToken* Clone() const override; @@ -386,12 +387,12 @@ class FORMULA_DLLPUBLIC FormulaExternalToken final : public FormulaByteToken private: OUString aExternal; public: - FormulaExternalToken( OpCode e, sal_uInt8 n, const OUString& r ) : + FormulaExternalToken( OpCode e, sal_uInt8 n, OUString r ) : FormulaByteToken( e, n, svExternal, ParamClass::Unknown ), - aExternal( r ) {} - FormulaExternalToken( OpCode e, const OUString& r ) : + aExternal(std::move( r )) {} + FormulaExternalToken( OpCode e, OUString r ) : FormulaByteToken( e, 0, svExternal, ParamClass::Unknown ), - aExternal( r ) {} + aExternal(std::move( r )) {} FormulaExternalToken( const FormulaExternalToken& r ) : FormulaByteToken( r ), aExternal( r.aExternal ) {}