From 071dcb5f6aaf7179619a251933dec8bbdc6f3cd8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 4 Apr 2017 10:01:58 +0200 Subject: loplugin:redundantinline (clang-cl) Change-Id: I03a19b599005f6ef25040889a1e1802445ebf430 Reviewed-on: https://gerrit.libreoffice.org/36063 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- connectivity/source/drivers/ado/Aservices.cxx | 1 - connectivity/source/inc/ado/AConnection.hxx | 2 +- .../inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 2 +- connectivity/source/inc/ado/AResultSet.hxx | 2 +- connectivity/source/inc/ado/Aolewrap.hxx | 20 ++++++++++---------- connectivity/source/inc/ado/Awrapadox.hxx | 6 +++--- connectivity/source/inc/ado/WrapCatalog.hxx | 2 +- connectivity/source/inc/ado/WrapColumn.hxx | 2 +- connectivity/source/inc/ado/WrapIndex.hxx | 2 +- connectivity/source/inc/ado/WrapKey.hxx | 2 +- connectivity/source/inc/ado/WrapTable.hxx | 2 +- 11 files changed, 21 insertions(+), 22 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index 8f6b1d1bfdd6..b8e13c96cd3d 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -51,7 +51,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 0ac1470fa1aa..23fb72f53e82 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -38,7 +38,7 @@ namespace connectivity ::connectivity::OTypeInfo aSimpleType; // the general type info DataTypeEnum eType; - inline OUString getDBName() const { return aSimpleType.aTypeName; } + OUString getDBName() const { return aSimpleType.aTypeName; } }; class WpADOConnection; diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index 904d7661c7d1..a69ed9a8b2d3 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -75,7 +75,7 @@ namespace connectivity ~ODatabaseMetaDataResultSetMetaData() override; /// Avoid ambiguous cast error from the compiler. - inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() + operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } virtual sal_Int32 SAL_CALL getColumnCount( ) override; diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index fab79415258b..52043a875902 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -127,7 +127,7 @@ namespace connectivity // late constructor void construct(); - inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} + void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} virtual OUString SAL_CALL getImplementationName( ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index 483811b6ecdb..71b897e9fe9d 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -130,19 +130,19 @@ namespace connectivity // They only call the superclass WpOLECollection(Ts* pInt=nullptr):WpOLEBase(pInt){} WpOLECollection(const WpOLECollection& rhs) : WpOLEBase(rhs) {} - inline WpOLECollection& operator=(const WpOLECollection& rhs) + WpOLECollection& operator=(const WpOLECollection& rhs) {WpOLEBase::operator=(rhs); return *this;}; - inline void Refresh(){pInterface->Refresh();} + void Refresh(){pInterface->Refresh();} - inline sal_Int32 GetItemCount() const + sal_Int32 GetItemCount() const { sal_Int32 nCount = 0; return pInterface ? (SUCCEEDED(pInterface->get_Count(&nCount)) ? nCount : sal_Int32(0)) : sal_Int32(0); } - inline WrapT GetItem(sal_Int32 index) const + WrapT GetItem(sal_Int32 index) const { OSL_ENSURE(index >= 0 && index::pInterface; WpOLEAppendCollection(Ts* pInt=nullptr):WpOLECollection(pInt){} WpOLEAppendCollection(const WpOLEAppendCollection& rhs) : WpOLECollection(rhs) {} - inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs) + WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs) {WpOLEBase::operator=(rhs); return *this;}; - inline bool Append(const WrapT& aWrapT) + bool Append(const WrapT& aWrapT) { return SUCCEEDED(pInterface->Append(OLEVariant(static_cast(aWrapT)))); }; - inline bool Delete(const OUString& sName) + bool Delete(const OUString& sName) { return SUCCEEDED(pInterface->Delete(OLEVariant(sName))); }; diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx index 9e233ae1f834..31e73a80fdc2 100644 --- a/connectivity/source/inc/ado/Awrapadox.hxx +++ b/connectivity/source/inc/ado/Awrapadox.hxx @@ -79,7 +79,7 @@ namespace connectivity WpADOView(ADOView* pInt=nullptr) : WpOLEBase(pInt){} WpADOView(const WpADOView& rhs) : WpOLEBase(rhs) {} - inline WpADOView& operator=(const WpADOView& rhs) + WpADOView& operator=(const WpADOView& rhs) {WpOLEBase::operator=(rhs); return *this;} OUString get_Name() const; @@ -93,7 +93,7 @@ namespace connectivity WpADOGroup(ADOGroup* pInt=nullptr) : WpOLEBase(pInt){} WpADOGroup(const WpADOGroup& rhs) : WpOLEBase(rhs) {} - inline WpADOGroup& operator=(const WpADOGroup& rhs) + WpADOGroup& operator=(const WpADOGroup& rhs) {WpOLEBase::operator=(rhs); return *this;} void Create(); @@ -117,7 +117,7 @@ namespace connectivity WpADOUser(_ADOUser* pInt=nullptr) : WpOLEBase<_ADOUser>(pInt){} WpADOUser(const WpADOUser& rhs) : WpOLEBase<_ADOUser>(rhs) {} - inline WpADOUser& operator=(const WpADOUser& rhs) + WpADOUser& operator=(const WpADOUser& rhs) {WpOLEBase<_ADOUser>::operator=(rhs); return *this;} void Create(); diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx index ae67f5dbbd67..2e90ac93d89d 100644 --- a/connectivity/source/inc/ado/WrapCatalog.hxx +++ b/connectivity/source/inc/ado/WrapCatalog.hxx @@ -31,7 +31,7 @@ namespace connectivity WpADOCatalog(_ADOCatalog* pInt = nullptr) : WpOLEBase<_ADOCatalog>(pInt){} WpADOCatalog(const WpADOCatalog& rhs) : WpOLEBase<_ADOCatalog>(rhs) {} - inline WpADOCatalog& operator=(const WpADOCatalog& rhs) + WpADOCatalog& operator=(const WpADOCatalog& rhs) {WpOLEBase<_ADOCatalog>::operator=(rhs); return *this;} OUString GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eNum); diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx index c6d47aa98151..64093d71d26f 100644 --- a/connectivity/source/inc/ado/WrapColumn.hxx +++ b/connectivity/source/inc/ado/WrapColumn.hxx @@ -37,7 +37,7 @@ namespace connectivity void Create(); - inline WpADOColumn& operator=(const WpADOColumn& rhs) + WpADOColumn& operator=(const WpADOColumn& rhs) {WpOLEBase<_ADOColumn>::operator=(rhs); return *this;} OUString get_Name() const; diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx index bfffdfded043..23fd7b476c5b 100644 --- a/connectivity/source/inc/ado/WrapIndex.hxx +++ b/connectivity/source/inc/ado/WrapIndex.hxx @@ -31,7 +31,7 @@ namespace connectivity WpADOIndex(_ADOIndex* pInt=nullptr) : WpOLEBase<_ADOIndex>(pInt){} WpADOIndex(const WpADOIndex& rhs) : WpOLEBase<_ADOIndex>(rhs) {} - inline WpADOIndex& operator=(const WpADOIndex& rhs) + WpADOIndex& operator=(const WpADOIndex& rhs) {WpOLEBase<_ADOIndex>::operator=(rhs); return *this;} void Create(); diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx index b8ab562a2ac1..774b5c43a5ea 100644 --- a/connectivity/source/inc/ado/WrapKey.hxx +++ b/connectivity/source/inc/ado/WrapKey.hxx @@ -31,7 +31,7 @@ namespace connectivity WpADOKey(ADOKey* pInt=nullptr) : WpOLEBase(pInt){} WpADOKey(const WpADOKey& rhs) : WpOLEBase(rhs) {} - inline WpADOKey& operator=(const WpADOKey& rhs) + WpADOKey& operator=(const WpADOKey& rhs) {WpOLEBase::operator=(rhs); return *this;} void Create(); diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx index e99eb33be714..b8e1a9ab8711 100644 --- a/connectivity/source/inc/ado/WrapTable.hxx +++ b/connectivity/source/inc/ado/WrapTable.hxx @@ -33,7 +33,7 @@ namespace connectivity WpADOTable(_ADOTable* pInt=nullptr) : WpOLEBase<_ADOTable>(pInt){} WpADOTable(const WpADOTable& rhs) : WpOLEBase<_ADOTable>(rhs) {} - inline WpADOTable& operator=(const WpADOTable& rhs) + WpADOTable& operator=(const WpADOTable& rhs) {WpOLEBase<_ADOTable>::operator=(rhs); return *this;} void Create(); -- cgit v1.2.3