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/comphelper | |
parent | tdf#42982 improve error reporting in sc unoobj (diff) | |
download | core-6cb9e6dad798ec59f055aebe84a9c4a21e4be40d.tar.gz core-6cb9e6dad798ec59f055aebe84a9c4a21e4be40d.zip |
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/comphelper')
-rw-r--r-- | include/comphelper/MasterPropertySet.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/accessiblecontexthelper.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/asyncnotification.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/componentbase.hxx | 14 | ||||
-rw-r--r-- | include/comphelper/interfacecontainer2.hxx | 8 | ||||
-rw-r--r-- | include/comphelper/listenernotification.hxx | 12 | ||||
-rw-r--r-- | include/comphelper/namedvaluecollection.hxx | 28 | ||||
-rw-r--r-- | include/comphelper/propertybag.hxx | 6 | ||||
-rw-r--r-- | include/comphelper/proxyaggregation.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/sequenceashashmap.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/sharedmutex.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/weakeventlistener.hxx | 10 |
12 files changed, 48 insertions, 48 deletions
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index c1203a35b257..d18ad49786bf 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -39,8 +39,8 @@ namespace comphelper bool mbInit; SlaveData ( ChainablePropertySet *pSlave); - inline bool IsInit () { return mbInit;} - inline void SetInit ( bool bInit) { mbInit = bInit; } + bool IsInit () { return mbInit;} + void SetInit ( bool bInit) { mbInit = bInit; } }; } diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 504afb9dd59a..7163817280a3 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -57,14 +57,14 @@ namespace comphelper { IMutex* m_pMutex; public: - inline OMutexGuard( IMutex* _pMutex ) + OMutexGuard( IMutex* _pMutex ) :m_pMutex( _pMutex ) { if ( m_pMutex ) m_pMutex->acquire(); } - inline ~OMutexGuard( ) + ~OMutexGuard( ) { if ( m_pMutex ) m_pMutex->release(); diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx index f512b42f31b0..69c5647c5bda 100644 --- a/include/comphelper/asyncnotification.hxx +++ b/include/comphelper/asyncnotification.hxx @@ -207,12 +207,12 @@ namespace comphelper EventObjectType m_aEvent; public: - inline EventHolder( const EventObjectType& _rEvent ) + EventHolder( const EventObjectType& _rEvent ) :m_aEvent( _rEvent ) { } - inline const EventObjectType& getEventObject() const { return m_aEvent; } + const EventObjectType& getEventObject() const { return m_aEvent; } }; COMPHELPER_DLLPUBLIC void JoinAsyncEventNotifiers(); diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index ac6acfa758bd..75f43a9f8812 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -64,14 +64,14 @@ namespace comphelper Subsequent instantiations of a ComponentMethodGuard won't throw the NotInitializedException now. */ - inline void setInitialized() { m_bInitialized = true; } + void setInitialized() { m_bInitialized = true; } public: /// helper struct to grant access to selected public methods to the ComponentMethodGuard class struct GuardAccess { friend class ComponentMethodGuard; private: GuardAccess() { } }; /// retrieves the component's mutex - inline ::osl::Mutex& getMutex( GuardAccess ) { return getMutex(); } + ::osl::Mutex& getMutex( GuardAccess ) { return getMutex(); } /// checks whether the component is already disposed, throws a DisposedException if so. void checkDisposed( GuardAccess ) const; /// checks whether the component is already initialized, throws a NotInitializedException if not. @@ -79,14 +79,14 @@ namespace comphelper protected: /// retrieves the component's broadcast helper - inline ::cppu::OBroadcastHelper& getBroadcastHelper() { return m_rBHelper; } + ::cppu::OBroadcastHelper& getBroadcastHelper() { return m_rBHelper; } /// retrieves the component's mutex - inline ::osl::Mutex& getMutex() { return m_rBHelper.rMutex; } + ::osl::Mutex& getMutex() { return m_rBHelper.rMutex; } /// determines whether the instance is already disposed - inline bool impl_isDisposed() const { return m_rBHelper.bDisposed; } + bool impl_isDisposed() const { return m_rBHelper.bDisposed; } /// determines whether the component is already initialized - inline bool + bool impl_isInitialized_nothrow() const { return m_bInitialized; } /** returns the context to be used when throwing exceptions @@ -121,7 +121,7 @@ namespace comphelper _rComponent.checkDisposed( ComponentBase::GuardAccess() ); } - inline void clear() + void clear() { m_aMutexGuard.clear(); } diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx index e4df46d6f76c..4439dbfc5da6 100644 --- a/include/comphelper/interfacecontainer2.hxx +++ b/include/comphelper/interfacecontainer2.hxx @@ -126,13 +126,13 @@ class COMPHELPER_DLLPUBLIC OInterfaceContainerHelper2 { public: // these are here to force memory de/allocation to sal lib. - 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 delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /** diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index ad040d1779e0..22b98c693a03 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -169,12 +169,12 @@ namespace comphelper { } - inline void addListener( const css::uno::Reference< ListenerClass >& _rxListener ) + void addListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_addListener( _rxListener.get() ); } - inline void removeListener( const css::uno::Reference< ListenerClass >& _rxListener ) + void removeListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_removeListener( _rxListener.get() ); } @@ -224,21 +224,21 @@ namespace comphelper typedef EVENT EventClass; public: - inline OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex ) + OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex ) { } - inline void addTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) + void addTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_addListener( _rxListener.get() ); } - inline void removeTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) + void removeTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_removeListener( _rxListener.get() ); } - inline bool notify( const EventClass& _rEvent ) + bool notify( const EventClass& _rEvent ) { return OListenerContainer::impl_notify( _rEvent ); } diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index cb850aa26574..9b19bf2e3dda 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -83,12 +83,12 @@ namespace comphelper ~NamedValueCollection(); - inline void assign( const css::uno::Sequence< css::uno::Any >& _rArguments ) + void assign( const css::uno::Sequence< css::uno::Any >& _rArguments ) { impl_assign( _rArguments ); } - inline void clear() + void clear() { impl_assign( css::uno::Sequence< css::beans::NamedValue >() ); } @@ -195,13 +195,13 @@ namespace comphelper } /// determines whether a value with a given name is present in the collection - inline bool has( const sal_Char* _pAsciiValueName ) const + bool has( const sal_Char* _pAsciiValueName ) const { return impl_has( OUString::createFromAscii( _pAsciiValueName ) ); } /// determines whether a value with a given name is present in the collection - inline bool has( const OUString& _rValueName ) const + bool has( const OUString& _rValueName ) const { return impl_has( _rValueName ); } @@ -212,7 +212,7 @@ namespace comphelper which case it has been overwritten. */ template < typename VALUE_TYPE > - inline bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue ) + bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue ) { return impl_put( OUString::createFromAscii( _pAsciiValueName ), css::uno::makeAny( _rValue ) ); } @@ -223,17 +223,17 @@ namespace comphelper which case it has been overwritten. */ template < typename VALUE_TYPE > - inline bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue ) + bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue ) { return impl_put( _rValueName, css::uno::makeAny( _rValue ) ); } - inline bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue ) + bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue ) { return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue ); } - inline bool put( const OUString& _rValueName, const css::uno::Any& _rValue ) + bool put( const OUString& _rValueName, const css::uno::Any& _rValue ) { return impl_put( _rValueName, _rValue ); } @@ -242,7 +242,7 @@ namespace comphelper @return <TRUE/> if and only if a value with the given name existed in the collection. */ - inline bool remove( const sal_Char* _pAsciiValueName ) + bool remove( const sal_Char* _pAsciiValueName ) { return impl_remove( OUString::createFromAscii( _pAsciiValueName ) ); } @@ -251,7 +251,7 @@ namespace comphelper @return <TRUE/> if and only if a value with the given name existed in the collection. */ - inline bool remove( const OUString& _rValueName ) + bool remove( const OUString& _rValueName ) { return impl_remove( _rValueName ); } @@ -272,7 +272,7 @@ namespace comphelper /** transforms the collection into a sequence of PropertyValues */ - inline css::uno::Sequence< css::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > getPropertyValues() const { css::uno::Sequence< css::beans::PropertyValue > aValues; @@ -282,7 +282,7 @@ namespace comphelper /** returns a Sequence< Any >, containing PropertyValues */ - inline css::uno::Sequence< css::uno::Any > + css::uno::Sequence< css::uno::Any > getWrappedPropertyValues() const { return impl_wrap< css::beans::PropertyValue >(); @@ -290,7 +290,7 @@ namespace comphelper /** returns a Sequence< Any >, containing NamedValues */ - inline css::uno::Sequence< css::uno::Any > + css::uno::Sequence< css::uno::Any > getWrappedNamedValues() const { return impl_wrap< css::beans::NamedValue >(); @@ -298,7 +298,7 @@ namespace comphelper /** transforms the collection into a sequence of NamedValues */ - inline css::uno::Sequence< css::beans::NamedValue > + css::uno::Sequence< css::beans::NamedValue > getNamedValues() const { css::uno::Sequence< css::beans::NamedValue > aValues; diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx index 2123484ebb85..dcca91db86dd 100644 --- a/include/comphelper/propertybag.hxx +++ b/include/comphelper/propertybag.hxx @@ -130,7 +130,7 @@ namespace comphelper @param _out_rProps takes, upon return, the descriptions of all properties in the bag */ - inline void describeProperties( + void describeProperties( css::uno::Sequence< css::beans::Property >& _out_rProps ) const { @@ -202,14 +202,14 @@ namespace comphelper /** determines whether a property with a given name is part of the bag */ - inline bool hasPropertyByName( const OUString& _rName ) const + bool hasPropertyByName( const OUString& _rName ) const { return isRegisteredProperty( _rName ); } /** determines whether a property with a given handle is part of the bag */ - inline bool hasPropertyByHandle( sal_Int32 _nHandle ) const + bool hasPropertyByHandle( sal_Int32 _nHandle ) const { return isRegisteredProperty( _nHandle ); } diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index bf3c5d87233e..465d3e243666 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -88,7 +88,7 @@ namespace comphelper css::uno::Reference< css::uno::XComponentContext > m_xContext; protected: - inline const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() + const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() { return m_xContext; } diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index d31ae21914e8..270601af7c67 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -247,7 +247,7 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAs @return The value of the specified property or an empty css::uno::Any. */ - inline css::uno::Any getValue(const OUString& sKey) const + css::uno::Any getValue(const OUString& sKey) const { const_iterator pIt = find(sKey); if (pIt == end()) diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx index 87e6717cbb84..d0fd28dd6e21 100644 --- a/include/comphelper/sharedmutex.hxx +++ b/include/comphelper/sharedmutex.hxx @@ -37,7 +37,7 @@ namespace comphelper SharedMutex( const SharedMutex& ); SharedMutex& operator=( const SharedMutex& ); - inline operator ::osl::Mutex& () { return *m_pMutexImpl; } + operator ::osl::Mutex& () { return *m_pMutexImpl; } private: std::shared_ptr< ::osl::Mutex > m_pMutexImpl; diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 0fc4e588fb51..273153cfaeb9 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -50,26 +50,26 @@ namespace comphelper m_xBroadcaster; protected: - inline css::uno::Reference< css::uno::XInterface > + css::uno::Reference< css::uno::XInterface > getListener( ) const { return m_aListener.get(); } - inline const css::uno::Reference< css::uno::XInterface >& + const css::uno::Reference< css::uno::XInterface >& getBroadcaster( ) const { return m_xBroadcaster; } - inline void resetListener( ) + void resetListener( ) { m_aListener.clear(); } protected: - inline OWeakListenerAdapterBase( + OWeakListenerAdapterBase( const css::uno::Reference< css::uno::XWeak >& _rxListener, const css::uno::Reference< css::uno::XInterface >& _rxBroadcaster ) @@ -109,7 +109,7 @@ namespace comphelper ); protected: - inline css::uno::Reference< LISTENER > getListener( ) const + css::uno::Reference< LISTENER > getListener( ) const { return css::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), css::uno::UNO_QUERY ); } |