Kaydet (Commit) 18c32d58 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in ScrollBar

Change-Id: I827e997391834d10a617b7c5be8ceafc19e97219
Reviewed-on: https://gerrit.libreoffice.org/53343Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst ef46d846
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <tools/solar.h> #include <tools/solar.h>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/ctrl.hxx> #include <vcl/ctrl.hxx>
#include <memory>
class AutoTimer; class AutoTimer;
...@@ -47,7 +48,7 @@ private: ...@@ -47,7 +48,7 @@ private:
tools::Rectangle maPage2Rect; tools::Rectangle maPage2Rect;
tools::Rectangle maThumbRect; tools::Rectangle maThumbRect;
tools::Rectangle maTrackRect; tools::Rectangle maTrackRect;
ImplScrollBarData* mpData; std::unique_ptr<ImplScrollBarData> mpData;
long mnStartPos; long mnStartPos;
long mnMouseOff; long mnMouseOff;
long mnThumbPixRange; long mnThumbPixRange;
......
...@@ -115,7 +115,7 @@ ScrollBar::~ScrollBar() ...@@ -115,7 +115,7 @@ ScrollBar::~ScrollBar()
void ScrollBar::dispose() void ScrollBar::dispose()
{ {
delete mpData; mpData = nullptr; mpData.reset();
Control::dispose(); Control::dispose();
} }
...@@ -1137,7 +1137,7 @@ void ScrollBar::GetFocus() ...@@ -1137,7 +1137,7 @@ void ScrollBar::GetFocus()
{ {
if( !mpData ) if( !mpData )
{ {
mpData = new ImplScrollBarData; mpData.reset(new ImplScrollBarData);
mpData->maTimer.SetInvokeHandler( LINK( this, ScrollBar, ImplAutoTimerHdl ) ); mpData->maTimer.SetInvokeHandler( LINK( this, ScrollBar, ImplAutoTimerHdl ) );
mpData->maTimer.SetDebugName( "vcl::ScrollBar mpData->maTimer" ); mpData->maTimer.SetDebugName( "vcl::ScrollBar mpData->maTimer" );
mpData->mbHide = false; mpData->mbHide = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment