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

loplugin:useuniqueptr in DockingWindow

Change-Id: I7a0fec27f50c58f02378a69db5d17c6f5eb62ee2
Reviewed-on: https://gerrit.libreoffice.org/53222Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst fefca920
...@@ -214,7 +214,7 @@ class VCL_DLLPUBLIC DockingWindow ...@@ -214,7 +214,7 @@ class VCL_DLLPUBLIC DockingWindow
private: private:
VclPtr<FloatingWindow> mpFloatWin; VclPtr<FloatingWindow> mpFloatWin;
VclPtr<vcl::Window> mpOldBorderWin; VclPtr<vcl::Window> mpOldBorderWin;
ImplData* mpImplData; std::unique_ptr<ImplData> mpImplData;
Point maFloatPos; Point maFloatPos;
Point maDockPos; Point maDockPos;
Point maMouseOff; Point maMouseOff;
......
...@@ -277,7 +277,7 @@ void DockingWindow::ImplInitDockingWindowData() ...@@ -277,7 +277,7 @@ void DockingWindow::ImplInitDockingWindowData()
mpWindowImpl->mbDockWin = true; mpWindowImpl->mbDockWin = true;
mpFloatWin = nullptr; mpFloatWin = nullptr;
mpOldBorderWin = nullptr; mpOldBorderWin = nullptr;
mpImplData = new ImplData; mpImplData.reset(new ImplData);
mnTrackX = 0; mnTrackX = 0;
mnTrackY = 0; mnTrackY = 0;
mnTrackWidth = 0; mnTrackWidth = 0;
...@@ -391,8 +391,7 @@ void DockingWindow::dispose() ...@@ -391,8 +391,7 @@ void DockingWindow::dispose()
Show( false, ShowFlags::NoFocusChange ); Show( false, ShowFlags::NoFocusChange );
SetFloatingMode(false); SetFloatingMode(false);
} }
delete mpImplData; mpImplData.reset();
mpImplData = nullptr;
mpFloatWin.clear(); mpFloatWin.clear();
mpOldBorderWin.clear(); mpOldBorderWin.clear();
mpDialogParent.clear(); mpDialogParent.clear();
......
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