summaryrefslogtreecommitdiff
path: root/stoc
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 /stoc
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 'stoc')
-rw-r--r--stoc/source/implementationregistration/mergekeys.cxx2
-rw-r--r--stoc/source/invocation_adapterfactory/iafactory.cxx2
-rw-r--r--stoc/source/javavm/interact.cxx8
-rw-r--r--stoc/source/javavm/javavm.cxx4
-rw-r--r--stoc/source/security/access_controller.cxx2
-rw-r--r--stoc/source/security/file_policy.cxx6
-rw-r--r--stoc/source/security/permissions.cxx2
-rw-r--r--stoc/source/security/permissions.h6
8 files changed, 16 insertions, 16 deletions
diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx
index 2d6c1b2f81a5..df24ca697ec2 100644
--- a/stoc/source/implementationregistration/mergekeys.cxx
+++ b/stoc/source/implementationregistration/mergekeys.cxx
@@ -39,7 +39,7 @@ struct Link
OUString m_name;
OUString m_target;
- inline Link( OUString const & name, OUString const & target )
+ Link( OUString const & name, OUString const & target )
: m_name( name )
, m_target( target )
{}
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index ed9977ffba45..b7b3620a5d61 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -72,7 +72,7 @@ static OUString invadp_getImplementationName()
struct hash_ptr
{
- inline size_t operator() ( void * p ) const
+ size_t operator() ( void * p ) const
{ return reinterpret_cast<size_t>(p); }
};
typedef std::unordered_set< void *, hash_ptr > t_ptr_set;
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 081dce9b1e72..a36a3d989b96 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -36,14 +36,14 @@ class AbortContinuation:
public cppu::WeakImplHelper<css::task::XInteractionAbort>
{
public:
- inline AbortContinuation() {}
+ AbortContinuation() {}
AbortContinuation(const AbortContinuation&) = delete;
AbortContinuation& operator=(const AbortContinuation&)= delete;
virtual void SAL_CALL select() override {}
private:
- virtual inline ~AbortContinuation() override {}
+ virtual ~AbortContinuation() override {}
};
}
@@ -52,7 +52,7 @@ class InteractionRequest::RetryContinuation:
public cppu::WeakImplHelper<css::task::XInteractionRetry>
{
public:
- inline RetryContinuation(): m_bSelected(false) {}
+ RetryContinuation(): m_bSelected(false) {}
RetryContinuation(const RetryContinuation&) = delete;
RetryContinuation& operator=(const RetryContinuation&) = delete;
@@ -61,7 +61,7 @@ public:
bool isSelected() const;
private:
- virtual inline ~RetryContinuation() override {}
+ virtual ~RetryContinuation() override {}
mutable osl::Mutex m_aMutex;
bool m_bSelected;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index ef8e8aefa345..7bf88ccb81ab 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -124,9 +124,9 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & rContext);
private:
- inline SingletonFactory() {}
+ SingletonFactory() {}
- virtual inline ~SingletonFactory() override {}
+ virtual ~SingletonFactory() override {}
SingletonFactory(const SingletonFactory&) = delete;
SingletonFactory& operator=(const SingletonFactory&) = delete;
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index f1714aa97fd3..813daffa1f46 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -267,7 +267,7 @@ class cc_reset
public:
explicit cc_reset( void * cc )
: m_cc( cc ) {}
- inline ~cc_reset()
+ ~cc_reset()
{ ::uno_setCurrentContext( m_cc, s_envType.pData, nullptr ); }
};
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 8a388fedc2e4..31bdcdbcc7c1 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -145,14 +145,14 @@ class PolicyReader
sal_Unicode m_back;
sal_Unicode get();
- inline void back( sal_Unicode c )
+ void back( sal_Unicode c )
{ m_back = c; }
- static inline bool isWhiteSpace( sal_Unicode c )
+ static bool isWhiteSpace( sal_Unicode c )
{ return (' ' == c || '\t' == c || '\n' == c || '\r' == c); }
void skipWhiteSpace();
- static inline bool isCharToken( sal_Unicode c )
+ static bool isCharToken( sal_Unicode c )
{ return (';' == c || ',' == c || '{' == c || '}' == c); }
public:
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 8fc189ffd3d4..3ae049c7fead 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -420,7 +420,7 @@ class RuntimePermission : public Permission
OUString m_name;
public:
- inline RuntimePermission(
+ RuntimePermission(
security::RuntimePermission const & perm,
::rtl::Reference< Permission > const & next = ::rtl::Reference< Permission >() )
: Permission( RUNTIME, next )
diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h
index 582244e6dabd..6e9fe7937932 100644
--- a/stoc/source/security/permissions.h
+++ b/stoc/source/security/permissions.h
@@ -37,7 +37,7 @@ public:
// mode
enum t_type { ALL, RUNTIME, SOCKET, FILE } m_type;
- inline Permission(
+ Permission(
t_type type,
::rtl::Reference< Permission > const & next )
: m_next( next )
@@ -65,9 +65,9 @@ class PermissionCollection
{
::rtl::Reference< Permission > m_head;
public:
- inline PermissionCollection()
+ PermissionCollection()
{}
- inline PermissionCollection( PermissionCollection const & collection )
+ PermissionCollection( PermissionCollection const & collection )
: m_head( collection.m_head )
{}
explicit PermissionCollection( ::rtl::Reference< Permission > const & single )