summaryrefslogtreecommitdiff
path: root/include/uno
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-03 20:57:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-03 20:55:50 +0000
commit6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch)
tree21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /include/uno
parent7e8806cd728bf906e1a8f1d649bef7337f297b1c (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/uno')
-rw-r--r--include/uno/current_context.hxx2
-rw-r--r--include/uno/dispatcher.hxx8
-rw-r--r--include/uno/environment.hxx18
-rw-r--r--include/uno/mapping.hxx20
4 files changed, 24 insertions, 24 deletions
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index d4d5608f83af..8031f9bcbfee 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.hxx
@@ -92,7 +92,7 @@ public:
@return the previously set context
*/
- inline Reference< XCurrentContext > SAL_CALL getPreviousContext() const
+ Reference< XCurrentContext > SAL_CALL getPreviousContext() const
{ return m_xPreviousContext; }
};
diff --git a/include/uno/dispatcher.hxx b/include/uno/dispatcher.hxx
index c32d8b312b1f..67e77ab56105 100644
--- a/include/uno/dispatcher.hxx
+++ b/include/uno/dispatcher.hxx
@@ -49,7 +49,7 @@ class UnoInterfaceReference
public:
uno_Interface * m_pUnoI;
- inline bool is() const
+ bool is() const
{ return m_pUnoI != NULL; }
inline ~UnoInterfaceReference();
@@ -64,7 +64,7 @@ public:
{ other.m_pUnoI = nullptr; }
#endif
- inline uno_Interface * get() const
+ uno_Interface * get() const
{ return m_pUnoI; }
inline UnoInterfaceReference & set(
@@ -73,10 +73,10 @@ public:
uno_Interface * pUnoI, __sal_NoAcquire );
inline void clear();
- inline UnoInterfaceReference & operator = (
+ UnoInterfaceReference & operator = (
UnoInterfaceReference const & ref )
{ return set( ref.m_pUnoI ); }
- inline UnoInterfaceReference & operator = (
+ UnoInterfaceReference & operator = (
uno_Interface * pUnoI )
{ return set( pUnoI ); }
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index e8b99a6ec14d..31eca6f04fad 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.hxx
@@ -63,13 +63,13 @@ public:
/// @cond INTERNAL
// 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 * )
{}
/// @endcond
@@ -114,7 +114,7 @@ public:
@param rEnv another environment
@return this environment
*/
- inline Environment & SAL_CALL operator = ( const Environment & rEnv )
+ Environment & SAL_CALL operator = ( const Environment & rEnv )
{ return operator = ( rEnv._pEnv ); }
#if defined LIBO_INTERNAL_ONLY
@@ -132,28 +132,28 @@ public:
@return UNacquired pointer to the C environment struct
*/
- inline uno_Environment * SAL_CALL get() const
+ uno_Environment * SAL_CALL get() const
{ return _pEnv; }
/** Gets type name of set environment.
@return type name of set environment
*/
- inline ::rtl::OUString SAL_CALL getTypeName() const
+ ::rtl::OUString SAL_CALL getTypeName() const
{ return _pEnv->pTypeName; }
/** Gets free context pointer of set environment.
@return free context pointer of set environment
*/
- inline void * SAL_CALL getContext() const
+ void * SAL_CALL getContext() const
{ return _pEnv->pContext; }
/** Tests if a environment is set.
@return true, if a environment is set, false otherwise
*/
- inline bool SAL_CALL is() const
+ bool SAL_CALL is() const
{ return (_pEnv != NULL); }
/** Releases a set environment.
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 352f375ff58d..f520b6f5b2bf 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -57,13 +57,13 @@ class Mapping
public:
// these are here to force memory de/allocation to sal lib.
/// @cond INTERNAL
- 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 * )
{}
/// @endcond
@@ -130,7 +130,7 @@ public:
@param rMapping another mapping
@return this mapping
*/
- inline Mapping & SAL_CALL operator = ( const Mapping & rMapping )
+ Mapping & SAL_CALL operator = ( const Mapping & rMapping )
{ return operator = ( rMapping._pMapping ); }
#if defined LIBO_INTERNAL_ONLY
@@ -148,14 +148,14 @@ public:
@return UNacquired C mapping
*/
- inline uno_Mapping * SAL_CALL get() const
+ uno_Mapping * SAL_CALL get() const
{ return _pMapping; }
/** Tests if a mapping is set.
@return true if a mapping is set
*/
- inline bool SAL_CALL is() const
+ bool SAL_CALL is() const
{ return (_pMapping != NULL); }
/** Releases a set mapping.
@@ -175,7 +175,7 @@ public:
@param pTypeDescr type description of interface
@return mapped interface
*/
- inline void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const
+ void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const
{ return mapInterface( pInterface, reinterpret_cast<typelib_InterfaceTypeDescription *>(pTypeDescr) ); }
/** Maps an interface from one environment to another.
@@ -193,7 +193,7 @@ public:
@param pInterface source interface
@param pTypeDescr type description of interface
*/
- inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const
+ void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const
{ (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, pTypeDescr ); }
/** Maps an interface from one environment to another.
@@ -201,7 +201,7 @@ public:
@param pInterface source interface
@param pTypeDescr type description of interface
*/
- inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const
+ void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const
{ (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, reinterpret_cast<typelib_InterfaceTypeDescription *>(pTypeDescr) ); }
/** Maps an interface from one environment to another.