From 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 3 Mar 2017 20:57:02 +0100 Subject: 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 Reviewed-by: Stephan Bergmann --- include/cppuhelper/access_control.hxx | 6 +++--- include/cppuhelper/compbase1.hxx | 6 +++--- include/cppuhelper/compbase10.hxx | 6 +++--- include/cppuhelper/compbase11.hxx | 6 +++--- include/cppuhelper/compbase12.hxx | 6 +++--- include/cppuhelper/compbase2.hxx | 6 +++--- include/cppuhelper/compbase3.hxx | 6 +++--- include/cppuhelper/compbase4.hxx | 6 +++--- include/cppuhelper/compbase5.hxx | 6 +++--- include/cppuhelper/compbase6.hxx | 6 +++--- include/cppuhelper/compbase7.hxx | 6 +++--- include/cppuhelper/compbase8.hxx | 6 +++--- include/cppuhelper/compbase9.hxx | 6 +++--- include/cppuhelper/compbase_ex.hxx | 16 ++++++++-------- include/cppuhelper/component_context.hxx | 4 ++-- include/cppuhelper/interfacecontainer.h | 32 ++++++++++++++++---------------- include/cppuhelper/propshlp.hxx | 16 ++++++++-------- include/cppuhelper/typeprovider.hxx | 24 ++++++++++++------------ include/cppuhelper/weak.hxx | 16 ++++++++-------- include/cppuhelper/weakagg.hxx | 2 +- include/cppuhelper/weakref.hxx | 12 ++++++------ 21 files changed, 100 insertions(+), 100 deletions(-) (limited to 'include/cppuhelper') diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx index cf10806d9033..9158c8e0a783 100644 --- a/include/cppuhelper/access_control.hxx +++ b/include/cppuhelper/access_control.hxx @@ -54,21 +54,21 @@ public: /** Clears the access controller reference being used. */ - inline void SAL_CALL clear() + void SAL_CALL clear() { m_xController.clear(); } /** Returns access to the access controller reference being used. @return access controller */ - inline css::uno::Reference< css::security::XAccessController > const & SAL_CALL get() const + css::uno::Reference< css::security::XAccessController > const & SAL_CALL get() const { return m_xController; } /** Returns access to the access controller reference being used. @return access controller */ - inline css::security::XAccessController * SAL_CALL operator -> () const + css::security::XAccessController * SAL_CALL operator -> () const { return m_xController.get(); } diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx index 45ad3f0143b6..ab55d4fca1ac 100644 --- a/include/cppuhelper/compbase1.hxx +++ b/include/cppuhelper/compbase1.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {}; public: - inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {}; public: - inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {}; public: - inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx index 7d499c1e9d0c..fabcf4d8035d 100644 --- a/include/cppuhelper/compbase10.hxx +++ b/include/cppuhelper/compbase10.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakComponentImplHelper10 > > {}; public: - inline WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, PartialWeakComponentImplHelper10 > > {}; public: - inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggComponentImplHelper10 > > {}; public: - inline WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx index ec55cf0eba20..d914bc4aac9e 100644 --- a/include/cppuhelper/compbase11.hxx +++ b/include/cppuhelper/compbase11.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakComponentImplHelper11 > > {}; public: - inline WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, PartialWeakComponentImplHelper11 > > {}; public: - inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggComponentImplHelper11 > > {}; public: - inline WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx index c43c57078720..e7f6c9ca3671 100644 --- a/include/cppuhelper/compbase12.hxx +++ b/include/cppuhelper/compbase12.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakComponentImplHelper12 > > {}; public: - inline WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, PartialWeakComponentImplHelper12 > > {}; public: - inline PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggComponentImplHelper12 > > {}; public: - inline WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx index 4804151f3df7..3534f8a1885e 100644 --- a/include/cppuhelper/compbase2.hxx +++ b/include/cppuhelper/compbase2.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakComponentImplHelper2 > > {}; public: - inline WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, PartialWeakComponentImplHelper2 > > {}; public: - inline PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -126,7 +126,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggComponentImplHelper2 > > {}; public: - inline WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx index 674342073e31..34fb477582b9 100644 --- a/include/cppuhelper/compbase3.hxx +++ b/include/cppuhelper/compbase3.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakComponentImplHelper3 > > {}; public: - inline WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, PartialWeakComponentImplHelper3 > > {}; public: - inline PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggComponentImplHelper3 > > {}; public: - inline WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx index b5e06502515b..b3d1a263ed03 100644 --- a/include/cppuhelper/compbase4.hxx +++ b/include/cppuhelper/compbase4.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakComponentImplHelper4 > > {}; public: - inline WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, PartialWeakComponentImplHelper4 > > {}; public: - inline PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggComponentImplHelper4 > > {}; public: - inline WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx index 1fe66f71254d..5e583aa3ff13 100644 --- a/include/cppuhelper/compbase5.hxx +++ b/include/cppuhelper/compbase5.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakComponentImplHelper5 > > {}; public: - inline WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, PartialWeakComponentImplHelper5 > > {}; public: - inline PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggComponentImplHelper5 > > {}; public: - inline WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx index e8cf7ad8a5b1..1ae3a95dd443 100644 --- a/include/cppuhelper/compbase6.hxx +++ b/include/cppuhelper/compbase6.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakComponentImplHelper6 > > {}; public: - inline WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, PartialWeakComponentImplHelper6 > > {}; public: - inline PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggComponentImplHelper6 > > {}; public: - inline WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx index 3690c9ce7d9b..ee4a9b445a56 100644 --- a/include/cppuhelper/compbase7.hxx +++ b/include/cppuhelper/compbase7.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakComponentImplHelper7 > > {}; public: - inline WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, PartialWeakComponentImplHelper7 > > {}; public: - inline PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggComponentImplHelper7 > > {}; public: - inline WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx index 0e8600cdce3c..89b30358c805 100644 --- a/include/cppuhelper/compbase8.hxx +++ b/include/cppuhelper/compbase8.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakComponentImplHelper8 > > {}; public: - inline WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, PartialWeakComponentImplHelper8 > > {}; public: - inline PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggComponentImplHelper8 > > {}; public: - inline WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx index 730e63134dae..78cd2b96e0d9 100644 --- a/include/cppuhelper/compbase9.hxx +++ b/include/cppuhelper/compbase9.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakComponentImplHelper9 > > {}; public: - inline WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, PartialWeakComponentImplHelper9 > > {}; public: - inline PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -124,7 +124,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggComponentImplHelper9 > > {}; public: - inline WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index 864dd3afa31f..28535e8bb6ca 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -58,13 +58,13 @@ public: virtual ~WeakComponentImplHelperBase() SAL_OVERRIDE; // 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 * ) {} virtual css::uno::Any SAL_CALL queryInterface( @@ -99,13 +99,13 @@ public: virtual ~WeakAggComponentImplHelperBase() SAL_OVERRIDE; // 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 * ) {} virtual css::uno::Any SAL_CALL queryInterface( diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index e6de21c710c1..a8dca83861d5 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -50,7 +50,7 @@ struct SAL_WARN_UNUSED ContextEntry_Init /** Default ctor. */ - inline ContextEntry_Init() + ContextEntry_Init() : bLateInitService( false ) {} /** Ctor. @@ -63,7 +63,7 @@ struct SAL_WARN_UNUSED ContextEntry_Init whether this entry is a late-init named object entry (value is object factory or service string) */ - inline ContextEntry_Init( + ContextEntry_Init( ::rtl::OUString const & name_, css::uno::Any const & value_, bool bLateInitService_ = false ) diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 3daa656b5664..0049cb8e2b75 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -128,13 +128,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper { 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 * ) {} /** @@ -312,13 +312,13 @@ class OMultiTypeInterfaceContainerHelperVar { 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 * ) {} /** @@ -400,7 +400,7 @@ private: InterfaceMap *m_pMap; ::osl::Mutex & rMutex; - inline typename InterfaceMap::iterator find(const key &rKey) const + typename InterfaceMap::iterator find(const key &rKey) const { typename InterfaceMap::iterator iter = m_pMap->begin(); typename InterfaceMap::iterator end = m_pMap->end(); @@ -457,7 +457,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar /** adds a listener threadsafe. **/ - inline void addListener( + void addListener( const keyType &key, const css::uno::Reference < css::uno::XInterface > &r ) { @@ -471,7 +471,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar /** removes a listener threadsafe **/ - inline void removeListener( + void removeListener( const keyType &key, const css::uno::Reference < css::uno::XInterface > & r ) { @@ -486,7 +486,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar was not created, null was returned. This can be used to optimize performance ( construction of an event object can be avoided ). ***/ - inline OInterfaceContainerHelper * SAL_CALL getContainer( const keyType &key ) const + OInterfaceContainerHelper * SAL_CALL getContainer( const keyType &key ) const { return aLC.getContainer( key ); } }; @@ -512,13 +512,13 @@ class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelper { 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/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index b1f2a5082b0b..31a91b425112 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -47,13 +47,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC IPropertyArrayHelper { 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 * ) {} /** @@ -223,13 +223,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt { 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/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx index e90ea3c00236..912f90865e04 100644 --- a/include/cppuhelper/typeprovider.hxx +++ b/include/cppuhelper/typeprovider.hxx @@ -41,17 +41,17 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OTypeCollection 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 - inline OTypeCollection( const OTypeCollection & rCollection ) + OTypeCollection( const OTypeCollection & rCollection ) : _aTypes( rCollection._aTypes ) {} OTypeCollection( @@ -177,13 +177,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 * ) {} ~OImplementationId(); @@ -194,7 +194,7 @@ public: @param bUseEthernetAddress whether an ethernet mac address should be taken into account */ - inline OImplementationId( bool bUseEthernetAddress = true ) + OImplementationId( bool bUseEthernetAddress = true ) : _pSeq( NULL ) , _bUseEthernetAddress( bUseEthernetAddress ) {} @@ -202,11 +202,11 @@ public: @param rSeq implementation id */ - inline OImplementationId( const css::uno::Sequence< sal_Int8 > & rSeq ) + OImplementationId( const css::uno::Sequence< sal_Int8 > & rSeq ) : _pSeq( new css::uno::Sequence< sal_Int8 >( rSeq ) ) , _bUseEthernetAddress( false ) {} - inline OImplementationId( const OImplementationId & rId ) + OImplementationId( const OImplementationId & rId ) : _pSeq( new css::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) ) , _bUseEthernetAddress( false ) {} diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx index 0bc22a49e005..cddd79590592 100644 --- a/include/cppuhelper/weak.hxx +++ b/include/cppuhelper/weak.hxx @@ -81,13 +81,13 @@ protected: 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 @@ -99,7 +99,7 @@ public: #else /** Default Constructor. Sets the reference count to zero. */ - inline OWeakObject() + OWeakObject() : m_refCount( 0 ) , m_pWeakConnectionPoint( NULL ) , m_pReserved(NULL) @@ -109,7 +109,7 @@ public: @param rObj dummy param */ - inline OWeakObject( const OWeakObject & rObj ) + OWeakObject( const OWeakObject & rObj ) : css::uno::XWeak() , m_refCount( 0 ) , m_pWeakConnectionPoint( NULL ) @@ -121,7 +121,7 @@ public: @return this OWeakObject */ - inline OWeakObject & SAL_CALL operator = ( const OWeakObject &) + OWeakObject & SAL_CALL operator = ( const OWeakObject &) { return *this; } /** Basic queryInterface() implementation supporting com::sun::star::uno::XWeak and @@ -151,7 +151,7 @@ public: @return XInterface reference */ - inline SAL_CALL operator css::uno::Reference< css::uno::XInterface > () + SAL_CALL operator css::uno::Reference< css::uno::XInterface > () { return this; } }; diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx index b633c44ce26d..03754f3ec06f 100644 --- a/include/cppuhelper/weakagg.hxx +++ b/include/cppuhelper/weakagg.hxx @@ -45,7 +45,7 @@ class CPPUHELPER_DLLPUBLIC OWeakAggObject public: /** Constructor. No delegator set. */ - inline OWeakAggObject() + OWeakAggObject() {} /** If a delegator is set, then the delegators gets acquired. Otherwise call is delegated to diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx index d57cd2b43d12..1afdd864f136 100644 --- a/include/cppuhelper/weakref.hxx +++ b/include/cppuhelper/weakref.hxx @@ -53,7 +53,7 @@ class CPPUHELPER_DLLPUBLIC WeakReferenceHelper public: /** Default ctor. Creates an empty weak reference. */ - inline WeakReferenceHelper() + WeakReferenceHelper() : m_pImpl( NULL ) {} @@ -103,7 +103,7 @@ public: @param rObj another weak ref @return true, if both weak refs reference to the same object. */ - inline bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const + bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const { return (get() == rObj.get()); } /** Gets a hard reference to the object. @@ -116,7 +116,7 @@ public: @return hard reference or null, if the weakly referenced interface has gone */ - inline SAL_CALL operator Reference< XInterface > () const + SAL_CALL operator Reference< XInterface > () const { return get(); } /** Releases this reference. @@ -148,7 +148,7 @@ class SAL_WARN_UNUSED WeakReference : public WeakReferenceHelper public: /** Default ctor. Creates an empty weak reference. */ - inline WeakReference() + WeakReference() : WeakReferenceHelper() {} @@ -156,7 +156,7 @@ public: @param rRef another hard ref */ - inline WeakReference( const Reference< interface_type > & rRef ) + WeakReference( const Reference< interface_type > & rRef ) : WeakReferenceHelper( rRef ) {} @@ -176,7 +176,7 @@ public: @return hard reference or null, if the weakly referenced interface has gone */ - inline SAL_CALL operator Reference< interface_type > () const + SAL_CALL operator Reference< interface_type > () const { return Reference< interface_type >::query( get() ); } }; -- cgit