Kaydet (Commit) 482f0517 authored tarafından Giuseppe Castagno's avatar Giuseppe Castagno Kaydeden (comit) Stephan Bergmann

cppcheck:noExplicitConstructor in webdav, serf version

Explicitly add constructors that where previously hidden.

The right implementation of what I did
in aade7198.

The explict keyword was added in 6343754e

Change-Id: I66f6ee51c8b51d93d6ac673e75555e13024e4b48
Reviewed-on: https://gerrit.libreoffice.org/17823Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 0a4c482a
...@@ -591,11 +591,6 @@ CachableContentProperties::CachableContentProperties( ...@@ -591,11 +591,6 @@ CachableContentProperties::CachableContentProperties(
addProperties( rProps ); addProperties( rProps );
} }
CachableContentProperties::CachableContentProperties(
const DAVResource & rResource )
{
addProperties( rResource );
}
void CachableContentProperties::addProperties( void CachableContentProperties::addProperties(
const ContentProperties & rProps ) const ContentProperties & rProps )
...@@ -616,6 +611,7 @@ void CachableContentProperties::addProperties( ...@@ -616,6 +611,7 @@ void CachableContentProperties::addProperties(
} }
} }
void CachableContentProperties::addProperties( void CachableContentProperties::addProperties(
const std::vector< DAVPropertyValue > & rProps ) const std::vector< DAVPropertyValue > & rProps )
{ {
...@@ -631,9 +627,4 @@ void CachableContentProperties::addProperties( ...@@ -631,9 +627,4 @@ void CachableContentProperties::addProperties(
} }
} }
void CachableContentProperties::addProperties( const DAVResource & rResource )
{
addProperties( rResource.properties );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -173,15 +173,12 @@ private: ...@@ -173,15 +173,12 @@ private:
CachableContentProperties( const CachableContentProperties & ); // n.i. CachableContentProperties( const CachableContentProperties & ); // n.i.
public: public:
explicit CachableContentProperties( const DAVResource& rResource );
explicit CachableContentProperties( const ContentProperties & rProps ); explicit CachableContentProperties( const ContentProperties & rProps );
void addProperties( const ContentProperties & rProps ); void addProperties( const ContentProperties & rProps );
void addProperties( const std::vector< DAVPropertyValue > & rProps ); void addProperties( const std::vector< DAVPropertyValue > & rProps );
void addProperties( const DAVResource & rResource );
bool containsAllNames( bool containsAllNames(
const com::sun::star::uno::Sequence< const com::sun::star::uno::Sequence<
com::sun::star::beans::Property >& rProps, com::sun::star::beans::Property >& rProps,
......
...@@ -2169,9 +2169,9 @@ uno::Any Content::open( ...@@ -2169,9 +2169,9 @@ uno::Any Content::open(
// cache headers. // cache headers.
if ( !m_xCachedProps.get()) if ( !m_xCachedProps.get())
m_xCachedProps.reset( m_xCachedProps.reset(
new CachableContentProperties( aResource ) ); new CachableContentProperties( ContentProperties( aResource ) ) );
else else
m_xCachedProps->addProperties( aResource ); m_xCachedProps->addProperties( ContentProperties( aResource ) );
m_xResAccess.reset( m_xResAccess.reset(
new DAVResourceAccess( *xResAccess.get() ) ); new DAVResourceAccess( *xResAccess.get() ) );
...@@ -2215,7 +2215,7 @@ uno::Any Content::open( ...@@ -2215,7 +2215,7 @@ uno::Any Content::open(
// cache headers. // cache headers.
if ( !m_xCachedProps.get()) if ( !m_xCachedProps.get())
m_xCachedProps.reset( m_xCachedProps.reset(
new CachableContentProperties( aResource ) ); new CachableContentProperties( ContentProperties( aResource ) ) );
else else
m_xCachedProps->addProperties( m_xCachedProps->addProperties(
aResource.properties ); aResource.properties );
...@@ -3362,7 +3362,7 @@ Content::ResourceType Content::getResourceType( ...@@ -3362,7 +3362,7 @@ Content::ResourceType Content::getResourceType(
{ {
osl::MutexGuard g(m_aMutex); osl::MutexGuard g(m_aMutex);
m_xCachedProps.reset( m_xCachedProps.reset(
new CachableContentProperties( resources[ 0 ] ) ); new CachableContentProperties( ContentProperties( resources[ 0 ] ) ) );
m_xCachedProps->containsAllNames( m_xCachedProps->containsAllNames(
aProperties, m_aFailedPropNames ); aProperties, m_aFailedPropNames );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment