diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-08-25 11:59:24 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-08-25 11:59:24 +0200 |
commit | 74917e0c46dc61736f262aba911e5eb0decf4ec8 (patch) | |
tree | ba031efbbe6f2ce97d70d2b00280ff36b9289b79 /ucb/source | |
parent | db6b703d391838c481fd090065f6d329edcd4efa (diff) |
Various loplugin warnings in --with-webdav=serf code
Change-Id: Ibff41550f292da76c17238a9cd2856b6599e952a
Diffstat (limited to 'ucb/source')
-rw-r--r-- | ucb/source/ucp/webdav/ContentProperties.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/DAVException.hxx | 1 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/DAVSession.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavcontent.cxx | 86 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavcontentcaps.cxx | 50 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavprovider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavresponseparser.cxx | 5 |
7 files changed, 72 insertions, 80 deletions
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index b695b9c8a598..15e2f535bbea 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -104,7 +104,7 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) while ( it != end ) { - addProperty( (*it) ); + addProperty( *it ); ++it; } @@ -404,7 +404,7 @@ void ContentProperties::addProperties( while ( it != end ) { - addProperty( (*it) ); + addProperty( *it ); ++it; } } @@ -613,7 +613,7 @@ void CachableContentProperties::addProperties( while ( it != end ) { if ( isCachable( (*it).Name, (*it).IsCaseSensitive ) ) - m_aProps.addProperty( (*it) ); + m_aProps.addProperty( *it ); ++it; } diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx index c3939f01f6d9..3b21067e5301 100644 --- a/ucb/source/ucp/webdav/DAVException.hxx +++ b/ucb/source/ucp/webdav/DAVException.hxx @@ -155,7 +155,6 @@ class DAVException : public std::exception , mData( rData ) , mStatusCode( nStatusCode ) {}; - virtual ~DAVException( ) override {}; const ExceptionCode & getError() const { return mExceptionCode; } const OUString & getData() const { return mData; } diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index 1c6a8c0e01aa..3ecbc618b317 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -44,7 +44,7 @@ class DAVAuthListener; class DAVSession { public: - inline void acquire() + void acquire() { osl_incrementInterlockedCount( &m_nRefCount ); } diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 3ca03a8c7827..4911e5496f5a 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -459,7 +459,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -479,7 +479,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -490,7 +490,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "No properties!" ), + "No properties!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -529,7 +529,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -554,7 +554,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -615,7 +615,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -635,7 +635,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -674,14 +674,14 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); // Unreachable } - aRet = uno::makeAny( createNewContent( aArg ) ); + aRet <<= createNewContent( aArg ); } else if ( aCommand.Name == "addProperty" ) { @@ -690,7 +690,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -722,7 +722,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - OUString( "Wrong argument type!" ), + "Wrong argument type!", static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -799,20 +799,20 @@ void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, // check property Name if ( !aProperty.Name.getLength() ) throw lang::IllegalArgumentException( - OUString( "\"addProperty\" with empty Property.Name"), + "\"addProperty\" with empty Property.Name", static_cast< ::cppu::OWeakObject * >( this ), -1 ); // Check property type. if ( !UCBDeadPropertyValue::supportsType( aProperty.Type ) ) throw beans::IllegalTypeException( - OUString( "\"addProperty\" unsupported Property.Type"), + "\"addProperty\" unsupported Property.Type", static_cast< ::cppu::OWeakObject * >( this ) ); // check default value if ( aDefaultValue.hasValue() && aDefaultValue.getValueType() != aProperty.Type ) throw beans::IllegalTypeException( - OUString( "\"addProperty\" DefaultValue does not match Property.Type"), + "\"addProperty\" DefaultValue does not match Property.Type", static_cast< ::cppu::OWeakObject * >( this ) ); @@ -1160,7 +1160,7 @@ OUString Content::getParentURL() if ( nPos1 == -1 ) return OUString(); - return OUString( aURL.copy( 0, nPos + 1 ) ); + return aURL.copy( 0, nPos + 1 ); } @@ -1647,7 +1647,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1660,21 +1660,21 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "Title" ) @@ -1707,7 +1707,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRet[ n ] <<= lang::IllegalArgumentException( - OUString( "Invalid content identifier!" ), + "Invalid content identifier!", static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1715,7 +1715,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - OUString( "Empty title not allowed!" ), + "Empty title not allowed!", static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1723,7 +1723,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - OUString( "Property value has wrong type!" ), + "Property value has wrong type!", static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1746,7 +1746,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // PROPPATCH::set would add the property automatically, which // is not allowed for "setPropertyValues" command! aRet[ n ] <<= beans::UnknownPropertyException( - OUString( "Property is unknown!" ), + "Property is unknown!", static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1755,21 +1755,21 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "DateCreated" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "DateModified" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "MediaType" ) @@ -1777,14 +1777,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); } if ( rName == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - OUString( "Property is read-only!" ), + "Property is read-only!", static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1849,7 +1849,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - OUString( "No property set for storing the value!" ), + "No property set for storing the value!", static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1956,7 +1956,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Set error . aRet[ nTitlePos ] <<= uno::Exception( - OUString( "Exchange failed!" ), + "Exchange failed!", static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1975,8 +1975,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( osl::Guard< osl::Mutex > aGuard( m_aMutex ); aEvent.PropertyName = "Title"; - aEvent.OldValue = uno::makeAny( aOldTitle ); - aEvent.NewValue = uno::makeAny( aNewTitle ); + aEvent.OldValue <<= aOldTitle; + aEvent.NewValue <<= aNewTitle; m_aEscapedTitle = SerfUri::escapeSegment( aNewTitle ); @@ -2353,7 +2353,7 @@ void Content::insert( { #undef ERROR ucb::UnsupportedNameClashException aEx( - OUString( "Unable to write without overwrite!" ), + "Unable to write without overwrite!", static_cast< cppu::OWeakObject * >( this ), ucb::NameClash::ERROR ); @@ -2400,7 +2400,7 @@ void Content::insert( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - OUString( "Unknown interaction selection!" ), + "Unknown interaction selection!", uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2591,7 +2591,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - OUString( "Unsupported URL scheme!" ), + "Unsupported URL scheme!", static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2619,7 +2619,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - OUString( "Different hosts!" ), + "Different hosts!", static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -3020,13 +3020,13 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - OUString("Uri"), -1, + "Uri", -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - OUString( "Not found!" ), + "Not found!", static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -3108,7 +3108,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) #if 1 aException <<= ucb::InteractiveLockingLockedException( - OUString( "Locked!" ), + "Locked!", static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -3135,7 +3135,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - OUString( "Locked (self)!" ), + "Locked (self)!", static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -3145,7 +3145,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - OUString( "Not locked!" ), + "Not locked!", static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3154,7 +3154,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - OUString( "Lock expired!" ), + "Lock expired!", static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3223,7 +3223,7 @@ Content::getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess ) } } - return OUString( rResAccess->getURL() ); + return rResAccess->getURL(); } diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 6f9d2feab38f..87d2aaf2ec4d 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -63,7 +63,7 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -71,7 +71,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -79,7 +79,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -87,7 +87,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ) ); @@ -96,7 +96,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "DateCreated" ), + "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -104,7 +104,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "DateModified" ), + "DateModified", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -112,7 +112,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -120,7 +120,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "Size" ), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND @@ -128,7 +128,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "BaseURI" ), + "BaseURI", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -136,8 +136,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -495,22 +494,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get()); aCmdInfo[ 3 ] = ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()); @@ -520,17 +519,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ); aCmdInfo[ 6 ] = ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ); @@ -540,17 +539,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - OUString( "post" ), + "post", -1, cppu::UnoType<ucb::PostCommandArgument2>::get() ); aCmdInfo[ 8 ] = ucb::CommandInfo( - OUString( "addProperty" ), + "addProperty", -1, cppu::UnoType<ucb::PropertyCommandArgument>::get() ); aCmdInfo[ 9 ] = ucb::CommandInfo( - OUString( "removeProperty" ), + "removeProperty", -1, cppu::UnoType<rtl::OUString>::get() ); @@ -582,14 +581,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( - "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ); nPos++; @@ -603,13 +601,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "lock" ), + "lock", -1, cppu::UnoType<void>::get() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "unlock" ), + "unlock", -1, cppu::UnoType<void>::get() ); nPos++; diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index ac8f5a9042cc..7e66cfe0d5d1 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -38,7 +38,7 @@ using namespace http_dav_ucp; ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rContext ) : ::ucbhelper::ContentProviderImplHelper( rContext ), - m_xDAVSessionFactory( new DAVSessionFactory() ) + m_xDAVSessionFactory( new DAVSessionFactory ) { } diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index f90aaed2593b..94b5952c249f 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -168,7 +168,6 @@ namespace public: WebDAVContext(WebDAVContext* pParent, const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs); - ~WebDAVContext(); WebDAVContext* getParent() const { return mpParent; } OUString& getWhiteSpace() { return maWhiteSpace; } @@ -269,10 +268,6 @@ namespace maWebDAVNamespace = StrToWebDAVNamespace(maNamespace); maWebDAVName = StrToWebDAVName(maName); } - - WebDAVContext::~WebDAVContext() - { - } } // end of anonymous namespace |