summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-10-07 15:45:13 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-08 08:26:23 +0200
commit231e16d9091c2d318d99c2f2eb985311e7138127 (patch)
tree7b8d30778cdb696cdf4c0ec80a58f6b488e4d5e5 /vcl/source
parente47172ce2ac486b909ee8f46380dca8efedb6a24 (diff)
loplugin:redundantpointerops simplify *p.get()
Change-Id: I12517651fb3f777fd08e384992bb3e84b340ad85 Reviewed-on: https://gerrit.libreoffice.org/80382 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/edit/textdoc.hxx4
-rw-r--r--vcl/source/image/ImplImageTree.cxx4
-rw-r--r--vcl/source/window/brdwin.cxx2
-rw-r--r--vcl/source/window/paint.cxx8
4 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index 4bd67fc5e25d..11657463e82a 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -42,8 +42,8 @@ public:
void Clear();
sal_uInt16 Count() const { return maAttribs.size(); }
- const TextCharAttrib& GetAttrib( sal_uInt16 n ) const { return *maAttribs[n].get(); }
- TextCharAttrib& GetAttrib( sal_uInt16 n ) { return *maAttribs[n].get(); }
+ const TextCharAttrib& GetAttrib( sal_uInt16 n ) const { return *maAttribs[n]; }
+ TextCharAttrib& GetAttrib( sal_uInt16 n ) { return *maAttribs[n]; }
std::unique_ptr<TextCharAttrib> RemoveAttrib( sal_uInt16 n )
{
std::unique_ptr<TextCharAttrib> pReleased = std::move(maAttribs[n]);
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 5c1fb72ddc9e..21901a9b940e 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -518,9 +518,9 @@ ImplImageTree::IconCache &ImplImageTree::getIconCache(const ImageRequestParamete
IconSet &rSet = getCurrentIconSet();
auto it = rSet.maScaledIconCaches.find(rParameters.mnScalePercentage);
if ( it != rSet.maScaledIconCaches.end() )
- return *it->second.get();
+ return *it->second;
rSet.maScaledIconCaches[rParameters.mnScalePercentage] = std::make_unique<IconCache>();
- return *rSet.maScaledIconCaches[rParameters.mnScalePercentage].get();
+ return *rSet.maScaledIconCaches[rParameters.mnScalePercentage];
}
bool ImplImageTree::iconCacheLookup(ImageRequestParameters& rParameters)
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 2717803978df..1b436b544700 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -150,7 +150,7 @@ void ImplBorderWindowView::ImplInitTitle(ImplBorderFrameData* pData)
{
const StyleSettings& rStyleSettings = pData->mpOutDev->GetSettings().GetStyleSettings();
if (pData->mnTitleType == BorderWindowTitleType::Tearoff)
- pData->mnTitleHeight = ToolBox::ImplGetDragWidth(*pData->mpBorderWindow.get(), false) + 2;
+ pData->mnTitleHeight = ToolBox::ImplGetDragWidth(*pData->mpBorderWindow, false) + 2;
else
{
if (pData->mnTitleType == BorderWindowTitleType::Small)
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 85c182ab58e4..377d7d46d37a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -128,7 +128,7 @@ PaintBufferGuard::~PaintBufferGuard()
aPaintRectSize = m_pWindow->PixelToLogic(aRectanglePixel.GetSize());
}
- m_pWindow->DrawOutDev(m_aPaintRect.TopLeft(), aPaintRectSize, m_aPaintRect.TopLeft(), aPaintRectSize, *mpFrameData->mpBuffer.get());
+ m_pWindow->DrawOutDev(m_aPaintRect.TopLeft(), aPaintRectSize, m_aPaintRect.TopLeft(), aPaintRectSize, *mpFrameData->mpBuffer);
}
}
@@ -287,10 +287,10 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
{
// double-buffering
PaintBufferGuard g(pFrameData, m_pWindow);
- m_pWindow->ApplySettings(*pFrameData->mpBuffer.get());
+ m_pWindow->ApplySettings(*pFrameData->mpBuffer);
- m_pWindow->PushPaintHelper(this, *pFrameData->mpBuffer.get());
- m_pWindow->Paint(*pFrameData->mpBuffer.get(), m_aPaintRect);
+ m_pWindow->PushPaintHelper(this, *pFrameData->mpBuffer);
+ m_pWindow->Paint(*pFrameData->mpBuffer, m_aPaintRect);
pFrameData->maBufferedRect.Union(m_aPaintRect);
}
else