diff --git a/Userland/Applications/Magnifier/main.cpp b/Userland/Applications/Magnifier/main.cpp index ecd056bb1d..c9678863b5 100644 --- a/Userland/Applications/Magnifier/main.cpp +++ b/Userland/Applications/Magnifier/main.cpp @@ -170,7 +170,7 @@ ErrorOr serenity_main(Main::Arguments arguments) timeline_menu->add_action(previous_frame_action); timeline_menu->add_action(next_frame_action); - TRY(window->try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(magnifier)))); + TRY(window->try_add_menu(GUI::CommonMenus::make_accessibility_menu(magnifier))); auto help_menu = TRY(window->try_add_menu("&Help"_string)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp index dc3eba4a28..78c0e8c6d1 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -305,7 +305,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) GUI::Application::the()->quit(); })); - TRY(window.try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(*m_preview_widget)))); + TRY(window.try_add_menu(GUI::CommonMenus::make_accessibility_menu(*m_preview_widget))); auto help_menu = TRY(window.try_add_menu("&Help"_string)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(&window)); diff --git a/Userland/Libraries/LibGUI/CommonMenus.cpp b/Userland/Libraries/LibGUI/CommonMenus.cpp index 424c40ecbd..d3ef2c43e3 100644 --- a/Userland/Libraries/LibGUI/CommonMenus.cpp +++ b/Userland/Libraries/LibGUI/CommonMenus.cpp @@ -14,39 +14,39 @@ namespace GUI { namespace CommonMenus { -ErrorOr> make_accessibility_menu(ColorFilterer& filterer) +NonnullRefPtr make_accessibility_menu(ColorFilterer& filterer) { - auto default_accessibility_action = TRY(Action::try_create_checkable("Unimpaired", { Mod_AltGr, Key_1 }, [&](auto&) { + auto default_accessibility_action = Action::create_checkable("Unimpaired", { Mod_AltGr, Key_1 }, [&](auto&) { filterer.set_color_filter(nullptr); - })); - auto pratanopia_accessibility_action = TRY(Action::try_create_checkable("Protanopia", { Mod_AltGr, Key_2 }, [&](auto&) { + }); + auto pratanopia_accessibility_action = Action::create_checkable("Protanopia", { Mod_AltGr, Key_2 }, [&](auto&) { filterer.set_color_filter(Gfx::ColorBlindnessFilter::create_protanopia()); - })); - auto pratanomaly_accessibility_action = TRY(Action::try_create_checkable("Protanomaly", { Mod_AltGr, Key_3 }, [&](auto&) { + }); + auto pratanomaly_accessibility_action = Action::create_checkable("Protanomaly", { Mod_AltGr, Key_3 }, [&](auto&) { filterer.set_color_filter(Gfx::ColorBlindnessFilter::create_protanomaly()); - })); - auto tritanopia_accessibility_action = TRY(Action::try_create_checkable("Tritanopia", { Mod_AltGr, Key_4 }, [&](auto&) { + }); + auto tritanopia_accessibility_action = Action::create_checkable("Tritanopia", { Mod_AltGr, Key_4 }, [&](auto&) { filterer.set_color_filter(Gfx::ColorBlindnessFilter::create_tritanopia()); - })); - auto tritanomaly_accessibility_action = TRY(Action::try_create_checkable("Tritanomaly", { Mod_AltGr, Key_5 }, [&](auto&) { + }); + auto tritanomaly_accessibility_action = Action::create_checkable("Tritanomaly", { Mod_AltGr, Key_5 }, [&](auto&) { filterer.set_color_filter(Gfx::ColorBlindnessFilter::create_tritanomaly()); - })); - auto deuteranopia_accessibility_action = TRY(Action::try_create_checkable("Deuteranopia", { Mod_AltGr, Key_6 }, [&](auto&) { + }); + auto deuteranopia_accessibility_action = Action::create_checkable("Deuteranopia", { Mod_AltGr, Key_6 }, [&](auto&) { filterer.set_color_filter(Gfx::ColorBlindnessFilter::create_deuteranopia()); - })); - auto deuteranomaly_accessibility_action = TRY(Action::try_create_checkable("Deuteranomaly", { Mod_AltGr, Key_7 }, [&](auto&) { + }); + auto deuteranomaly_accessibility_action = Action::create_checkable("Deuteranomaly", { Mod_AltGr, Key_7 }, [&](auto&) { filterer.set_color_filter(Gfx::ColorBlindnessFilter::create_deuteranomaly()); - })); - auto achromatopsia_accessibility_action = TRY(Action::try_create_checkable("Achromatopsia", { Mod_AltGr, Key_8 }, [&](auto&) { + }); + auto achromatopsia_accessibility_action = Action::create_checkable("Achromatopsia", { Mod_AltGr, Key_8 }, [&](auto&) { filterer.set_color_filter(Gfx::ColorBlindnessFilter::create_achromatopsia()); - })); - auto achromatomaly_accessibility_action = TRY(Action::try_create_checkable("Achromatomaly", { Mod_AltGr, Key_9 }, [&](auto&) { + }); + auto achromatomaly_accessibility_action = Action::create_checkable("Achromatomaly", { Mod_AltGr, Key_9 }, [&](auto&) { filterer.set_color_filter(Gfx::ColorBlindnessFilter::create_achromatomaly()); - })); + }); default_accessibility_action->set_checked(true); - auto group = TRY(try_make()); + auto group = make(); group->set_exclusive(true); group->add_action(*default_accessibility_action); group->add_action(*pratanopia_accessibility_action); @@ -59,7 +59,7 @@ ErrorOr> make_accessibility_menu(ColorFilterer& filterer) group->add_action(*achromatomaly_accessibility_action); (void)group.leak_ptr(); - auto menu = TRY(Menu::try_create("&Accessibility"_string)); + auto menu = Menu::construct("&Accessibility"_string); menu->add_action(default_accessibility_action); menu->add_action(pratanopia_accessibility_action); menu->add_action(pratanomaly_accessibility_action); diff --git a/Userland/Libraries/LibGUI/Menu.h b/Userland/Libraries/LibGUI/Menu.h index 684396763c..77c1d2d8db 100644 --- a/Userland/Libraries/LibGUI/Menu.h +++ b/Userland/Libraries/LibGUI/Menu.h @@ -19,7 +19,7 @@ namespace GUI { namespace CommonMenus { -ErrorOr> make_accessibility_menu(GUI::ColorFilterer&); +[[nodiscard]] NonnullRefPtr make_accessibility_menu(GUI::ColorFilterer&); };