From 53008960952ea21a35a41837d4e0904a14f011c5 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Mon, 14 Aug 2023 10:22:49 +0200
Subject: [PATCH] LibGUI: Remove Menubar::try_add_menu()

And fall back to the infallible add_menu().
---
 Documentation/Patterns.md             |  2 +-
 Userland/Libraries/LibGUI/Menubar.cpp | 14 +++-----------
 Userland/Libraries/LibGUI/Menubar.h   |  5 ++---
 Userland/Libraries/LibGUI/Window.cpp  |  4 ++--
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Documentation/Patterns.md b/Documentation/Patterns.md
index cc429952af..2aafb4154f 100644
--- a/Documentation/Patterns.md
+++ b/Documentation/Patterns.md
@@ -27,7 +27,7 @@ Example from LibGUI:
 
 ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(String name)
 {
-    auto menu = TRY(m_menubar->try_add_menu({}, move(name)));
+    auto menu = m_menubar->add_menu({}, move(name));
     if (m_window_id) {
         menu->realize_menu_if_needed();
         ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());
diff --git a/Userland/Libraries/LibGUI/Menubar.cpp b/Userland/Libraries/LibGUI/Menubar.cpp
index 6399d1cf90..74d54a961c 100644
--- a/Userland/Libraries/LibGUI/Menubar.cpp
+++ b/Userland/Libraries/LibGUI/Menubar.cpp
@@ -10,20 +10,12 @@
 
 namespace GUI {
 
-ErrorOr<void> Menubar::try_add_menu(Badge<Window>, NonnullRefPtr<Menu> menu)
+void Menubar::add_menu(Badge<Window>, NonnullRefPtr<Menu> menu)
 {
-    TRY(m_menus.try_append(menu));
-    return {};
+    m_menus.append(menu);
 }
 
-ErrorOr<NonnullRefPtr<Menu>> Menubar::try_add_menu(Badge<Window>, String name)
-{
-    auto menu = TRY(try_add<Menu>(move(name)));
-    TRY(m_menus.try_append(menu));
-    return menu;
-}
-
-Menu& Menubar::add_menu(Badge<Window>, String name)
+NonnullRefPtr<Menu> Menubar::add_menu(Badge<Window>, String name)
 {
     auto& menu = add<Menu>(move(name));
     m_menus.append(menu);
diff --git a/Userland/Libraries/LibGUI/Menubar.h b/Userland/Libraries/LibGUI/Menubar.h
index 14c3abe376..fbaa912116 100644
--- a/Userland/Libraries/LibGUI/Menubar.h
+++ b/Userland/Libraries/LibGUI/Menubar.h
@@ -22,9 +22,8 @@ class Menubar : public Core::EventReceiver {
 public:
     virtual ~Menubar() override = default;
 
-    ErrorOr<void> try_add_menu(Badge<Window>, NonnullRefPtr<Menu>);
-    ErrorOr<NonnullRefPtr<Menu>> try_add_menu(Badge<Window>, String name);
-    Menu& add_menu(Badge<Window>, String name);
+    void add_menu(Badge<Window>, NonnullRefPtr<Menu>);
+    [[nodiscard]] NonnullRefPtr<Menu> add_menu(Badge<Window>, String name);
 
     void for_each_menu(Function<IterationDecision(Menu&)>);
 
diff --git a/Userland/Libraries/LibGUI/Window.cpp b/Userland/Libraries/LibGUI/Window.cpp
index 33995b9356..b270529669 100644
--- a/Userland/Libraries/LibGUI/Window.cpp
+++ b/Userland/Libraries/LibGUI/Window.cpp
@@ -1320,7 +1320,7 @@ Gfx::Bitmap* Window::back_bitmap()
 
 ErrorOr<void> Window::try_add_menu(NonnullRefPtr<Menu> menu)
 {
-    TRY(m_menubar->try_add_menu({}, move(menu)));
+    m_menubar->add_menu({}, move(menu));
     if (m_window_id) {
         menu->realize_menu_if_needed();
         ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());
@@ -1330,7 +1330,7 @@ ErrorOr<void> Window::try_add_menu(NonnullRefPtr<Menu> menu)
 
 ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(String name)
 {
-    auto menu = TRY(m_menubar->try_add_menu({}, move(name)));
+    auto menu = m_menubar->add_menu({}, move(name));
     if (m_window_id) {
         menu->realize_menu_if_needed();
         ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());