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 /desktop | |
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 'desktop')
8 files changed, 14 insertions, 14 deletions
diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h index 4f29cdaabc01..365bff77338a 100644 --- a/desktop/inc/dp_misc.h +++ b/desktop/inc/dp_misc.h @@ -44,7 +44,7 @@ class MutexHolder { mutable ::osl::Mutex m_mutex; protected: - inline ::osl::Mutex & getMutex() const { return m_mutex; } + ::osl::Mutex & getMutex() const { return m_mutex; } }; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 155a28284520..a7970b81297e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -155,7 +155,7 @@ public: void stopProgress(); void progressSection( const OUString &rText, const uno::Reference< task::XAbortChannel > &xAbortChannel ); - inline void setWarnUser( bool bNewVal ) { m_bWarnUser = bNewVal; } + void setWarnUser( bool bNewVal ) { m_bWarnUser = bNewVal; } // XCommandEnvironment virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override; diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 2cabec56d41a..5f5fb610558c 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -110,12 +110,12 @@ class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC AbortChannel : css::uno::Reference<css::task::XAbortChannel> m_xNext; public: - inline AbortChannel() : m_aborted( false ) {} - inline static AbortChannel * get( + AbortChannel() : m_aborted( false ) {} + static AbortChannel * get( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel ) { return static_cast<AbortChannel *>(xAbortChannel.get()); } - inline bool isAborted() const { return m_aborted; } + bool isAborted() const { return m_aborted; } // XAbortChannel virtual void SAL_CALL sendAbort() override; @@ -124,12 +124,12 @@ public: { const ::rtl::Reference<AbortChannel> m_abortChannel; public: - inline Chain( + Chain( ::rtl::Reference<AbortChannel> const & abortChannel, css::uno::Reference<css::task::XAbortChannel> const & xNext ) : m_abortChannel( abortChannel ) { if (m_abortChannel.is()) m_abortChannel->m_xNext = xNext; } - inline ~Chain() + ~Chain() { if (m_abortChannel.is()) m_abortChannel->m_xNext.clear(); } }; friend class Chain; diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index dd12b59fc957..c10122454ea3 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -120,7 +120,7 @@ protected: virtual void SAL_CALL disposing() override; virtual ~PackageManagerImpl() override; - inline PackageManagerImpl( + PackageManagerImpl( css::uno::Reference<css::uno::XComponentContext> const & xComponentContext, OUString const & context ) : t_pm_helper( getMutex() ), diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index cfcc5ba4903e..0eda61153da6 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -43,7 +43,7 @@ class InteractionContinuationImpl : public ::cppu::OWeakObject, bool * m_pselect; public: - inline InteractionContinuationImpl( Type const & type, bool * pselect ) + InteractionContinuationImpl( Type const & type, bool * pselect ) : m_type( type ), m_pselect( pselect ) { OSL_ASSERT( diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 1dd47424491d..20c71225dfc7 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -86,7 +86,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend Reference<XCommandEnvironment> const & xCmdEnv ) override; public: - inline PackageImpl( + PackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, OUString const & url, OUString const & name, Reference<deployment::XPackageTypeInfo> const & xPackageType, diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 4c256a337aa8..2d180bbba1ae 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -63,7 +63,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool isUrlTargetInExtension(); public: - inline ExecutablePackageImpl( + ExecutablePackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, OUString const & url, OUString const & name, Reference<deployment::XPackageTypeInfo> const & xPackageType, diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 5df23c86ab57..a315c143b070 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -269,11 +269,11 @@ public: struct StrRevokingPackage : public ::dp_misc::StaticResourceString< StrRevokingPackage, RID_STR_REVOKING_PACKAGE> {}; - inline css::uno::Reference<css::uno::XComponentContext> const & + css::uno::Reference<css::uno::XComponentContext> const & getComponentContext() const { return m_xComponentContext; } - inline OUString const & getCachePath() const { return m_cachePath; } - inline bool transientMode() const { return m_cachePath.isEmpty(); } + OUString const & getCachePath() const { return m_cachePath; } + bool transientMode() const { return m_cachePath.isEmpty(); } const OUString& getContext() const {return m_context; } |