diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-26 20:42:08 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-26 22:33:02 +0200 |
commit | fe6cce01c88d045a1fcf09acf049c34c22299b02 (patch) | |
tree | c118594a43386096bca55179f31b2b61e64dfa48 /canvas/source/vcl | |
parent | b894a3d7f991dd248dfd8935b31da8bccfd130b2 (diff) |
Fix loplugin:simplifypointertobool for libstdc++ std::shared_ptr
...where the get member function is defined on a std::__shared_ptr base class,
so loplugin:simplifypointertobool used to miss those until now. (While e.g.
using libc++ on macOS found those cases.)
366d08f2f6d4de922f6099c62bb81b49d89e0a68 "new loplugin:simplifypointertobool"
was mistaken in breaking isSmartPointerType(const clang::Type* t) out of
isSmartPointerType(const Expr* e); c874294ad9fb178df47c66875bfbdec466e39763 "Fix
detection of std::unique_ptr/shared_ptr in loplugin:redundantpointerops" had
introduced that indivisible two-step algorithm on purpose.
The amount of additional hits (on Linux) apparently asked for turning
loplugin:simplifypointertobool into a rewriting plugin. Which in turn showed
that the naive adivce to just "drop the get()" is not sufficient in places that
are not contextually converted to bool, as those places need to be wrapped in a
bool(...) functional cast now. If the expression was already wrapped in
parentheses, those could be reused as part of the functional cast, but
implementing that showed that such cases are not yet found at all by the
existing loplugin:simplifypointertobool. Lets leave that TODO for another
commit.
Besides the changes to compilerplugins/ itself, this change has been generated
fully automatically with the rewriting plugin on Linux.
Change-Id: I83107d6f634fc9ac232986f49044d7017df83e2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94888
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'canvas/source/vcl')
-rw-r--r-- | canvas/source/vcl/canvasbitmaphelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 10 | ||||
-rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 2 | ||||
-rw-r--r-- | canvas/source/vcl/impltools.hxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index 43fed2754430..336c12b83047 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -155,7 +155,7 @@ namespace vclcanvas rendering::IntegerBitmapLayout CanvasBitmapHelper::getMemoryLayout() const { - if( !mpOutDevProvider.get() ) + if( !mpOutDevProvider ) return rendering::IntegerBitmapLayout(); // we're disposed rendering::IntegerBitmapLayout aBitmapLayout( ::canvas::tools::getStdMemoryLayout(getSize()) ); diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 17930a1a758d..07dc45574e64 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -867,7 +867,7 @@ namespace vclcanvas geometry::IntegerSize2D CanvasHelper::getSize() { - if( !mpOutDevProvider.get() ) + if( !mpOutDevProvider ) return geometry::IntegerSize2D(); // we're disposed return vcl::unotools::integerSize2DFromSize( mpOutDevProvider->getOutDev().GetOutputSizePixel() ); @@ -876,7 +876,7 @@ namespace vclcanvas uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize, bool beFast ) { - if( !mpOutDevProvider.get() || !mpDevice ) + if( !mpOutDevProvider || !mpDevice ) return uno::Reference< rendering::XBitmap >(); // we're disposed OutputDevice& rOutDev( mpOutDevProvider->getOutDev() ); @@ -901,7 +901,7 @@ namespace vclcanvas uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout& rLayout, const geometry::IntegerRectangle2D& rect ) { - if( !mpOutDevProvider.get() ) + if( !mpOutDevProvider ) return uno::Sequence< sal_Int8 >(); // we're disposed rLayout = getMemoryLayout(); @@ -951,7 +951,7 @@ namespace vclcanvas uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout& rLayout, const geometry::IntegerPoint2D& pos ) { - if( !mpOutDevProvider.get() ) + if( !mpOutDevProvider ) return uno::Sequence< sal_Int8 >(); // we're disposed rLayout = getMemoryLayout(); @@ -980,7 +980,7 @@ namespace vclcanvas rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout() { - if( !mpOutDevProvider.get() ) + if( !mpOutDevProvider ) return rendering::IntegerBitmapLayout(); // we're disposed rendering::IntegerBitmapLayout aBitmapLayout( ::canvas::tools::getStdMemoryLayout(getSize()) ); diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 646cef28aac6..9cb8dd8abd99 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -608,7 +608,7 @@ namespace vclcanvas // TODO(E1): Return value // TODO(F1): FillRule gradientFill( mpOutDevProvider->getOutDev(), - mp2ndOutDevProvider.get() ? &mp2ndOutDevProvider->getOutDev() : nullptr, + mp2ndOutDevProvider ? &mp2ndOutDevProvider->getOutDev() : nullptr, rValues, aColors, aPolyPoly, diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx index eb4918c68459..f20b052d5534 100644 --- a/canvas/source/vcl/impltools.hxx +++ b/canvas/source/vcl/impltools.hxx @@ -127,7 +127,7 @@ namespace vclcanvas } explicit OutDevStateKeeper( const OutDevProviderSharedPtr& rOutDev ) : - mpOutDev( rOutDev.get() ? &(rOutDev->getOutDev()) : nullptr ), + mpOutDev( rOutDev ? &(rOutDev->getOutDev()) : nullptr ), mbMappingWasEnabled( mpOutDev && mpOutDev->IsMapModeEnabled() ), mnAntiAliasing( mpOutDev ? mpOutDev->GetAntialiasing() : AntialiasingFlags::NONE ) { |