diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:57:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:55:50 +0000 |
commit | 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch) | |
tree | 21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /include/connectivity | |
parent | 7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff) |
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with
a rewriting Clang plugin (to be pushed later).
Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8
Reviewed-on: https://gerrit.libreoffice.org/34874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/connectivity')
-rw-r--r-- | include/connectivity/FValue.hxx | 28 | ||||
-rw-r--r-- | include/connectivity/TColumnsHelper.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/TIndex.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/TKey.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/dbcharset.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/dbmetadata.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/filtermanager.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/parameters.hxx | 4 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VCollection.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sqliterator.hxx | 12 | ||||
-rw-r--r-- | include/connectivity/sqlscan.hxx | 10 |
11 files changed, 34 insertions, 34 deletions
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 93b7ec28dd7c..dfde6cab9342 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -278,13 +278,13 @@ namespace connectivity free(); } - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } ORowSetValue& operator=(const ORowSetValue& _rRH); @@ -456,16 +456,16 @@ namespace connectivity ORowSetValueDecorator(const ORowSetValue& _aValue) : m_aValue(_aValue){m_aValue.setBound(true);} ORowSetValueDecorator& operator=(const ORowSetValue& _aValue); - inline operator const ORowSetValue&() const { return m_aValue; } - inline bool operator ==( const ORowSetValue & _rRH ) { return m_aValue == _rRH; } - inline const ORowSetValue& getValue() const { return m_aValue; } - inline ORowSetValue& get() { return m_aValue; } - inline void setValue(const ORowSetValue& _aValue) { m_aValue = _aValue; } - inline void setNull() { m_aValue.setNull(); } - inline void setBound(bool _bBound ) { m_aValue.setBound(_bBound);} - inline bool isBound( ) const { return m_aValue.isBound();} - inline void setTypeKind(sal_Int32 _nType) { m_aValue.setTypeKind(_nType); } - inline void setModified(bool _bModified) { m_aValue.setModified(_bModified); } + operator const ORowSetValue&() const { return m_aValue; } + bool operator ==( const ORowSetValue & _rRH ) { return m_aValue == _rRH; } + const ORowSetValue& getValue() const { return m_aValue; } + ORowSetValue& get() { return m_aValue; } + void setValue(const ORowSetValue& _aValue) { m_aValue = _aValue; } + void setNull() { m_aValue.setNull(); } + void setBound(bool _bBound ) { m_aValue.setBound(_bBound);} + bool isBound( ) const { return m_aValue.isBound();} + void setTypeKind(sal_Int32 _nType) { m_aValue.setTypeKind(_nType); } + void setModified(bool _bModified) { m_aValue.setModified(_bModified); } }; typedef ::rtl::Reference<ORowSetValueDecorator> ORowSetValueDecoratorRef; diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx index 4d9737c2cf20..140d6328c1d2 100644 --- a/include/connectivity/TColumnsHelper.hxx +++ b/include/connectivity/TColumnsHelper.hxx @@ -55,7 +55,7 @@ namespace connectivity @param _pTable The parent. */ - inline void setParent(OTableHelper* _pTable) { m_pTable = _pTable;} + void setParent(OTableHelper* _pTable) { m_pTable = _pTable;} }; } #endif // INCLUDED_CONNECTIVITY_TCOLUMNSHELPER_HXX diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx index 7330a718e61b..a7c3e731ccb1 100644 --- a/include/connectivity/TIndex.hxx +++ b/include/connectivity/TIndex.hxx @@ -41,7 +41,7 @@ namespace connectivity bool _isPrimaryKeyIndex, bool _isClustered ); - inline OTableHelper* getTable() const { return m_pTable; } + OTableHelper* getTable() const { return m_pTable; } }; } #endif // INCLUDED_CONNECTIVITY_TINDEX_HXX diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx index cfce73d09c6a..3fc9ba1f8b46 100644 --- a/include/connectivity/TKey.hxx +++ b/include/connectivity/TKey.hxx @@ -38,7 +38,7 @@ namespace connectivity ,const OUString& Name ,const std::shared_ptr<sdbcx::KeyProperties>& _rProps ); - inline OTableHelper* getTable() const { return m_pTable; } + OTableHelper* getTable() const { return m_pTable; } }; } #endif // INCLUDED_CONNECTIVITY_TKEY_HXX diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index d4ef414fe704..f2a2ca171014 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -86,7 +86,7 @@ namespace dbtools protected: // needed because we want to call a virtual method during construction void lateConstruct(); - inline void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); } + void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); } virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; }; diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index b16f8ed8de41..ead3b9b58960 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -86,7 +86,7 @@ namespace dbtools /** resets the instance so that it's based on a new connection */ - inline void reset( const css::uno::Reference< css::sdbc::XConnection >& _connection ) + void reset( const css::uno::Reference< css::sdbc::XConnection >& _connection ) { *this = DatabaseMetaData( _connection ); } diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx index 4999dede4149..41df1c61b9f0 100644 --- a/include/connectivity/filtermanager.hxx +++ b/include/connectivity/filtermanager.hxx @@ -84,7 +84,7 @@ namespace dbtools const OUString& getFilterComponent( FilterComponent _eWhich ) const; void setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent ); - inline bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; } + bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; } void setApplyPublicFilter( bool _bApply ); private: diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index 7a101df72893..49eebb93665a 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -147,7 +147,7 @@ namespace dbtools void clearAllParameterInformation(); /// checks whether the parameter information are up-to-date - inline bool isUpToDate() const { return m_bUpToDate; } + bool isUpToDate() const { return m_bUpToDate; } /** updates all parameter information represented by the instance */ @@ -232,7 +232,7 @@ namespace dbtools private: /// checkes whether the object is already initialized, and not yet disposed - inline bool isAlive() const { return m_xComponent.get().is() && m_xInnerParamUpdate.is(); } + bool isAlive() const { return m_xComponent.get().is() && m_xInnerParamUpdate.is(); } /** creates a filter expression from a master-detail link where the detail denotes a column name */ diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index a801a1f1eba2..4337a025843e 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -172,7 +172,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); void reFill(const TStringVector &_rVector); - inline bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); } + bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); } void renameObject(const OUString& _sOldName, const OUString& _sNewName); // only the name is identical to ::cppu::OComponentHelper diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index 442d69d8b536..4db670eafd49 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -161,13 +161,13 @@ namespace connectivity const OSQLParser& _rParser ); ~OSQLParseTreeIterator(); - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } void dispose(); @@ -192,8 +192,8 @@ namespace connectivity The returned object contains a chain (via SQLException::NextException) of SQLExceptions. */ - inline const css::sdbc::SQLException& getErrors() const { return m_aErrors; } - inline bool hasErrors() const { return !m_aErrors.Message.isEmpty(); } + const css::sdbc::SQLException& getErrors() const { return m_aErrors; } + bool hasErrors() const { return !m_aErrors.Message.isEmpty(); } // statement type (already set in setParseTree): OSQLStatementType getStatementType() const { return m_eStatementType; } diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index 570a17ea7289..3d9304882539 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -44,13 +44,13 @@ namespace connectivity OSQLScanner(); virtual ~OSQLScanner(); - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } sal_Int32 SQLyygetc(); @@ -72,7 +72,7 @@ namespace connectivity static sal_Int32 GetSQLRule(); static sal_Int32 GetDATERule(); static sal_Int32 GetSTRINGRule(); - inline sal_Int32 GetCurrentPos() const { return m_nCurrentPos; } + sal_Int32 GetCurrentPos() const { return m_nCurrentPos; } }; } |