diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-04-12 12:48:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-04-12 13:57:13 +0200 |
| commit | 6629bdff20602935f042838ede5e8986a120b5f0 (patch) | |
| tree | 6581d602b78812dbf1562de0953079ec3008f352 | |
| parent | 00a9b9bcd12bacafa2d81a11233b9c88669da6f1 (diff) | |
use more unique_ptr in ImplSVWinData
Change-Id: Id1d42e2de480e8ec248e5716ababc8bddfc905ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150276
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 0a34fb2f4234..6d1d8adac015 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -258,7 +258,7 @@ struct ImplSVWinData std::vector<VclPtr<Dialog>> mpExecuteDialogs; ///< Stack of dialogs that are Execute()'d - the last one is the top most one. VclPtr<vcl::Window> mpExtTextInputWin; // Window, which is in ExtTextInput VclPtr<vcl::Window> mpTrackWin; // window, that is in tracking mode - AutoTimer* mpTrackTimer = nullptr; // tracking timer + std::unique_ptr<AutoTimer> mpTrackTimer; // tracking timer std::vector<Image> maMsgBoxImgList; // ImageList for MessageBox VclPtr<vcl::Window> mpAutoScrollWin; // window, that is in AutoScrollMode mode VclPtr<vcl::Window> mpLastWheelWindow; // window, that last received a mouse wheel event diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 6a6f20dab5a7..46d8bd7f8881 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -268,7 +268,7 @@ void Window::StartTracking( StartTrackingFlags nFlags ) if ( !mpWindowImpl->mbUseFrameData && (nFlags & (StartTrackingFlags::ScrollRepeat | StartTrackingFlags::ButtonRepeat)) ) { - pSVData->mpWinData->mpTrackTimer = new AutoTimer("vcl::Window pSVData->mpWinData->mpTrackTimer"); + pSVData->mpWinData->mpTrackTimer.reset(new AutoTimer("vcl::Window pSVData->mpWinData->mpTrackTimer")); if ( nFlags & StartTrackingFlags::ScrollRepeat ) pSVData->mpWinData->mpTrackTimer->SetTimeout( MouseSettings::GetScrollRepeat() ); @@ -304,10 +304,7 @@ void Window::EndTracking( TrackingEventFlags nFlags ) return; if ( !mpWindowImpl->mbUseFrameData && pSVData->mpWinData->mpTrackTimer ) - { - delete pSVData->mpWinData->mpTrackTimer; - pSVData->mpWinData->mpTrackTimer = nullptr; - } + pSVData->mpWinData->mpTrackTimer.reset(); mpWindowImpl->mpFrameData->mpTrackWin = pSVData->mpWinData->mpTrackWin = nullptr; pSVData->mpWinData->mnTrackFlags = StartTrackingFlags::NONE; |