From 7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 9 Oct 2018 10:28:48 +0200 Subject: 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 --- vcl/opengl/RenderList.cxx | 2 +- vcl/opengl/salbmp.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/opengl') diff --git a/vcl/opengl/RenderList.cxx b/vcl/opengl/RenderList.cxx index 903c492c0d35..823942121f3f 100644 --- a/vcl/opengl/RenderList.cxx +++ b/vcl/opengl/RenderList.cxx @@ -148,7 +148,7 @@ void appendPolyLine(vcl::LineBuilder& rBuilder, const basegfx::B2DPolygon& rPoly } } -inline void appendTrapezoid(std::vector& rVertices, std::vector& rIndices, +void appendTrapezoid(std::vector& rVertices, std::vector& rIndices, GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2, GLfloat x3, GLfloat y3, GLfloat x4, GLfloat y4, Color nColor, GLfloat fTransparency) diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index 5a5a2d4fc3d9..5c35e8e41265 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -48,7 +48,7 @@ namespace { -inline bool determineTextureFormat(sal_uInt16 nBits, GLenum& nFormat, GLenum& nType) +bool determineTextureFormat(sal_uInt16 nBits, GLenum& nFormat, GLenum& nType) { switch(nBits) { @@ -75,7 +75,7 @@ inline bool determineTextureFormat(sal_uInt16 nBits, GLenum& nFormat, GLenum& nT return false; } -inline bool isValidBitCount( sal_uInt16 nBitCount ) +bool isValidBitCount( sal_uInt16 nBitCount ) { return (nBitCount == 1) || (nBitCount == 4) || (nBitCount == 8) || (nBitCount == 16) || (nBitCount == 24) || (nBitCount == 32); } -- cgit