diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-08 14:41:16 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-09 13:12:47 +0200 |
commit | 7d521a85858bacdb7b5db359036ccf6f01b709c3 (patch) | |
tree | ee359fd27d55a0916e18e504d925949aa5b2a378 /vcl/qt5/Qt5Instance.cxx | |
parent | b7abdafcfc42722ab060529864a2109d1e4198c0 (diff) |
hold and return SalMenu by std::unique_ptr
and drop DestroyMenu, all the implementations just delete the object
Change-Id: I673997ea1a9c5216b100cafdc70a8f697732769b
Reviewed-on: https://gerrit.libreoffice.org/55501
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/qt5/Qt5Instance.cxx')
-rw-r--r-- | vcl/qt5/Qt5Instance.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx index 705137c16c50..6bc3694883b3 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/Qt5Instance.cxx @@ -111,15 +111,13 @@ Qt5Instance::CreateVirtualDevice(SalGraphics* pGraphics, long& nDX, long& nDY, D } } -SalMenu* Qt5Instance::CreateMenu(bool bMenuBar, Menu* pVCLMenu) +std::unique_ptr<SalMenu> Qt5Instance::CreateMenu(bool bMenuBar, Menu* pVCLMenu) { Qt5Menu* pSalMenu = new Qt5Menu(bMenuBar); pSalMenu->SetMenu(pVCLMenu); - return pSalMenu; + return std::unique_ptr<SalMenu>(pSalMenu); } -void Qt5Instance::DestroyMenu(SalMenu* pMenu) { delete pMenu; } - std::unique_ptr<SalMenuItem> Qt5Instance::CreateMenuItem(const SalItemParams& rItemData) { return std::unique_ptr<SalMenuItem>(new Qt5MenuItem(&rItemData)); |