RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 19:58:11 +00:00
Code Issues Activity Actions

LibGUI+Userland: Make Menu::*add_submmenu take name using new string

Browse source
This commit is contained in:
Karol Kosek 2023-04-16 12:20:42 +02:00 • committed by Andreas Kling
parent 969543a847
commit 51bd9ca037
18 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibGUI/Menu.cpp
View file

@ -104,12 +104,12 @@ void Menu::set_parent(Menu& menu, int submenu_index)
m_index_in_parent_menu = submenu_index;
}
ErrorOr<NonnullRefPtr<Menu>> Menu::try_add_submenu(DeprecatedString name)
ErrorOr<NonnullRefPtr<Menu>> Menu::try_add_submenu(String name)
{
// NOTE: We grow the vector first, to get allocation failure handled immediately.
TRY(m_items.try_ensure_capacity(m_items.size() + 1));
auto submenu = TRY(Menu::try_create(TRY(String::from_deprecated_string(name))));
auto submenu = TRY(Menu::try_create(move(name)));
auto item = TRY(adopt_nonnull_own_or_enomem(new (nothrow) MenuItem(m_menu_id, submenu)));
submenu->set_parent(*this, m_items.size());
@ -121,7 +121,7 @@ ErrorOr<NonnullRefPtr<Menu>> Menu::try_add_submenu(DeprecatedString name)
return submenu;
}
Menu& Menu::add_submenu(DeprecatedString name)
Menu& Menu::add_submenu(String name)
{
auto menu = MUST(try_add_submenu(move(name)));
return menu;