diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-16 08:28:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-23 08:13:51 +0200 |
| commit | cd0a8777019391f515f4bfe6b77ad70fdfeca664 (patch) | |
| tree | 2a4731ba919ece2cb38bc40760e242a1faf053f2 | |
| parent | fefca920f474b2eaff93db18169a208a74262f2b (diff) | |
loplugin:useuniqueptr in DockingWindow
Change-Id: I7a0fec27f50c58f02378a69db5d17c6f5eb62ee2
Reviewed-on: https://gerrit.libreoffice.org/53222
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/vcl/dockwin.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index d3d792d476a3..905500e8e908 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -214,7 +214,7 @@ class VCL_DLLPUBLIC DockingWindow private: VclPtr<FloatingWindow> mpFloatWin; VclPtr<vcl::Window> mpOldBorderWin; - ImplData* mpImplData; + std::unique_ptr<ImplData> mpImplData; Point maFloatPos; Point maDockPos; Point maMouseOff; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index d6892cc42d0f..f76a27bd6a1f 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -277,7 +277,7 @@ void DockingWindow::ImplInitDockingWindowData() mpWindowImpl->mbDockWin = true; mpFloatWin = nullptr; mpOldBorderWin = nullptr; - mpImplData = new ImplData; + mpImplData.reset(new ImplData); mnTrackX = 0; mnTrackY = 0; mnTrackWidth = 0; @@ -391,8 +391,7 @@ void DockingWindow::dispose() Show( false, ShowFlags::NoFocusChange ); SetFloatingMode(false); } - delete mpImplData; - mpImplData = nullptr; + mpImplData.reset(); mpFloatWin.clear(); mpOldBorderWin.clear(); mpDialogParent.clear(); |