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 /svl | |
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 'svl')
-rw-r--r-- | svl/qa/unit/svl.cxx | 2 | ||||
-rw-r--r-- | svl/source/misc/adrparse.cxx | 12 | ||||
-rw-r--r-- | svl/source/misc/sharedstringpool.cxx | 2 | ||||
-rw-r--r-- | svl/source/misc/urihelper.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 76730bec7127..40afffa3e09a 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; using namespace svl; -static inline std::ostream& operator<<(std::ostream& rStrm, const Color& rColor) +static std::ostream& operator<<(std::ostream& rStrm, const Color& rColor) { rStrm << "Color: R:" << static_cast<int>(rColor.GetRed()) << " G:" << static_cast<int>(rColor.GetGreen()) << " B: " << static_cast<int>(rColor.GetBlue()); return rStrm; diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx index 90b43a8ea191..a3b7ef6060a3 100644 --- a/svl/source/misc/adrparse.cxx +++ b/svl/source/misc/adrparse.cxx @@ -39,12 +39,12 @@ struct ParsedAddrSpec bool isValid() const { return isPoorlyValid() && m_bAtFound; } - inline void reset(); + void reset(); - inline void finish(); + void finish(); }; -inline void ParsedAddrSpec::reset() +void ParsedAddrSpec::reset() { m_pBegin = nullptr; m_pEnd = nullptr; @@ -53,7 +53,7 @@ inline void ParsedAddrSpec::reset() m_bReparse = false; } -inline void ParsedAddrSpec::finish() +void ParsedAddrSpec::finish() { if (isPoorlyValid()) m_eLastElem = ELEMENT_END; @@ -97,7 +97,7 @@ class SvAddressParser_Impl inline void reset(); - inline void addTokenToAddrSpec(ElementType eTokenElem); + void addTokenToAddrSpec(ElementType eTokenElem); inline void addTokenToRealName(); @@ -136,7 +136,7 @@ inline void SvAddressParser_Impl::reset() m_eType = TOKEN_ATOM; } -inline void SvAddressParser_Impl::addTokenToAddrSpec(ElementType eTokenElem) +void SvAddressParser_Impl::addTokenToAddrSpec(ElementType eTokenElem) { if (!m_pAddrSpec->m_pBegin) m_pAddrSpec->m_pBegin = m_pCurTokenBegin; diff --git a/svl/source/misc/sharedstringpool.cxx b/svl/source/misc/sharedstringpool.cxx index 406f643f0fd6..ad72b5a1addb 100644 --- a/svl/source/misc/sharedstringpool.cxx +++ b/svl/source/misc/sharedstringpool.cxx @@ -19,7 +19,7 @@ namespace svl { namespace { -inline sal_Int32 getRefCount( const rtl_uString* p ) +sal_Int32 getRefCount( const rtl_uString* p ) { return (p->refCount & 0x3FFFFFFF); } diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 290d81cca769..a424653679e8 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -282,7 +282,7 @@ OUString URIHelper::simpleNormalizedMakeRelative( namespace { -inline sal_Int32 nextChar(OUString const & rStr, sal_Int32 nPos) +sal_Int32 nextChar(OUString const & rStr, sal_Int32 nPos) { return rtl::isHighSurrogate(rStr[nPos]) && rStr.getLength() - nPos >= 2 |