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

LibGUI+Userland: Make Window::*add_menu take name using new string

Browse source
This commit is contained in:
Karol Kosek 2023-04-16 11:56:01 +02:00 • committed by Andreas Kling
parent 60a338758c
commit 969543a847
52 changed files with 162 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1324,9 +1324,9 @@ ErrorOr<void> Window::try_add_menu(NonnullRefPtr<Menu> menu)
return {};
}
ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(DeprecatedString name)
ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(String name)
{
auto menu = TRY(m_menubar->try_add_menu({}, TRY(String::from_deprecated_string(name))));
auto menu = TRY(m_menubar->try_add_menu({}, move(name)));
if (m_window_id) {
menu->realize_menu_if_needed();
ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());
@ -1334,7 +1334,7 @@ ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(DeprecatedString name)
return menu;
}
Menu& Window::add_menu(DeprecatedString name)
Menu& Window::add_menu(String name)
{
auto menu = MUST(try_add_menu(move(name)));
return *menu;