diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-01 09:09:05 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-01 13:05:05 +0200 |
commit | b4b4c129e9f00189978cd7b71fd74d0dca4c9ebc (patch) | |
tree | 1afab2d8c7eee21866030fd498faa53af6f9be66 /ucb | |
parent | 915f3959fe6b3e756b9797a9222b95d9b8c3d293 (diff) |
clang-tidy modernize-pass-by-value in ucb
Change-Id: I641d05e360c3208845a2fa6721ac8ba1ad0f3309
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137667
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
83 files changed, 269 insertions, 216 deletions
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index 41f5db735afa..1094f8fd53e3 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -23,6 +23,8 @@ *************************************************************************/ +#include <utility> + #include "identify.hxx" using namespace com::sun::star::uno; @@ -30,8 +32,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::ucb; // ContentIdentifier Implementation. -ContentIdentifier::ContentIdentifier(const OUString& ContentId) - : m_aContentId(ContentId) +ContentIdentifier::ContentIdentifier(OUString ContentId) + : m_aContentId(std::move(ContentId)) { } diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx index 357fef39a07b..a2d9c4f0d034 100644 --- a/ucb/source/core/identify.hxx +++ b/ucb/source/core/identify.hxx @@ -25,7 +25,7 @@ class ContentIdentifier : public cppu::WeakImplHelper<css::ucb::XContentIdentifier> { public: - explicit ContentIdentifier(const OUString& ContentId); + explicit ContentIdentifier(OUString ContentId); virtual ~ContentIdentifier() override; // XContentIdentifier diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx index 1d4c65aa54bf..42878b193437 100644 --- a/ucb/source/core/providermap.hxx +++ b/ucb/source/core/providermap.hxx @@ -40,8 +40,8 @@ private: public: explicit ProviderListEntry_Impl( - const css::uno::Reference< css::ucb::XContentProvider >& xProvider ) - : m_xProvider( xProvider ) {} + css::uno::Reference< css::ucb::XContentProvider > xProvider ) + : m_xProvider( std::move(xProvider) ) {} const css::uno::Reference< css::ucb::XContentProvider >& getProvider() const { return m_xProvider; } diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 7af7ba28add2..9bb2fad45665 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -27,6 +27,7 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <ucbhelper/macros.hxx> +#include <utility> using namespace com::sun::star::lang; using namespace com::sun::star::ucb; @@ -91,8 +92,8 @@ UcbContentProviderProxyFactory::createContentProvider( UcbContentProviderProxy::UcbContentProviderProxy( const Reference< XComponentContext >& rxContext, - const OUString& Service ) -: m_aService( Service ), + OUString Service ) +: m_aService(std::move( Service )), m_bReplace( false ), m_bRegister( false ), m_xContext( rxContext ) diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index 1654fa342158..746c9b63d801 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -81,7 +81,7 @@ class UcbContentProviderProxy : public: UcbContentProviderProxy( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const OUString& Service ); + OUString Service ); virtual ~UcbContentProviderProxy() override; // XInterface diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index f0e45b7cbed5..c6d7afd3c719 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -58,6 +58,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/simplenameclashresolverequest.hxx> +#include <utility> #include "ucbcmds.hxx" #include "ucb.hxx" @@ -83,13 +84,13 @@ struct TransferCommandContext ucb::GlobalTransferCommandArgument2 aArg; TransferCommandContext( - const uno::Reference< uno::XComponentContext > & xContext, - const uno::Reference< ucb::XCommandProcessor > & rxProcessor, - const uno::Reference< ucb::XCommandEnvironment > & rxEnv, - const uno::Reference< ucb::XCommandEnvironment > & rxOrigEnv, - const ucb::GlobalTransferCommandArgument2 & rArg ) - : m_xContext( xContext ), xProcessor( rxProcessor ), xEnv( rxEnv ), - xOrigEnv( rxOrigEnv ), aArg( rArg ) {} + uno::Reference< uno::XComponentContext > xContext, + uno::Reference< ucb::XCommandProcessor > _xProcessor, + uno::Reference< ucb::XCommandEnvironment > _xEnv, + uno::Reference< ucb::XCommandEnvironment > _xOrigEnv, + ucb::GlobalTransferCommandArgument2 _aArg ) + : m_xContext(std::move( xContext )), xProcessor(std::move( _xProcessor )), xEnv(std::move( _xEnv )), + xOrigEnv(std::move( _xOrigEnv )), aArg(std::move( _aArg )) {} }; @@ -102,8 +103,8 @@ class InteractionHandlerProxy : public: explicit InteractionHandlerProxy( - const uno::Reference< task::XInteractionHandler > & xOrig ) - : m_xOrig( xOrig ) {} + uno::Reference< task::XInteractionHandler > xOrig ) + : m_xOrig(std::move( xOrig )) {} // XInteractionHandler methods. virtual void SAL_CALL handle( diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 01f7c70b56b1..b94425afa36c 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -46,6 +46,7 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weak.hxx> +#include <utility> #include "ucbstore.hxx" using namespace com::sun::star::beans; @@ -1014,8 +1015,8 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess( PersistentPropertySet::PersistentPropertySet( PropertySetRegistry& rCreator, - const OUString& rKey ) -: m_pCreator( &rCreator ), m_aKey( rKey ) + OUString aKey ) +: m_pCreator( &rCreator ), m_aKey(std::move( aKey )) { // register at creator. rCreator.add( this ); diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 8b8597f756e4..322d64f05afa 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -171,7 +171,7 @@ private: public: PersistentPropertySet( PropertySetRegistry& rCreator, - const OUString& rKey ); + OUString aKey ); virtual ~PersistentPropertySet() override; // XServiceInfo diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx index a300f156bdc3..a0686ec67a50 100644 --- a/ucb/source/inc/regexp.hxx +++ b/ucb/source/inc/regexp.hxx @@ -55,10 +55,10 @@ private: bool m_bEmptyDomain; bool m_bTranslation; - inline Regexp(Kind eTheKind, OUString const & rThePrefix, - bool bTheEmptyDomain, OUString const & rTheInfix, + inline Regexp(Kind eTheKind, OUString aThePrefix, + bool bTheEmptyDomain, OUString aTheInfix, bool bTheTranslation, - OUString const & rTheReversePrefix); + OUString aTheReversePrefix); }; inline bool Regexp::operator ==(Regexp const & rOther) const diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 36e778043d68..186affb1db83 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -39,9 +39,9 @@ template< typename Val > class RegexpMapEntry { public: - RegexpMapEntry(OUString const & rTheRegexp, + RegexpMapEntry(OUString aTheRegexp, Val * pTheValue): - m_aRegexp(rTheRegexp), m_pValue(pTheValue) {} + m_aRegexp(std::move(aTheRegexp)), m_pValue(pTheValue) {} const OUString& getRegexp() const { return m_aRegexp; } @@ -61,8 +61,8 @@ struct Entry Regexp m_aRegexp; Val m_aValue; - Entry(Regexp const & rTheRegexp, Val const & rTheValue): - m_aRegexp(rTheRegexp), m_aValue(rTheValue) {} + Entry(Regexp aTheRegexp, Val aTheValue): + m_aRegexp(std::move(aTheRegexp)), m_aValue(std::move(aTheValue)) {} }; @@ -137,7 +137,7 @@ inline RegexpMapConstIter< Val >::RegexpMapConstIter(RegexpMap< Val > * pTheMap, int nTheList, ListIterator aTheIndex): m_aEntry(OUString(), nullptr), - m_aIndex(aTheIndex), + m_aIndex(std::move(aTheIndex)), m_pMap(pTheMap), m_nList(nTheList), m_bEntrySet(false) diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 4b4dc42ec947..0eeac4a4a80f 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -26,6 +26,7 @@ #include <rtl/character.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> +#include <utility> using namespace com::sun::star; using namespace ucb_impl; @@ -34,14 +35,14 @@ using namespace ucb_impl; // Regexp -inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix, - bool bTheEmptyDomain, OUString const & rTheInfix, +inline Regexp::Regexp(Kind eTheKind, OUString aThePrefix, + bool bTheEmptyDomain, OUString aTheInfix, bool bTheTranslation, - OUString const & rTheReversePrefix): + OUString aTheReversePrefix): m_eKind(eTheKind), - m_aPrefix(rThePrefix), - m_aInfix(rTheInfix), - m_aReversePrefix(rTheReversePrefix), + m_aPrefix(std::move(aThePrefix)), + m_aInfix(std::move(aTheInfix)), + m_aReversePrefix(std::move(aTheReversePrefix)), m_bEmptyDomain(bTheEmptyDomain), m_bTranslation(bTheTranslation) { diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx index 9092f3c6bd25..c350617e226c 100644 --- a/ucb/source/ucp/cmis/auth_provider.hxx +++ b/ucb/source/ucp/cmis/auth_provider.hxx @@ -31,10 +31,10 @@ namespace cmis OUString m_sBindingUrl; public: - AuthProvider ( const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv, - const OUString& sUrl, - const OUString& sBindingUrl ): - m_xEnv( xEnv ), m_sUrl( sUrl ), m_sBindingUrl( sBindingUrl ) { } + AuthProvider ( css::uno::Reference< css::ucb::XCommandEnvironment> xEnv, + OUString sUrl, + OUString sBindingUrl ): + m_xEnv( std::move(xEnv) ), m_sUrl( std::move(sUrl) ), m_sBindingUrl( std::move(sBindingUrl) ) { } bool authenticationQuery( std::string& username, std::string& password ) override; diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx index 110bf78ca5a2..ae46c8397f3c 100644 --- a/ucb/source/ucp/cmis/certvalidation_handler.hxx +++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx @@ -22,6 +22,7 @@ #endif #include <com/sun/star/ucb/XCommandEnvironment.hpp> +#include <utility> namespace cmis { @@ -35,8 +36,8 @@ namespace cmis CertValidationHandler ( const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv, const css::uno::Reference< css::uno::XComponentContext>& xContext, - const OUString& sHostname ): - m_xEnv( xEnv ), m_xContext( xContext ), m_sHostname( sHostname ) { } + OUString sHostname ): + m_xEnv( xEnv ), m_xContext( xContext ), m_sHostname(std::move( sHostname )) { } bool validateCertificate( std::vector< std::string > certificates ) override; }; diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index e51a452fb7e3..0bd38ea31f65 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -56,6 +56,7 @@ #include <ucbhelper/proxydecider.hxx> #include <ucbhelper/macros.hxx> #include <sax/tools/converter.hxx> +#include <utility> #include "auth_provider.hxx" #include "certvalidation_handler.hxx" @@ -261,11 +262,11 @@ namespace cmis { Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, - libcmis::ObjectPtr const & pObject ) + libcmis::ObjectPtr pObject ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), m_pSession( nullptr ), - m_pObject( pObject ), + m_pObject(std::move( pObject )), m_sURL( Identifier->getContentIdentifier( ) ), m_aURL( Identifier->getContentIdentifier( ) ), m_bTransient( false ), diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 23546ce14a3e..4d878133aa0a 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -139,7 +139,7 @@ public: Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - libcmis::ObjectPtr const & pObject = libcmis::ObjectPtr( ) ); + libcmis::ObjectPtr pObject = libcmis::ObjectPtr( ) ); /// @throws css::ucb::ContentCreationException Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index f11a9139707e..35d5429ec612 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -25,7 +25,7 @@ namespace cmis css::uno::Reference< css::ucb::XContent > xContent; css::uno::Reference< css::sdbc::XRow > xRow; - explicit ResultListEntry( css::uno::Reference< css::ucb::XContent > const & xCnt ) : xContent( xCnt ) + explicit ResultListEntry( css::uno::Reference< css::ucb::XContent > xCnt ) : xContent( std::move(xCnt) ) { } }; diff --git a/ucb/source/ucp/cmis/std_inputstream.cxx b/ucb/source/ucp/cmis/std_inputstream.cxx index ed7e5d19b7a8..e73a3160b979 100644 --- a/ucb/source/ucp/cmis/std_inputstream.cxx +++ b/ucb/source/ucp/cmis/std_inputstream.cxx @@ -13,6 +13,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <sal/log.hxx> #include <cppuhelper/queryinterface.hxx> +#include <utility> #include "std_inputstream.hxx" @@ -20,8 +21,8 @@ using namespace com::sun::star; namespace cmis { - StdInputStream::StdInputStream( boost::shared_ptr< std::istream > const & pStream ) : - m_pStream( pStream ), + StdInputStream::StdInputStream( boost::shared_ptr< std::istream > pStream ) : + m_pStream(std::move( pStream )), m_nLength( 0 ) { if (m_pStream) diff --git a/ucb/source/ucp/cmis/std_inputstream.hxx b/ucb/source/ucp/cmis/std_inputstream.hxx index 7cfcf7a88901..1904d7ebe937 100644 --- a/ucb/source/ucp/cmis/std_inputstream.hxx +++ b/ucb/source/ucp/cmis/std_inputstream.hxx @@ -29,7 +29,7 @@ namespace cmis { public: - StdInputStream( boost::shared_ptr< std::istream > const & pStream ); + StdInputStream( boost::shared_ptr< std::istream > pStream ); virtual ~StdInputStream() override; diff --git a/ucb/source/ucp/cmis/std_outputstream.cxx b/ucb/source/ucp/cmis/std_outputstream.cxx index 306dc4c44be3..ead2147b939f 100644 --- a/ucb/source/ucp/cmis/std_outputstream.cxx +++ b/ucb/source/ucp/cmis/std_outputstream.cxx @@ -12,6 +12,7 @@ #include <com/sun/star/io/IOException.hpp> #include <sal/log.hxx> #include <cppuhelper/queryinterface.hxx> +#include <utility> #include "std_outputstream.hxx" @@ -19,8 +20,8 @@ using namespace com::sun::star; namespace cmis { - StdOutputStream::StdOutputStream( boost::shared_ptr< std::ostream > const & pStream ) : - m_pStream( pStream ) + StdOutputStream::StdOutputStream( boost::shared_ptr< std::ostream > pStream ) : + m_pStream(std::move( pStream )) { } diff --git a/ucb/source/ucp/cmis/std_outputstream.hxx b/ucb/source/ucp/cmis/std_outputstream.hxx index 74eb4681e912..3201e14efe17 100644 --- a/ucb/source/ucp/cmis/std_outputstream.hxx +++ b/ucb/source/ucp/cmis/std_outputstream.hxx @@ -27,7 +27,7 @@ namespace cmis { public: - StdOutputStream( boost::shared_ptr< std::ostream > const & pStream ); + StdOutputStream( boost::shared_ptr< std::ostream > pStream ); virtual ~StdOutputStream( ) override; diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 3c515358f82b..68a6bc7b2f07 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -35,6 +35,7 @@ #include <memory> #include <string_view> +#include <utility> namespace ucb::ucp::ext @@ -77,8 +78,8 @@ namespace ucb::ucp::ext DataSupplier::DataSupplier( const Reference< XComponentContext >& rxContext, - const ::rtl::Reference< Content >& i_rContent ) - :m_xContent( i_rContent ) + ::rtl::Reference< Content > i_xContent ) + :m_xContent(std::move( i_xContent )) ,m_xContext( rxContext ) { } diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index f0118d6798aa..f0bea109e683 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -41,7 +41,7 @@ namespace ucb::ucp::ext public: DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent + rtl::Reference< Content > xContent ); void fetchData(); diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx index 2ccbded5567c..4dd38b200578 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.cxx +++ b/ucb/source/ucp/ext/ucpext_resultset.cxx @@ -22,6 +22,7 @@ #include "ucpext_datasupplier.hxx" #include <ucbhelper/resultset.hxx> +#include <utility> namespace ucb::ucp::ext @@ -37,11 +38,11 @@ namespace ucb::ucp::ext //= ResultSet - ResultSet::ResultSet( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent, + ResultSet::ResultSet( const Reference< XComponentContext >& rxContext, ::rtl::Reference< Content > i_xContent, const OpenCommandArgument2& i_rCommand, const Reference< XCommandEnvironment >& i_rEnv ) :ResultSetImplHelper( rxContext, i_rCommand ) ,m_xEnvironment( i_rEnv ) - ,m_xContent( i_rContent ) + ,m_xContent(std::move( i_xContent )) { } diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx index abd9fee9aeb7..a9dcd60923d1 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.hxx +++ b/ucb/source/ucp/ext/ucpext_resultset.hxx @@ -40,7 +40,7 @@ namespace ucb::ucp::ext public: ResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& i_rContent, + rtl::Reference< Content > i_xContent, const css::ucb::OpenCommandArgument2& i_rCommand, const css::uno::Reference< css::ucb::XCommandEnvironment >& i_rEnv ); diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 03590d3e0173..8865911c9960 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/ucb/NameClash.hpp> #include <comphelper/fileurl.hxx> #include <cppuhelper/supportsservice.hxx> +#include <utility> #include "filglob.hxx" #include "filid.hxx" #include "filrow.hxx" @@ -108,10 +109,10 @@ public: // Private Constructor for just inserted Contents BaseContent::BaseContent( TaskManager* pMyShell, - const OUString& parentName, + OUString parentName, bool bFolder ) : m_pMyShell( pMyShell ), - m_aUncPath( parentName ), + m_aUncPath(std::move( parentName )), m_bFolder( bFolder ), m_nState( JustInserted ) { @@ -124,10 +125,10 @@ BaseContent::BaseContent( TaskManager* pMyShell, BaseContent::BaseContent( TaskManager* pMyShell, const Reference< XContentIdentifier >& xContentIdentifier, - const OUString& aUncPath ) + OUString aUncPath ) : m_pMyShell( pMyShell ), m_xContentIdentifier( xContentIdentifier ), - m_aUncPath( aUncPath ), + m_aUncPath(std::move( aUncPath )), m_bFolder( false ), m_nState( FullFeatured ) { diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index a9afbdd5002c..ca1f045fb582 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -68,14 +68,14 @@ namespace fileaccess { // A special creator for inserted contents; Creates an ugly object BaseContent( TaskManager* pMyShell, - const OUString& parentName, + OUString parentName, bool bFolder ); public: BaseContent( TaskManager* pMyShell, const css::uno::Reference< css::ucb::XContentIdentifier >& xContentIdentifier, - const OUString& aUnqPath ); + OUString aUnqPath ); virtual ~BaseContent() override; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index c7199159fb44..80879a22e597 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -86,11 +86,11 @@ namespace fileaccess public: explicit TaskHandling( - const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ) + css::uno::Reference< css::ucb::XCommandEnvironment > xCommandEnv ) : m_bHandled( false ), m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nMinorCode( TASKHANDLER_NO_ERROR ), - m_xCommandEnvironment( xCommandEnv ) + m_xCommandEnvironment( std::move(xCommandEnv) ) { } diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 8e02302ebc4e..0294cea7b9f8 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -35,6 +35,7 @@ #include "ftpintreq.hxx" #include <memory> +#include <utility> #include <vector> #include <string.h> #include "curl.hxx" @@ -99,13 +100,13 @@ FTPContent::FTPContent( const Reference< XComponentContext >& rxContext, FTPContent::FTPContent( const Reference< XComponentContext >& rxContext, FTPContentProvider* pProvider, const Reference< XContentIdentifier >& Identifier, - const ContentInfo& Info) + ContentInfo Info) : ContentImplHelper(rxContext,pProvider,Identifier) , m_pFCP(pProvider) , m_aFTPURL(Identifier->getContentIdentifier(), pProvider) , m_bInserted(true) , m_bTitleSet(false) - , m_aInfo(Info) + , m_aInfo(std::move(Info)) { } diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index ab0bda66ad73..6eef6c30a5c6 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -56,7 +56,7 @@ public: FTPContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - const css::ucb::ContentInfo& aInfo); + css::ucb::ContentInfo aInfo); virtual ~FTPContent() override; diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 8bdc1b93528d..b6df70ef7396 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -23,6 +23,8 @@ ************************************************************************** *************************************************************************/ +#include <utility> + #include "ftpcontentidentifier.hxx" using namespace ftp; @@ -32,9 +34,9 @@ using namespace com::sun::star::lang; FTPContentIdentifier::FTPContentIdentifier( - const OUString& ident + OUString ident ) - : m_ident(ident) + : m_ident(std::move(ident)) { } diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index c91ad704f8cf..d5552559c7e4 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -35,7 +35,7 @@ namespace ftp { { public: - explicit FTPContentIdentifier(const OUString& ident); + explicit FTPContentIdentifier(OUString ident); virtual ~FTPContentIdentifier() override; diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 815145918853..84beb5c700ca 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -23,17 +23,18 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <ucbhelper/resultsetmetadata.hxx> #include <cppuhelper/queryinterface.hxx> +#include <utility> #include "ftpresultsetbase.hxx" using namespace ftp; using namespace com::sun::star; ResultSetBase::ResultSetBase( - const uno::Reference< uno::XComponentContext >& rxContext, - const uno::Reference< ucb::XContentProvider >& xProvider, + uno::Reference< uno::XComponentContext > xContext, + uno::Reference< ucb::XContentProvider > xProvider, const uno::Sequence< beans::Property >& seq ) - : m_xContext( rxContext ), - m_xProvider( xProvider ), + : m_xContext(std::move( xContext )), + m_xProvider(std::move( xProvider )), m_nRow( -1 ), m_nWasNull( true ), m_sProperty( seq ) diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index cfb447f6ef04..ee7fa463821f 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -48,8 +48,8 @@ namespace ftp { { public: - ResultSetBase(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::ucb::XContentProvider >& xProvider, + ResultSetBase(css::uno::Reference< css::uno::XComponentContext > xContext, + css::uno::Reference< css::ucb::XContentProvider > xProvider, const css::uno::Sequence< css::beans::Property >& seq); virtual ~ResultSetBase() override; diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index fd4335dc570c..01fdc3e574ea 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -21,6 +21,7 @@ #include <ucbhelper/providerhelper.hxx> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/OpenMode.hpp> +#include <utility> #include "gio_datasupplier.hxx" #include "gio_content.hxx" @@ -30,8 +31,8 @@ using namespace gio; namespace gio { -DataSupplier::DataSupplier( const rtl::Reference< ::gio::Content >& rContent, sal_Int32 nOpenMode ) - : mxContent(rContent), mnOpenMode(nOpenMode), mbCountFinal(false) +DataSupplier::DataSupplier( rtl::Reference< ::gio::Content > xContent, sal_Int32 nOpenMode ) + : mxContent(std::move(xContent)), mnOpenMode(nOpenMode), mbCountFinal(false) { } diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx index 4a0e0b36e909..e2ca1d8277e7 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.hxx +++ b/ucb/source/ucp/gio/gio_datasupplier.hxx @@ -59,7 +59,7 @@ private: bool getData(); ResultList maResults; public: - DataSupplier( const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode ); + DataSupplier( rtl::Reference< Content > xContent, sal_Int32 nOpenMode ); virtual ~DataSupplier() override; virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; diff --git a/ucb/source/ucp/gio/gio_resultset.cxx b/ucb/source/ucp/gio/gio_resultset.cxx index ee836bd0ee94..a91c552b79a3 100644 --- a/ucb/source/ucp/gio/gio_resultset.cxx +++ b/ucb/source/ucp/gio/gio_resultset.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> + #include "gio_datasupplier.hxx" #include "gio_resultset.hxx" @@ -28,11 +30,11 @@ using namespace gio; DynamicResultSet::DynamicResultSet( const Reference< XComponentContext >& rxContext, - const rtl::Reference< Content >& rxContent, + rtl::Reference< Content > xContent, const OpenCommandArgument2& rCommand, const Reference< XCommandEnvironment >& rxEnv ) : ResultSetImplHelper( rxContext, rCommand ), - m_xContent( rxContent ), + m_xContent(std::move( xContent )), m_xEnv( rxEnv ) { } diff --git a/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx index f5ea95e14a9c..69d9d6f7c34e 100644 --- a/ucb/source/ucp/gio/gio_resultset.hxx +++ b/ucb/source/ucp/gio/gio_resultset.hxx @@ -37,7 +37,7 @@ namespace gio public: DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rxContent, + rtl::Reference< Content > xContent, const css::ucb::OpenCommandArgument2& rCommand, const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); }; diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx index e5d863bee9a4..f9abe0667fba 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx @@ -26,6 +26,8 @@ the necessary interfaces, but never recognizes/notifies changes!!! *************************************************************************/ +#include <utility> + #include "hierarchydatasupplier.hxx" #include "dynamicresultset.hxx" @@ -38,10 +40,10 @@ using namespace hierarchy_ucp; DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, - const rtl::Reference< HierarchyContent >& rxContent, + rtl::Reference< HierarchyContent > xContent, const ucb::OpenCommandArgument2& rCommand ) : ResultSetImplHelper( rxContext, rCommand ), - m_xContent( rxContent ) + m_xContent(std::move( xContent )) { } diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx index 6452c26eae47..ed10c3874548 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx @@ -36,7 +36,7 @@ private: public: DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< HierarchyContent >& rxContent, + rtl::Reference< HierarchyContent > xContent, const css::ucb::OpenCommandArgument2& rCommand ); }; diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 1a773cd24564..b3f5366377fd 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -65,6 +65,7 @@ #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/macros.hxx> +#include <utility> #include "hierarchycontent.hxx" #include "hierarchyprovider.hxx" #include "dynamicresultset.hxx" @@ -115,9 +116,9 @@ HierarchyContent::HierarchyContent( const uno::Reference< uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, - const HierarchyContentProperties& rProps ) + HierarchyContentProperties aProps ) : ContentImplHelper( rxContext, pProvider, Identifier ), - m_aProps( rProps ), + m_aProps(std::move( aProps )), m_eState( PERSISTENT ), m_pProvider( pProvider ), m_bCheckedReadOnly( false ), diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index 94e75730a900..596299851cd5 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -114,7 +114,7 @@ private: const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - const HierarchyContentProperties& rProps ); + HierarchyContentProperties aProps ); HierarchyContent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 3e802a4fd53d..1e133232b105 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/util/XOfficeInstallationDirectories.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/propertysequence.hxx> +#include <utility> #include "hierarchyprovider.hxx" #include "hierarchyuri.hxx" @@ -93,10 +94,10 @@ constexpr OUStringLiteral CFGPROPERTY_NODEPATH = u"nodepath"; HierarchyEntry::HierarchyEntry( - const uno::Reference< uno::XComponentContext >& rxContext, + uno::Reference< uno::XComponentContext > xContext, HierarchyContentProvider* pProvider, const OUString& rURL ) -: m_xContext( rxContext ), +: m_xContext(std::move( xContext )), m_xOfficeInstDirs( pProvider->getOfficeInstallationDirectories() ), m_bTriedToGetRootReadAccess( false ) { diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx index e81364243d31..63c9a7a0afb7 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx @@ -92,7 +92,7 @@ private: getRootReadAccess(); public: - HierarchyEntry( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + HierarchyEntry( css::uno::Reference< css::uno::XComponentContext > xContext, HierarchyContentProvider* pProvider, const OUString& rURL ); diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 9c5fa97ae2ee..43703b758c79 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -42,6 +42,7 @@ #include <o3tl/string_view.hxx> #include <ucbhelper/macros.hxx> #include <mutex> +#include <utility> using namespace com::sun::star; using namespace hierarchy_ucp; @@ -88,8 +89,8 @@ class HierarchyDataAccess : public cppu::OWeakObject, bool m_bReadOnly; public: - HierarchyDataAccess( const uno::Reference< - uno::XInterface > & xConfigAccess, + HierarchyDataAccess( uno::Reference< + uno::XInterface > xConfigAccess, bool bReadOnly ); // XInterface @@ -184,8 +185,8 @@ using namespace hcp_impl; HierarchyDataSource::HierarchyDataSource( - const uno::Reference< uno::XComponentContext > & rxContext ) -: m_xContext( rxContext ) + uno::Reference< uno::XComponentContext > xContext ) +: m_xContext(std::move( xContext )) { } @@ -476,10 +477,10 @@ css::uno::Reference<T> HierarchyDataAccess::ensureOrigInterface(css::uno::Refere } -HierarchyDataAccess::HierarchyDataAccess( const uno::Reference< - uno::XInterface > & xConfigAccess, +HierarchyDataAccess::HierarchyDataAccess( uno::Reference< + uno::XInterface > xConfigAccess, bool bReadOnly ) -: m_xConfigAccess( xConfigAccess ), +: m_xConfigAccess(std::move( xConfigAccess )), m_bReadOnly( bReadOnly ) { } diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index b4bff294d22b..b2d181232829 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -44,7 +44,7 @@ class HierarchyDataSource : public cppu::WeakImplHelper< comphelper::OInterfaceContainerHelper4<css::lang::XEventListener> m_aDisposeEventListeners; public: - explicit HierarchyDataSource( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); + explicit HierarchyDataSource( css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~HierarchyDataSource() override; // XServiceInfo diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx index 8bad51dc0d5a..ee416e71c5f3 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx @@ -22,6 +22,7 @@ #include <rtl/ref.hxx> #include <ucbhelper/resultset.hxx> #include <mutex> +#include <utility> #include <vector> #include "hierarchydata.hxx" @@ -74,7 +75,7 @@ private: css::uno::Reference< css::sdbc::XRow > xRow; HierarchyEntryData aData; - explicit ResultListEntry( const HierarchyEntryData& rEntry ) : aData( rEntry ) {} + explicit ResultListEntry( HierarchyEntryData aEntry ) : aData(std::move( aEntry )) {} }; typedef std::vector< std::unique_ptr<ResultListEntry> > ResultList; std::mutex m_aMutex; diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx index c3089ef708d5..c49730d82f26 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx @@ -36,8 +36,8 @@ private: void init() const; public: - explicit HierarchyUri( const OUString & rUri ) - : m_aUri( rUri ), m_bValid( false ) {} + explicit HierarchyUri( OUString aUri ) + : m_aUri( std::move(aUri) ), m_bValid( false ) {} bool isValid() const { init(); return m_bValid; } diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx index db8ca00d414b..acdb03093449 100644 --- a/ucb/source/ucp/image/ucpimage.cxx +++ b/ucb/source/ucp/image/ucpimage.cxx @@ -20,6 +20,7 @@ #include <cppuhelper/supportsservice.hxx> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> +#include <utility> #include <vcl/ImageTree.hxx> #include <vcl/svapp.hxx> #include <ucbhelper/content.hxx> @@ -40,8 +41,8 @@ class Provider final: { public: explicit Provider( - css::uno::Reference<css::uno::XComponentContext> const & context): - context_(context) + css::uno::Reference<css::uno::XComponentContext> context): + context_(std::move(context)) {} private: diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 7fa8a13930f4..6e9961019e15 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -68,6 +68,7 @@ #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/macros.hxx> +#include <utility> #include "pkgcontent.hxx" #include "pkgprovider.hxx" #include "pkgresultset.hxx" @@ -237,14 +238,14 @@ Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, - const uno::Reference< container::XHierarchicalNameAccess > & Package, - const PackageUri& rUri, - const ContentProperties& rProps ) + uno::Reference< container::XHierarchicalNameAccess > Package, + PackageUri aUri, + ContentProperties aProps ) : ContentImplHelper( rxContext, pProvider, Identifier ), - m_aUri( rUri ), - m_aProps( rProps ), + m_aUri(std::move( aUri )), + m_aProps(std::move( aProps )), m_eState( PERSISTENT ), - m_xPackage( Package ), + m_xPackage(std::move( Package )), m_pProvider( pProvider ), m_nModifiedProps( NONE_MODIFIED ) { @@ -255,14 +256,14 @@ Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, - const uno::Reference< container::XHierarchicalNameAccess > & Package, - const PackageUri& rUri, + uno::Reference< container::XHierarchicalNameAccess > Package, + PackageUri aUri, const ucb::ContentInfo& Info ) : ContentImplHelper( rxContext, pProvider, Identifier ), - m_aUri( rUri ), + m_aUri(std::move( aUri )), m_aProps( Info.Type ), m_eState( TRANSIENT ), - m_xPackage( Package ), + m_xPackage(std::move( Package )), m_pProvider( pProvider ), m_nModifiedProps( NONE_MODIFIED ) { diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index 38b26b2becc6..e1eebad50f48 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -107,14 +107,14 @@ private: Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - const css::uno::Reference< css::container::XHierarchicalNameAccess >& Package, - const PackageUri& rUri, - const ContentProperties& rProps ); + css::uno::Reference< css::container::XHierarchicalNameAccess > Package, + PackageUri aUri, + ContentProperties aProps ); Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - const css::uno::Reference< css::container::XHierarchicalNameAccess >& Package, - const PackageUri& rUri, + css::uno::Reference< css::container::XHierarchicalNameAccess > Package, + PackageUri aUri, const css::ucb::ContentInfo& Info ); virtual css::uno::Sequence< css::beans::Property > diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index 242c94e14b07..436f7023d337 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/ucb/ResultSetException.hpp> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/providerhelper.hxx> +#include <utility> #include "pkgdatasupplier.hxx" #include "pkgcontent.hxx" #include "pkgprovider.hxx" @@ -43,9 +44,9 @@ using namespace package_ucp; DataSupplier::DataSupplier( - const uno::Reference< uno::XComponentContext >& rxContext, + uno::Reference< uno::XComponentContext > xContext, const rtl::Reference< Content >& rContent ) -: m_xContent( rContent ), m_xContext( rxContext ), +: m_xContent( rContent ), m_xContext(std::move( xContext )), m_xFolderEnum( rContent->getIterator() ), m_bCountFinal( !m_xFolderEnum.is() ), m_bThrowException( m_bCountFinal ) { diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx index 7ac78412c9e9..1872ef26e470 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.hxx +++ b/ucb/source/ucp/package/pkgdatasupplier.hxx @@ -23,6 +23,7 @@ #include <ucbhelper/resultset.hxx> #include <com/sun/star/container/XEnumeration.hpp> #include <mutex> +#include <utility> #include <vector> namespace package_ucp { @@ -32,7 +33,7 @@ class Content; class DataSupplier : public ::ucbhelper::ResultSetDataSupplier { public: - DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + DataSupplier( css::uno::Reference< css::uno::XComponentContext > xContext, const rtl::Reference< Content >& rContent ); virtual ~DataSupplier() override; @@ -70,7 +71,7 @@ private: css::uno::Reference< css::ucb::XContent > xContent; css::uno::Reference< css::sdbc::XRow > xRow; - explicit ResultListEntry( const OUString& rURL ) : aURL( rURL ) {} + explicit ResultListEntry(OUString _aURL ) : aURL(std::move( _aURL )) {} }; std::mutex m_aMutex; std::vector< ResultListEntry > m_aResults; diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 8ec89e87d329..636ecb3333e3 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -37,6 +37,7 @@ #include "pkgcontent.hxx" #include "pkguri.hxx" #include <unordered_map> +#include <utility> using namespace com::sun::star; @@ -57,10 +58,10 @@ class Package : public cppu::OWeakObject, ContentProvider* m_pOwner; public: - Package( const OUString& rName, - const uno::Reference< container::XHierarchicalNameAccess > & xNA, + Package( OUString aName, + uno::Reference< container::XHierarchicalNameAccess > xNA, ContentProvider* pOwner ) - : m_aName( rName ), m_xNA( xNA ), m_pOwner( pOwner ) {} + : m_aName(std::move( aName )), m_xNA(std::move( xNA )), m_pOwner( pOwner ) {} virtual ~Package() override { m_pOwner->removePackage( m_aName ); } // XInterface diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx index 3d0052725189..967625e9d34c 100644 --- a/ucb/source/ucp/package/pkgresultset.cxx +++ b/ucb/source/ucp/package/pkgresultset.cxx @@ -26,6 +26,8 @@ the necessary interfaces, but never recognizes/notifies changes!!! *************************************************************************/ +#include <utility> + #include "pkgdatasupplier.hxx" #include "pkgresultset.hxx" @@ -39,12 +41,12 @@ using namespace package_ucp; DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rxContent, + rtl::Reference< Content > xContent, const ucb::OpenCommandArgument2& rCommand, - const uno::Reference< ucb::XCommandEnvironment >& rxEnv ) + uno::Reference< ucb::XCommandEnvironment > xEnv ) : ResultSetImplHelper(rxContext, rCommand ), - m_xContent( rxContent ), - m_xEnv( rxEnv ) + m_xContent(std::move( xContent )), + m_xEnv(std::move( xEnv )) { } diff --git a/ucb/source/ucp/package/pkgresultset.hxx b/ucb/source/ucp/package/pkgresultset.hxx index 72cbda056c8d..c87a07423316 100644 --- a/ucb/source/ucp/package/pkgresultset.hxx +++ b/ucb/source/ucp/package/pkgresultset.hxx @@ -37,9 +37,9 @@ private: public: DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rxContent, + rtl::Reference< Content > xContent, const css::ucb::OpenCommandArgument2& rCommand, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); + css::uno::Reference< css::ucb::XCommandEnvironment > xEnv ); }; } diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx index df76875f6fac..4583a1afc819 100644 --- a/ucb/source/ucp/package/pkguri.hxx +++ b/ucb/source/ucp/package/pkguri.hxx @@ -20,6 +20,7 @@ #pragma once #include <rtl/ustring.hxx> +#include <utility> namespace package_ucp { @@ -44,8 +45,8 @@ private: void init() const; public: - explicit PackageUri( const OUString & rPackageUri ) - : m_aUri( rPackageUri ), m_bValid( false ) {} + explicit PackageUri( OUString aPackageUri ) + : m_aUri(std::move( aPackageUri )), m_bValid( false ) {} bool isValid() const { init(); return m_bValid; } diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 9323380bba71..ea695c7b0dbb 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -71,6 +71,7 @@ #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/macros.hxx> +#include <utility> #include "tdoc_content.hxx" #include "tdoc_resultset.hxx" @@ -144,9 +145,9 @@ Content::Content( const uno::Reference< uno::XComponentContext > & rxContext, ContentProvider * pProvider, const uno::Reference< ucb::XContentIdentifier > & Identifier, - const ContentProperties & rProps ) + ContentProperties aProps ) : ContentImplHelper( rxContext, pProvider, Identifier ), - m_aProps( rProps ), + m_aProps(std::move( aProps )), m_eState( PERSISTENT ), m_pProvider( pProvider ) { diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index 1412ebd9a846..08d2ba933759 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -25,6 +25,7 @@ #include <ucbhelper/contenthelper.hxx> #include <com/sun/star/ucb/XContentCreator.hpp> +#include <utility> #include "tdoc_provider.hxx" namespace com::sun::star { @@ -48,7 +49,7 @@ public: : m_eType( STREAM ) {} - ContentProperties( const ContentType & rType, const OUString & rTitle ) + ContentProperties( const ContentType & rType, OUString aTitle ) : m_eType( rType ), m_aContentType( rType == STREAM ? OUString( TDOC_STREAM_CONTENT_TYPE ) @@ -57,7 +58,7 @@ public: : rType == DOCUMENT ? OUString( TDOC_DOCUMENT_CONTENT_TYPE ) : OUString( TDOC_ROOT_CONTENT_TYPE ) ), - m_aTitle( rTitle ) + m_aTitle(std::move( aTitle )) {} ContentType getType() const { return m_eType; } @@ -101,7 +102,7 @@ private: Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - const ContentProperties & rProps ); + ContentProperties aProps ); Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index 8873e1da29ef..206751eff193 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/ucb/ResultSetException.hpp> #include <osl/diagnose.h> #include <ucbhelper/contentidentifier.hxx> +#include <utility> #include "tdoc_datasupplier.hxx" #include "tdoc_content.hxx" @@ -55,9 +56,9 @@ namespace { // DataSupplier Implementation. ResultSetDataSupplier::ResultSetDataSupplier( - const uno::Reference< uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent ) -: m_xContent( rContent ), m_xContext( rxContext ), + uno::Reference< uno::XComponentContext > xContext, + rtl::Reference< Content > xContent ) +: m_xContent(std::move( xContent )), m_xContext(std::move( xContext )), m_bCountFinal( false ), m_bThrowException( false ) { } diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index e9f13800284d..9b002a68637f 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -22,6 +22,7 @@ #include <rtl/ref.hxx> #include <ucbhelper/resultset.hxx> #include <optional> +#include <utility> #include <vector> #include <string_view> @@ -39,7 +40,7 @@ class ResultSetDataSupplier : public ::ucbhelper::ResultSetDataSupplier css::uno::Reference< css::ucb::XContent > xContent; css::uno::Reference< css::sdbc::XRow > xRow; - explicit ResultListEntry( const OUString& rURL ) : aURL( rURL ) {} + explicit ResultListEntry( OUString _aURL ) : aURL(std::move( _aURL )) {} }; osl::Mutex m_aMutex; @@ -56,8 +57,8 @@ private: public: ResultSetDataSupplier( - const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent ); + css::uno::Reference< css::uno::XComponentContext > xContext, + rtl::Reference< Content > xContent ); virtual ~ResultSetDataSupplier() override; virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 37839f985971..fbf70c8906c7 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -33,6 +33,7 @@ #include <map> #include <mutex> +#include <utility> namespace tdoc_ucp { @@ -47,10 +48,10 @@ namespace tdoc_ucp { StorageInfo() {}; // needed for STL map only. StorageInfo( - const OUString & rTitle, - const css::uno::Reference< css::embed::XStorage > & rxStorage, - const css::uno::Reference< css::frame::XModel > & rxModel ) - : aTitle( rTitle ), xStorage( rxStorage ), xModel( rxModel ) {} + OUString _aTitle, + css::uno::Reference< css::embed::XStorage > _xStorage, + css::uno::Reference< css::frame::XModel > _xModel ) + : aTitle(std::move( _aTitle )), xStorage(std::move( _xStorage )), xModel(std::move( _xModel )) {} }; diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index cd40d6d0e75c..12177c41ab80 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -26,6 +26,7 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> +#include <utility> #include "tdoc_documentcontentfactory.hxx" @@ -37,8 +38,8 @@ using namespace tdoc_ucp; DocumentContentFactory::DocumentContentFactory( - const uno::Reference< uno::XComponentContext >& rxContext ) -: m_xContext( rxContext ) + uno::Reference< uno::XComponentContext > xContext ) +: m_xContext(std::move( xContext )) { } diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx index bcbeee7d8b01..3f6c9d0157f4 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx @@ -33,7 +33,7 @@ class DocumentContentFactory : css::lang::XServiceInfo > { public: - explicit DocumentContentFactory( const css::uno::Reference< css::uno::XComponentContext >& ); + explicit DocumentContentFactory( css::uno::Reference< css::uno::XComponentContext > ); virtual ~DocumentContentFactory() override; // XServiceInfo diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx index c94e5191d18b..4b1b1a8328fa 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.cxx @@ -28,6 +28,7 @@ *************************************************************************/ #include <ucbhelper/resultset.hxx> +#include <utility> #include "tdoc_datasupplier.hxx" #include "tdoc_resultset.hxx" @@ -42,10 +43,10 @@ using namespace tdoc_ucp; DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rxContent, + rtl::Reference< Content > xContent, const ucb::OpenCommandArgument2& rCommand ) : ResultSetImplHelper( rxContext, rCommand ), - m_xContent( rxContent ) + m_xContent(std::move( xContent )) { } diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.hxx b/ucb/source/ucp/tdoc/tdoc_resultset.hxx index d0fbe418b031..5324dda5724c 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.hxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.hxx @@ -38,7 +38,7 @@ private: public: DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rxContent, + rtl::Reference< Content > xContent, const css::ucb::OpenCommandArgument2& rCommand ); }; diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index ad1ac498db72..fe687c05a87f 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/reflection/ProxyFactory.hpp> +#include <utility> #include "tdoc_uri.hxx" @@ -43,9 +44,9 @@ using namespace tdoc_ucp; ParentStorageHolder::ParentStorageHolder( - const uno::Reference< embed::XStorage > & xParentStorage, + uno::Reference< embed::XStorage > xParentStorage, const OUString & rUri ) -: m_xParentStorage( xParentStorage ), +: m_xParentStorage(std::move( xParentStorage )), m_bParentIsRootStorage( false ) { Uri aUri( rUri ); @@ -58,12 +59,12 @@ ParentStorageHolder::ParentStorageHolder( Storage::Storage( const uno::Reference< uno::XComponentContext > & rxContext, - const rtl::Reference< StorageElementFactory > & xFactory, + rtl::Reference< StorageElementFactory > xFactory, const OUString & rUri, const uno::Reference< embed::XStorage > & xParentStorage, const uno::Reference< embed::XStorage > & xStorageToWrap ) : ParentStorageHolder( xParentStorage, Uri( rUri ).getParentUri() ), - m_xFactory( xFactory ), + m_xFactory(std::move( xFactory )), m_xWrappedStorage( xStorageToWrap ), m_xWrappedTransObj( xStorageToWrap, uno::UNO_QUERY ), // optional interface m_xWrappedComponent( xStorageToWrap ), diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index 4842a3711601..a7aa306684bf 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -41,7 +41,7 @@ class ParentStorageHolder { public: ParentStorageHolder( - const css::uno::Reference< css::embed::XStorage > & xParentStorage, + css::uno::Reference< css::embed::XStorage > xParentStorage, const OUString & rUri ); bool isParentARootStorage() const @@ -72,7 +72,7 @@ class Storage : public StorageUNOBase, public ParentStorageHolder public: Storage( const css::uno::Reference< css::uno::XComponentContext > & rxContext, - const rtl::Reference< StorageElementFactory > & xFactory, + rtl::Reference< StorageElementFactory > xFactory, const OUString & rUri, const css::uno::Reference< css::embed::XStorage > & xParentStorage, const css::uno::Reference< css::embed::XStorage > & xStorageToWrap ); diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index 7fc0f247a60b..d7633e5b1ed4 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/packages/NoEncryptionException.hpp> #include <cppuhelper/exc_hlp.hxx> +#include <utility> #include <osl/diagnose.h> #include "tdoc_uri.hxx" @@ -41,10 +42,10 @@ using namespace tdoc_ucp; StorageElementFactory::StorageElementFactory( - const uno::Reference< uno::XComponentContext > & rxContext, - const rtl::Reference< OfficeDocumentsManager > & xDocsMgr ) -: m_xDocsMgr( xDocsMgr ), - m_xContext( rxContext ) + uno::Reference< uno::XComponentContext > xContext, + rtl::Reference< OfficeDocumentsManager > xDocsMgr ) +: m_xDocsMgr(std::move( xDocsMgr )), + m_xContext(std::move( xContext )) { } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx index c7067aca700b..08b247a68be9 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.hxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx @@ -44,8 +44,8 @@ namespace tdoc_ucp { { public: StorageElementFactory( - const css::uno::Reference< css::uno::XComponentContext > & rxContext, - const rtl::Reference< OfficeDocumentsManager > & xDocsMgr ); + css::uno::Reference< css::uno::XComponentContext > xContext, + rtl::Reference< OfficeDocumentsManager > xDocsMgr ); virtual ~StorageElementFactory() override; /// @throws css::uno::Exception diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx index 8a459c0aef12..fcf36d354ff5 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.hxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx @@ -20,6 +20,7 @@ #pragma once #include <rtl/ustring.hxx> +#include <utility> namespace tdoc_ucp { @@ -44,8 +45,8 @@ private: void init() const; public: - explicit Uri( const OUString & rUri ) - : m_aUri( rUri ), m_eState( UNKNOWN ) {} + explicit Uri( OUString aUri ) + : m_aUri(std::move( aUri )), m_eState( UNKNOWN ) {} bool operator== ( const Uri & rOther ) const { init(); return m_aUri == rOther.m_aUri; } diff --git a/ucb/source/ucp/webdav-curl/ContentProperties.hxx b/ucb/source/ucp/webdav-curl/ContentProperties.hxx index 0256450c2f90..376c77d3c6e5 100644 --- a/ucb/source/ucp/webdav-curl/ContentProperties.hxx +++ b/ucb/source/ucp/webdav-curl/ContentProperties.hxx @@ -22,6 +22,7 @@ #include <memory> #include <unordered_map> +#include <utility> #include <vector> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Any.hxx> @@ -48,9 +49,9 @@ public: PropertyValue() : m_bIsCaseSensitive( true ) {} - explicit PropertyValue( const css::uno::Any & rValue, + explicit PropertyValue( css::uno::Any aValue, bool bIsCaseSensitive ) - : m_aValue( rValue), + : m_aValue(std::move( aValue)), m_bIsCaseSensitive( bIsCaseSensitive ) {} bool isCaseSensitive() const { return m_bIsCaseSensitive; } diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx index 09f36de25a34..a966e779543c 100644 --- a/ucb/source/ucp/webdav-curl/CurlSession.cxx +++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx @@ -39,6 +39,7 @@ #include <map> #include <optional> #include <tuple> +#include <utility> using namespace ::com::sun::star; @@ -82,9 +83,9 @@ struct DownloadTarget { uno::Reference<io::XOutputStream> xOutStream; ResponseHeaders const& rHeaders; - DownloadTarget(uno::Reference<io::XOutputStream> const& i_xOutStream, + DownloadTarget(uno::Reference<io::XOutputStream> i_xOutStream, ResponseHeaders const& i_rHeaders) - : xOutStream(i_xOutStream) + : xOutStream(std::move(i_xOutStream)) , rHeaders(i_rHeaders) { } @@ -183,10 +184,10 @@ private: CURL* const m_pCurl; public: - explicit Guard(::std::mutex& rMutex, ::std::vector<CurlOption> const& rOptions, + explicit Guard(::std::mutex& rMutex, ::std::vector<CurlOption> aOptions, ::http_dav_ucp::CurlUri const& rURI, CURL* const pCurl) : m_Lock(rMutex, ::std::defer_lock) - , m_Options(rOptions) + , m_Options(std::move(aOptions)) , m_rURI(rURI) , m_pCurl(pCurl) { @@ -584,12 +585,12 @@ static auto ExtractRealm(ResponseHeaders const& rHeaders, char const* const pAut return buf.makeStringAndClear(); } -CurlSession::CurlSession(uno::Reference<uno::XComponentContext> const& xContext, +CurlSession::CurlSession(uno::Reference<uno::XComponentContext> xContext, ::rtl::Reference<DAVSessionFactory> const& rpFactory, OUString const& rURI, uno::Sequence<beans::NamedValue> const& rFlags, ::ucbhelper::InternetProxyDecider const& rProxyDecider) : DAVSession(rpFactory) - , m_xContext(xContext) + , m_xContext(std::move(xContext)) , m_Flags(rFlags) , m_URI(rURI) , m_Proxy(rProxyDecider.getProxy(m_URI.GetScheme(), m_URI.GetHost(), m_URI.GetPort())) @@ -1185,10 +1186,9 @@ auto CurlProcessor::ProcessRequest( OUString UserName; OUString PassWord; decltype(CURLAUTH_ANY) AuthMask; ///< allowed auth methods - Auth(OUString const& rUserName, OUString const& rPassword, - decltype(CURLAUTH_ANY) const & rAuthMask) - : UserName(rUserName) - , PassWord(rPassword) + Auth(OUString aUserName, OUString aPassword, decltype(CURLAUTH_ANY) const & rAuthMask) + : UserName(std::move(aUserName)) + , PassWord(std::move(aPassword)) , AuthMask(rAuthMask) { } diff --git a/ucb/source/ucp/webdav-curl/CurlSession.hxx b/ucb/source/ucp/webdav-curl/CurlSession.hxx index 75ccf682692c..3c3df3c26d76 100644 --- a/ucb/source/ucp/webdav-curl/CurlSession.hxx +++ b/ucb/source/ucp/webdav-curl/CurlSession.hxx @@ -50,7 +50,7 @@ private: friend struct CurlProcessor; public: - explicit CurlSession(css::uno::Reference<css::uno::XComponentContext> const& xContext, + explicit CurlSession(css::uno::Reference<css::uno::XComponentContext> xContext, ::rtl::Reference<DAVSessionFactory> const& rpFactory, OUString const& rURI, css::uno::Sequence<css::beans::NamedValue> const& rFlags, ::ucbhelper::InternetProxyDecider const& rProxyDecider); diff --git a/ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx index 219a6490689b..700c7c4c61ae 100644 --- a/ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx @@ -22,6 +22,7 @@ #include "DAVAuthListener.hxx" #include <com/sun/star/ucb/XCommandEnvironment.hpp> +#include <utility> namespace http_dav_ucp @@ -35,9 +36,9 @@ namespace http_dav_ucp public: DAVAuthListener_Impl( - const css::uno::Reference<css::ucb::XCommandEnvironment>& xEnv, - const OUString & inURL ) - : m_xEnv( xEnv ), m_aURL( inURL ) + css::uno::Reference<css::ucb::XCommandEnvironment> xEnv, + OUString inURL ) + : m_xEnv(std::move( xEnv )), m_aURL(std::move( inURL )) { } diff --git a/ucb/source/ucp/webdav-curl/DAVException.hxx b/ucb/source/ucp/webdav-curl/DAVException.hxx index 537b5a82fa2b..84dba895485c 100644 --- a/ucb/source/ucp/webdav-curl/DAVException.hxx +++ b/ucb/source/ucp/webdav-curl/DAVException.hxx @@ -21,6 +21,7 @@ #pragma once #include <rtl/ustring.hxx> +#include <utility> namespace http_dav_ucp { @@ -151,16 +152,16 @@ class DAVException : public std::exception , mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const OUString & rData ) + OUString aData ) : mExceptionCode( inExceptionCode ) - , mData( rData ) + , mData(std::move( aData )) , mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const OUString & rData, + OUString aData, sal_uInt16 nStatusCode ) : mExceptionCode( inExceptionCode ) - , mData( rData ) + , mData(std::move( aData )) , mStatusCode( nStatusCode ) {}; diff --git a/ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx index 88cdebde5a90..3bde76ed33ce 100644 --- a/ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx @@ -20,6 +20,7 @@ #pragma once +#include <utility> #include <vector> #include <rtl/ref.hxx> #include "DAVAuthListener.hxx" @@ -34,10 +35,10 @@ struct DAVRequestEnvironment rtl::Reference< DAVAuthListener > m_xAuthListener; DAVRequestHeaders m_aRequestHeaders; - DAVRequestEnvironment( const rtl::Reference< DAVAuthListener > & xListener, - const DAVRequestHeaders & rRequestHeaders) - : m_xAuthListener( xListener ), - m_aRequestHeaders( rRequestHeaders ) {} + DAVRequestEnvironment( rtl::Reference< DAVAuthListener > xListener, + DAVRequestHeaders aRequestHeaders) + : m_xAuthListener(std::move( xListener )), + m_aRequestHeaders(std::move( aRequestHeaders )) {} }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx index 0119495e3bbf..5e1f00474aad 100644 --- a/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/io/IOException.hpp> +#include <utility> using namespace http_dav_ucp; using namespace com::sun::star; @@ -122,12 +123,12 @@ int DAVAuthListener_Impl::authenticate( DAVResourceAccess::DAVResourceAccess( - const uno::Reference< uno::XComponentContext > & rContext, - rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const OUString & rURL ) -: m_aURL( rURL ), - m_xSessionFactory( rSessionFactory ), - m_xContext( rContext ) + uno::Reference< uno::XComponentContext > xContext, + rtl::Reference< DAVSessionFactory > xSessionFactory, + OUString aURL ) +: m_aURL(std::move( aURL )), + m_xSessionFactory(std::move( xSessionFactory )), + m_xContext(std::move( xContext )) , m_nRedirectLimit( 5 ) { } diff --git a/ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx index 0e5231934e5d..ae2f2ad64dee 100644 --- a/ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx @@ -56,9 +56,9 @@ class DAVResourceAccess public: DAVResourceAccess() = default; - DAVResourceAccess( const css::uno::Reference< css::uno::XComponentContext > & rContext, - rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const OUString & rURL ); + DAVResourceAccess( css::uno::Reference< css::uno::XComponentContext > xContext, + rtl::Reference< DAVSessionFactory > xSessionFactory, + OUString aURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); diff --git a/ucb/source/ucp/webdav-curl/DAVSession.hxx b/ucb/source/ucp/webdav-curl/DAVSession.hxx index cb298783161b..6a4b65cdc41c 100644 --- a/ucb/source/ucp/webdav-curl/DAVSession.hxx +++ b/ucb/source/ucp/webdav-curl/DAVSession.hxx @@ -24,6 +24,7 @@ #include <rtl/ustring.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> +#include <utility> #include "DAVResource.hxx" #include "DAVSessionFactory.hxx" #include "DAVTypes.hxx" @@ -178,8 +179,8 @@ public: protected: rtl::Reference< DAVSessionFactory > m_xFactory; - explicit DAVSession( rtl::Reference< DAVSessionFactory > const & rFactory ) - : m_xFactory( rFactory ), m_nRefCount( 0 ) {} + explicit DAVSession( rtl::Reference< DAVSessionFactory > xFactory ) + : m_xFactory(std::move( xFactory )), m_nRefCount( 0 ) {} virtual ~DAVSession() {} diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.hxx b/ucb/source/ucp/webdav-curl/DAVTypes.hxx index 8e6160333c7c..66b0aee8ec49 100644 --- a/ucb/source/ucp/webdav-curl/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-curl/DAVTypes.hxx @@ -191,9 +191,9 @@ namespace http_dav_ucp css::uno::Any const value; ProppatchValue( const ProppatchOperation o, - const OUString & n, - const css::uno::Any & v ) - : operation( o ), name( n ), value( v ) {} + const OUString n, + const css::uno::Any v ) + : operation( o ), name( std::move(n) ), value( std::move(v) ) {} }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav-curl/PropfindCache.cxx b/ucb/source/ucp/webdav-curl/PropfindCache.cxx index 7196bd791d9c..da8499e1526d 100644 --- a/ucb/source/ucp/webdav-curl/PropfindCache.cxx +++ b/ucb/source/ucp/webdav-curl/PropfindCache.cxx @@ -8,6 +8,8 @@ */ #include <osl/time.h> + +#include <utility> #include "PropfindCache.hxx" namespace http_dav_ucp @@ -22,9 +24,9 @@ namespace http_dav_ucp { } - PropertyNames::PropertyNames( const OUString& rURL ) : + PropertyNames::PropertyNames( OUString aURL ) : m_nStaleTime( 0 ), - m_sURL( rURL ), + m_sURL(std::move( aURL )), m_aPropertiesNames() { } diff --git a/ucb/source/ucp/webdav-curl/PropfindCache.hxx b/ucb/source/ucp/webdav-curl/PropfindCache.hxx index b55ef2a51d11..e900c8ffdd65 100644 --- a/ucb/source/ucp/webdav-curl/PropfindCache.hxx +++ b/ucb/source/ucp/webdav-curl/PropfindCache.hxx @@ -40,7 +40,7 @@ namespace http_dav_ucp public: PropertyNames(); - explicit PropertyNames( const OUString& rURL ); + explicit PropertyNames( OUString aURL ); sal_uInt32 getStaleTime() const { return m_nStaleTime; }; void setStaleTime( const sal_uInt32 nStaleTime ) { m_nStaleTime = nStaleTime; }; diff --git a/ucb/source/ucp/webdav-curl/SerfLockStore.hxx b/ucb/source/ucp/webdav-curl/SerfLockStore.hxx index 6765c7990b12..8b54901e1fb8 100644 --- a/ucb/source/ucp/webdav-curl/SerfLockStore.hxx +++ b/ucb/source/ucp/webdav-curl/SerfLockStore.hxx @@ -25,6 +25,7 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/ucb/Lock.hpp> +#include <utility> #include "CurlSession.hxx" @@ -43,13 +44,13 @@ struct LockInfo LockInfo() : m_nLastChanceToSendRefreshRequest( -1 ) {} - LockInfo( const OUString& sToken, - css::ucb::Lock const& rLock, - rtl::Reference<CurlSession> const & xSession, + LockInfo( OUString sToken, + css::ucb::Lock aLock, + rtl::Reference<CurlSession> xSession, sal_Int32 nLastChanceToSendRefreshRequest ) - : m_sToken(sToken) - , m_Lock(rLock) - , m_xSession(xSession) + : m_sToken(std::move(sToken)) + , m_Lock(std::move(aLock)) + , m_xSession(std::move(xSession)) , m_nLastChanceToSendRefreshRequest(nLastChanceToSendRefreshRequest) {} }; |