diff options
Diffstat (limited to 'ucb/source/ucp/webdav-curl')
-rw-r--r-- | ucb/source/ucp/webdav-curl/ContentProperties.hxx | 5 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/CurlSession.cxx | 20 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/CurlSession.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx | 7 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/DAVException.hxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx | 13 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/DAVSession.hxx | 5 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/DAVTypes.hxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/PropfindCache.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/PropfindCache.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/SerfLockStore.hxx | 13 |
13 files changed, 56 insertions, 47 deletions
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) {} }; |