mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-09-15 15:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert MenuBaseData pointer to std::unique_ptr

Browse Source
This commit is contained in:
David Capello 2021-06-15 14:35:48 -03:00
parent 1eace24891
commit 37d2b62250
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/menu.cpp
View File

@ -1,5 +1,5 @@
// Aseprite UI Library
// Copyright (C) 2018-2020 Igara Studio S.A.
// Copyright (C) 2018-2021 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello
//
// This file is released under the terms of the MIT license.
@ -186,7 +186,6 @@ MenuBox::MenuBox(WidgetType type)
MenuBox::~MenuBox()
{
stopFilteringMouseDown();
delete m_base;
}
//////////////////////////////////////////////////////////////////////
@ -241,9 +240,8 @@ Menu* MenuBox::getMenu()
MenuBaseData* MenuBox::createBase()
{
delete m_base;
m_base = new MenuBaseData;
return m_base;
m_base.reset(new MenuBaseData);
return m_base.get();
}
Menu* MenuItem::getSubmenu()

6
src/ui/menu.h
View File

@ -1,5 +1,5 @@
// Aseprite UI Library
// Copyright (C) 2020 Igara Studio S.A.
// Copyright (C) 2020-2021 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello
//
// This file is released under the terms of the MIT license.
@ -67,7 +67,7 @@ namespace ui {
void setMenu(Menu* menu);
MenuBaseData* getBase() {
return m_base;
return m_base.get();
}
// Closes all menu-boxes and goes back to the normal state of the
@ -85,7 +85,7 @@ namespace ui {
void startFilteringMouseDown();
void stopFilteringMouseDown();
MenuBaseData* m_base;
std::unique_ptr<MenuBaseData> m_base;
friend class Menu;
friend class MenuItem;