diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-09 10:28:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-09 14:47:17 +0200 |
commit | 7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 (patch) | |
tree | 616ab419fe0f01e94740de7faacb393775420589 /desktop | |
parent | 664db0d945fbb23e115eeea8377e3a4e88541da1 (diff) |
Extend loplugin:redundantinline to catch inline functions w/o external linkage
...where "inline" (in its meaning of "this function can be defined in multiple
translation units") thus doesn't make much sense. (As discussed in
compilerplugins/clang/redundantinline.cxx, exempt such "static inline" functions
in include files for now.)
All the rewriting has been done automatically by the plugin, except for one
instance in sw/source/ui/frmdlg/column.cxx that used to involve an #if), plus
some subsequent solenv/clang-format/reformat-formatted-files.
Change-Id: Ib8b996b651aeafc03bbdc8890faa05ed50517224
Reviewed-on: https://gerrit.libreoffice.org/61573
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/registry/dp_registry.cxx | 4 | ||||
-rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 2 | ||||
-rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2 | ||||
-rw-r--r-- | desktop/unx/source/splashx.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 50cc7cb72890..b3d2abd1d932 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -239,7 +239,7 @@ bool needToSyncRepository(OUString const & name) namespace { -inline OUString encodeForRcFile( OUString const & str ) +OUString encodeForRcFile( OUString const & str ) { // escape $\{} (=> rtl bootstrap files) OUStringBuffer buf; diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 3514a0815d2d..2bd542379a59 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -95,7 +95,7 @@ class PackageRegistryImpl : private MutexHolder, public t_helper Reference<deployment::XPackageRegistry> const & xBackend ); protected: - inline void check(); + void check(); virtual void SAL_CALL disposing() override; virtual ~PackageRegistryImpl() override; @@ -122,7 +122,7 @@ public: }; -inline void PackageRegistryImpl::check() +void PackageRegistryImpl::check() { ::osl::MutexGuard guard( getMutex() ); if (rBHelper.bInDispose || rBHelper.bDisposed) { diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index cbf91bca647d..c2ca9b0ca4c1 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -1277,7 +1277,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( return *pBundle; } -inline bool isBundle_( OUString const & mediaType ) +bool isBundle_( OUString const & mediaType ) { // xxx todo: additional parsing? return !mediaType.isEmpty() && diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 4adc21b683d8..7f1cbffb3488 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -223,7 +223,7 @@ OUString makeAbsoluteFileUrl( namespace { -inline void printf_space( sal_Int32 space ) +void printf_space( sal_Int32 space ) { while (space--) dp_misc::writeConsole(" "); diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 71858367f92f..e03fc094abcb 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -193,7 +193,7 @@ static void splash_setup( struct splash* splash, int const barc[3], int const fr #define SHIFT( x, bits ) ( ( (bits) >= 0 )? ( (x) << (bits) ): ( (x) >> -(bits) ) ) // Position of the highest bit (more or less integer log2) -static inline int HIGHEST_BIT( unsigned long x ) +static int HIGHEST_BIT( unsigned long x ) { int i = 0; for ( ; x; ++i ) @@ -203,7 +203,7 @@ static inline int HIGHEST_BIT( unsigned long x ) } // Number of bits set to 1 -static inline int BITS( unsigned long x ) +static int BITS( unsigned long x ) { int i = 0; for ( ; x; x >>= 1 ) |