diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-16 15:23:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-17 08:25:47 +0200 |
commit | ccb2a1f650bc505f8a4f1abebf8ce4f9396562a8 (patch) | |
tree | 2ee2fd4f300ae95cf23bade1f242e02f9b276c07 /vcl | |
parent | da5c3a1ee43dd1a07cbd1b8005488bf05432593d (diff) |
clang-tidy readability-redundant-smartptr-get
redundant get() call on smart pointer
Change-Id: Icb5a03bbc15e79a30d3d135a507d22914d15c2bd
Reviewed-on: https://gerrit.libreoffice.org/61837
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/opengl/PackedTextureAtlas.cxx | 6 | ||||
-rw-r--r-- | vcl/opengl/salbmp.cxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/jpegc.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 3 | ||||
-rw-r--r-- | vcl/source/graphic/UnoGraphicObject.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi2.cxx | 8 |
8 files changed, 16 insertions, 19 deletions
diff --git a/vcl/opengl/PackedTextureAtlas.cxx b/vcl/opengl/PackedTextureAtlas.cxx index 98cffcd78b37..0e3bdc5f1d5c 100644 --- a/vcl/opengl/PackedTextureAtlas.cxx +++ b/vcl/opengl/PackedTextureAtlas.cxx @@ -46,11 +46,7 @@ Node::Node(tools::Rectangle const & aRectangle) , mOccupied(false) {} -bool Node::isLeaf() -{ - return mLeftNode.get() == nullptr && - mRightNode.get() == nullptr; -} +bool Node::isLeaf() { return mLeftNode == nullptr && mRightNode == nullptr; } Node* Node::insert(int nWidth, int nHeight, int nPadding) { diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index 5c35e8e41265..8a07f5ceb4a5 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -302,7 +302,7 @@ bool OpenGLSalBitmap::AllocateUserData() } #endif - return mpUserBuffer.get() != nullptr; + return mpUserBuffer != nullptr; } namespace { @@ -486,7 +486,7 @@ GLuint OpenGLSalBitmap::CreateTexture() sal_uInt8* pData( nullptr ); bool bAllocated( false ); - if (mpUserBuffer.get() != nullptr) + if (mpUserBuffer != nullptr) { if( mnBits == 16 || mnBits == 24 || mnBits == 32 ) { diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index ab56a35c0de7..7c1192eda24b 100644 --- a/vcl/source/filter/jpeg/jpegc.cxx +++ b/vcl/source/filter/jpeg/jpegc.cxx @@ -245,7 +245,7 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS else rContext.pScopedAccess.reset(new BitmapScopedWriteAccess(pJPEGReader->GetBitmap())); - BitmapScopedWriteAccess& pAccess = bUseExistingBitmap ? *ppAccess : *rContext.pScopedAccess.get(); + BitmapScopedWriteAccess& pAccess = bUseExistingBitmap ? *ppAccess : *rContext.pScopedAccess; if (pAccess) { diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index ed683138b9de..e92c06b4573a 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -46,7 +46,8 @@ GfxLink::GfxLink(std::unique_ptr<sal_uInt8[]> pBuf, sal_uInt32 nSize, GfxLinkTyp , mbPrefMapModeValid(false) , mbPrefSizeValid(false) { - SAL_WARN_IF(mpSwapInData.get() == nullptr || mnSwapInDataSize <= 0, "vcl", "GfxLink::GfxLink(): empty/NULL buffer given"); + SAL_WARN_IF(mpSwapInData == nullptr || mnSwapInDataSize <= 0, "vcl", + "GfxLink::GfxLink(): empty/NULL buffer given"); } bool GfxLink::operator==( const GfxLink& rGfxLink ) const diff --git a/vcl/source/graphic/UnoGraphicObject.cxx b/vcl/source/graphic/UnoGraphicObject.cxx index 81a9d83edf8c..fa03a52813bc 100644 --- a/vcl/source/graphic/UnoGraphicObject.cxx +++ b/vcl/source/graphic/UnoGraphicObject.cxx @@ -74,7 +74,7 @@ uno::Reference<graphic::XGraphic> SAL_CALL GraphicObjectImpl::getGraphic() { osl::MutexGuard aGuard(m_aMutex); - if (!mpGraphicObject.get()) + if (!mpGraphicObject) throw uno::RuntimeException(); return mpGraphicObject->GetGraphic().GetXGraphic(); } @@ -83,7 +83,7 @@ void SAL_CALL GraphicObjectImpl::setGraphic(uno::Reference<graphic::XGraphic> co { osl::MutexGuard aGuard(m_aMutex); - if (!mpGraphicObject.get()) + if (!mpGraphicObject) throw uno::RuntimeException(); Graphic aGraphic(rxGraphic); mpGraphicObject->SetGraphic(aGraphic); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 3c1c0aac5f27..247a465f23b7 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3181,7 +3181,7 @@ LOKWindowsMap& GetLOKWindowsMap() if (!s_pLOKWindowsMap) s_pLOKWindowsMap.reset(new LOKWindowsMap); - return *s_pLOKWindowsMap.get(); + return *s_pLOKWindowsMap; } } diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index 56d2a2217ea9..0855ebd117ea 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -65,12 +65,12 @@ X11Clipboard::create( SelectionManager& rManager, Atom aSelection ) rtl::Reference<X11Clipboard> cb(new X11Clipboard(rManager, aSelection)); if( aSelection != None ) { - rManager.registerHandler( aSelection, *cb.get() ); + rManager.registerHandler(aSelection, *cb); } else { - rManager.registerHandler( XA_PRIMARY, *cb.get() ); - rManager.registerHandler( rManager.getAtom( "CLIPBOARD" ), *cb.get() ); + rManager.registerHandler(XA_PRIMARY, *cb); + rManager.registerHandler(rManager.getAtom("CLIPBOARD"), *cb); } return cb.get(); } diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index ef0a422f19b2..ae6b0c152c42 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -80,21 +80,21 @@ void X11SalGraphics::CopyScreenArea( Display* pDisplay, void X11SalGraphics::FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY ) { - X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl.get()); + X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl); rImpl.FillPixmapFromScreen( pPixmap, nX, nY ); } bool X11SalGraphics::RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY ) { SAL_INFO( "vcl", "RenderPixmapToScreen" ); - X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl.get()); + X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl); return rImpl.RenderPixmapToScreen( pPixmap, pMask, nX, nY ); } bool X11SalGraphics::TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY) { SAL_INFO( "vcl", "TryRenderCachedNativeControl" ); - X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl.get()); + X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl); return rImpl.TryRenderCachedNativeControl(rControlCacheKey, nX, nY); } @@ -102,7 +102,7 @@ bool X11SalGraphics::RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* ControlCacheKey& rControlCacheKey) { SAL_INFO( "vcl", "RenderAndCachePixmap" ); - X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl.get()); + X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl); return rImpl.RenderAndCacheNativeControl(pPixmap, pMask, nX, nY, rControlCacheKey); } |