summaryrefslogtreecommitdiff
path: root/include/com/sun
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/com/sun
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/com/sun')
-rw-r--r--include/com/sun/star/uno/Any.h20
-rw-r--r--include/com/sun/star/uno/Reference.h24
-rw-r--r--include/com/sun/star/uno/Sequence.h16
-rw-r--r--include/com/sun/star/uno/Type.h24
4 files changed, 42 insertions, 42 deletions
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 6e3d53b43c79..0a5f595cbb9d 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -54,13 +54,13 @@ class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI Any : public uno_Any
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
@@ -144,13 +144,13 @@ public:
@return a Type object of the set value
*/
- inline const Type & SAL_CALL getValueType() const
+ const Type & SAL_CALL getValueType() const
{ return * reinterpret_cast< const Type * >( &pType ); }
/** Gets the type of the set value.
@return the unacquired type description reference of the set value
*/
- inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const
+ typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const
{ return pType; }
/** Gets the type description of the set value. Provides ownership of the type description!
@@ -158,14 +158,14 @@ public:
@param ppTypeDescr a pointer to type description pointer
*/
- inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const
+ void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const
{ ::typelib_typedescriptionreference_getDescription( ppTypeDescr, pType ); }
/** Gets the type class of the set value.
@return the type class of the set value
*/
- inline TypeClass SAL_CALL getValueTypeClass() const
+ TypeClass SAL_CALL getValueTypeClass() const
{ return (TypeClass)pType->eTypeClass; }
/** Gets the type name of the set value.
@@ -178,14 +178,14 @@ public:
@return true if any has a value, false otherwise
*/
- inline bool SAL_CALL hasValue() const
+ bool SAL_CALL hasValue() const
{ return (typelib_TypeClass_VOID != pType->eTypeClass); }
/** Gets a pointer to the set value.
@return a pointer to the set value
*/
- inline const void * SAL_CALL getValue() const
+ const void * SAL_CALL getValue() const
{ return pData; }
/** Provides a value of specified type, so you can easily write e.g.
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index af2dc299b8e0..ba68c74ae574 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -83,14 +83,14 @@ public:
@return UNacquired interface pointer
*/
- inline XInterface * SAL_CALL get() const
+ XInterface * SAL_CALL get() const
{ return _pInterface; }
/** Checks if reference is null.
@return true if reference acquires an interface, i.e. true if it is not null
*/
- inline bool SAL_CALL is() const
+ bool SAL_CALL is() const
{ return (NULL != _pInterface); }
#if defined LIBO_INTERNAL_ONLY
@@ -98,7 +98,7 @@ public:
@return true if reference acquires an interface, i.e. true if it is not null
*/
- inline explicit operator bool() const
+ explicit operator bool() const
{ return is(); }
#endif
@@ -256,7 +256,7 @@ class SAL_DLLPUBLIC_RTTI Reference : public BaseReference
principle, this is not guaranteed to work. In practice, it seems to
work on all supported platforms.
*/
- static inline interface_type * castFromXInterface(XInterface * p) {
+ static interface_type * castFromXInterface(XInterface * p) {
return static_cast< interface_type * >(static_cast< void * >(p));
}
@@ -271,20 +271,20 @@ class SAL_DLLPUBLIC_RTTI Reference : public BaseReference
principle, this is not guaranteed to work. In practice, it seems to
work on all supported platforms.
*/
- static inline XInterface * castToXInterface(interface_type * p) {
+ static XInterface * castToXInterface(interface_type * p) {
return static_cast< XInterface * >(static_cast< void * >(p));
}
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
@@ -409,14 +409,14 @@ public:
any interface must be derived from com.sun.star.uno.XInterface.
This a useful direct cast possibility.
*/
- inline SAL_CALL operator const Reference< XInterface > & () const
+ SAL_CALL operator const Reference< XInterface > & () const
{ return * reinterpret_cast< const Reference< XInterface > * >( this ); }
/** Dereference operator: Used to call interface methods.
@return UNacquired interface pointer
*/
- inline interface_type * SAL_CALL operator -> () const {
+ interface_type * SAL_CALL operator -> () const {
assert(_pInterface != NULL);
return castFromXInterface(_pInterface);
}
@@ -425,7 +425,7 @@ public:
@return UNacquired interface pointer
*/
- inline interface_type * SAL_CALL get() const
+ interface_type * SAL_CALL get() const
{ return castFromXInterface(_pInterface); }
/** Clears reference, i.e. releases interface. Reference is null after clear() call.
diff --git a/include/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h
index d22bc1e8e78f..15a792bc9860 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -62,13 +62,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 * )
{}
/** Static pointer to typelib type of sequence.
@@ -140,7 +140,7 @@ public:
@return length of sequence
*/
- inline sal_Int32 SAL_CALL getLength() const
+ sal_Int32 SAL_CALL getLength() const
{ return _pSequence->nElements; }
/** Tests whether the sequence has elements, i.e. elements count is
@@ -148,7 +148,7 @@ public:
@return true, if elements count is greater than zero
*/
- inline bool SAL_CALL hasElements() const
+ bool SAL_CALL hasElements() const
{ return (_pSequence->nElements > 0); }
/** Gets a pointer to elements array for reading.
@@ -157,7 +157,7 @@ public:
@return pointer to elements array
*/
- inline const E * SAL_CALL getConstArray() const
+ const E * SAL_CALL getConstArray() const
{ return reinterpret_cast< const E * >( _pSequence->elements ); }
/** Gets a pointer to elements array for reading and writing.
@@ -249,7 +249,7 @@ public:
@return UNacquired sequence handle
*/
- inline uno_Sequence * SAL_CALL get() const
+ uno_Sequence * SAL_CALL get() const
{ return _pSequence; }
};
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 23c5527d92c4..041314e9778d 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -60,13 +60,13 @@ class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI Type
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
@@ -117,7 +117,7 @@ public:
/** Destructor: Releases acquired C type description reference.
*/
- inline ~Type()
+ ~Type()
{ ::typelib_typedescriptionreference_release( _pType ); }
/** Assignment operator: Acquires right side type and releases previously set type.
@@ -131,7 +131,7 @@ public:
@return type class of set type
*/
- inline TypeClass SAL_CALL getTypeClass() const
+ TypeClass SAL_CALL getTypeClass() const
{ return (TypeClass)_pType->eTypeClass; }
/** Gets the name of the set type.
@@ -144,14 +144,14 @@ public:
@param ppDescr [inout] type description
*/
- inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const
+ void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const
{ ::typelib_typedescriptionreference_getDescription( ppDescr, _pType ); }
/** Gets the C typelib type description reference pointer. Does not acquire the reference!
@return UNacquired type description reference
*/
- inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const
+ typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const
{ return _pType; }
/** Tests if values of this reflected type can be assigned by values of given type.
@@ -162,7 +162,7 @@ public:
@return true if values of this type can be assigned from values of given type,
false otherwise
*/
- inline bool SAL_CALL isAssignableFrom( const Type & rType ) const
+ bool SAL_CALL isAssignableFrom( const Type & rType ) const
{ return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); }
/** Compares two types.
@@ -170,21 +170,21 @@ public:
@param rType another type
@return true if both types refer the same type, false otherwise
*/
- inline bool SAL_CALL equals( const Type & rType ) const
+ bool SAL_CALL equals( const Type & rType ) const
{ return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
/** Equality operator: Compares two types.
@param rType another type
@return true if both types refer the same type, false otherwise
*/
- inline bool SAL_CALL operator == ( const Type & rType ) const
+ bool SAL_CALL operator == ( const Type & rType ) const
{ return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
/** Unequality operator: Compares two types.
@param rType another type
@return false if both types refer the same type, true otherwise
*/
- inline bool SAL_CALL operator != ( const Type & rType ) const
+ bool SAL_CALL operator != ( const Type & rType ) const
{ return (! ::typelib_typedescriptionreference_equals( _pType, rType._pType )); }
};