diff --git a/Userland/Libraries/LibGUI/Menubar.cpp b/Userland/Libraries/LibGUI/Menubar.cpp index 61d75cd887..6399d1cf90 100644 --- a/Userland/Libraries/LibGUI/Menubar.cpp +++ b/Userland/Libraries/LibGUI/Menubar.cpp @@ -16,16 +16,16 @@ ErrorOr Menubar::try_add_menu(Badge, NonnullRefPtr menu) return {}; } -ErrorOr> Menubar::try_add_menu(Badge, DeprecatedString name) +ErrorOr> Menubar::try_add_menu(Badge, String name) { - auto menu = TRY(try_add(TRY(String::from_deprecated_string(name)))); + auto menu = TRY(try_add(move(name))); TRY(m_menus.try_append(menu)); return menu; } -Menu& Menubar::add_menu(Badge, DeprecatedString name) +Menu& Menubar::add_menu(Badge, String name) { - auto& menu = add(String::from_deprecated_string(name).release_value_but_fixme_should_propagate_errors()); + auto& menu = add(move(name)); m_menus.append(menu); return menu; } diff --git a/Userland/Libraries/LibGUI/Menubar.h b/Userland/Libraries/LibGUI/Menubar.h index cf899ea8df..cd1baddf43 100644 --- a/Userland/Libraries/LibGUI/Menubar.h +++ b/Userland/Libraries/LibGUI/Menubar.h @@ -23,8 +23,8 @@ public: virtual ~Menubar() override = default; ErrorOr try_add_menu(Badge, NonnullRefPtr); - ErrorOr> try_add_menu(Badge, DeprecatedString name); - Menu& add_menu(Badge, DeprecatedString name); + ErrorOr> try_add_menu(Badge, String name); + Menu& add_menu(Badge, String name); void for_each_menu(Function); diff --git a/Userland/Libraries/LibGUI/Window.cpp b/Userland/Libraries/LibGUI/Window.cpp index 043115666c..fee0a09cd2 100644 --- a/Userland/Libraries/LibGUI/Window.cpp +++ b/Userland/Libraries/LibGUI/Window.cpp @@ -1326,7 +1326,7 @@ ErrorOr Window::try_add_menu(NonnullRefPtr menu) ErrorOr> Window::try_add_menu(DeprecatedString name) { - auto menu = TRY(m_menubar->try_add_menu({}, move(name))); + auto menu = TRY(m_menubar->try_add_menu({}, TRY(String::from_deprecated_string(name)))); if (m_window_id) { menu->realize_menu_if_needed(); ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());