diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-23 09:06:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-25 09:30:53 +0200 |
| commit | 18c32d5824618e3ac00c4755f380b2b033a96fc9 (patch) | |
| tree | 65d386ba7800e00d70af3ae41fddf37966b6146d | |
| parent | ef46d846fdedd9e94f7150afda810d12acce8c16 (diff) | |
loplugin:useuniqueptr in ScrollBar
Change-Id: I827e997391834d10a617b7c5be8ceafc19e97219
Reviewed-on: https://gerrit.libreoffice.org/53343
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/vcl/scrbar.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/control/scrbar.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index fdacb3ed1059..db4d2ee9273c 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -23,6 +23,7 @@ #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> +#include <memory> class AutoTimer; @@ -47,7 +48,7 @@ private: tools::Rectangle maPage2Rect; tools::Rectangle maThumbRect; tools::Rectangle maTrackRect; - ImplScrollBarData* mpData; + std::unique_ptr<ImplScrollBarData> mpData; long mnStartPos; long mnMouseOff; long mnThumbPixRange; diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index f34201af2a03..4efc0c807061 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -115,7 +115,7 @@ ScrollBar::~ScrollBar() void ScrollBar::dispose() { - delete mpData; mpData = nullptr; + mpData.reset(); Control::dispose(); } @@ -1137,7 +1137,7 @@ void ScrollBar::GetFocus() { if( !mpData ) { - mpData = new ImplScrollBarData; + mpData.reset(new ImplScrollBarData); mpData->maTimer.SetInvokeHandler( LINK( this, ScrollBar, ImplAutoTimerHdl ) ); mpData->maTimer.SetDebugName( "vcl::ScrollBar mpData->maTimer" ); mpData->mbHide = false; |