diff --git a/Userland/Applications/About/main.cpp b/Userland/Applications/About/main.cpp index a44900f1e2..64e51b162f 100644 --- a/Userland/Applications/About/main.cpp +++ b/Userland/Applications/About/main.cpp @@ -21,6 +21,6 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(Core::System::unveil(nullptr, nullptr)); auto app_icon = TRY(GUI::Icon::try_create_default_icon("ladyball"sv)); - TRY(GUI::AboutDialog::show("SerenityOS"_string, TRY(Core::Version::read_long_version_string()), app_icon.bitmap_for_size(32), nullptr, app_icon.bitmap_for_size(16))); + GUI::AboutDialog::show("SerenityOS"_string, TRY(Core::Version::read_long_version_string()), app_icon.bitmap_for_size(32), nullptr, app_icon.bitmap_for_size(16)); return app->exec(); } diff --git a/Userland/Libraries/LibGUI/AboutDialog.cpp b/Userland/Libraries/LibGUI/AboutDialog.cpp index b1e3d31fee..968028fe0f 100644 --- a/Userland/Libraries/LibGUI/AboutDialog.cpp +++ b/Userland/Libraries/LibGUI/AboutDialog.cpp @@ -19,13 +19,13 @@ namespace GUI { -ErrorOr> AboutDialog::try_create(String name, String version, RefPtr icon, Window* parent_window) +NonnullRefPtr AboutDialog::create(String name, String version, RefPtr icon, Window* parent_window) { - auto dialog = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) AboutDialog(name, version, icon, parent_window))); + auto dialog = adopt_ref(*new AboutDialog(name, version, icon, parent_window)); dialog->set_title(DeprecatedString::formatted("About {}", name)); - auto widget = TRY(dialog->set_main_widget()); - TRY(widget->load_from_gml(about_dialog_gml)); + auto widget = MUST(dialog->set_main_widget()); + MUST(widget->load_from_gml(about_dialog_gml)); auto icon_wrapper = widget->find_descendant_of_type_named("icon_wrapper"); if (icon) { @@ -62,13 +62,12 @@ AboutDialog::AboutDialog(String name, String version, RefPtr set_icon(parent_window->icon()); } -ErrorOr AboutDialog::show(String name, String version, RefPtr icon, Window* parent_window, RefPtr window_icon) +void AboutDialog::show(String name, String version, RefPtr icon, Window* parent_window, RefPtr window_icon) { - auto dialog = TRY(AboutDialog::try_create(move(name), move(version), move(icon), parent_window)); + auto dialog = AboutDialog::create(move(name), move(version), move(icon), parent_window); if (window_icon) dialog->set_icon(window_icon); dialog->exec(); - return {}; } } diff --git a/Userland/Libraries/LibGUI/AboutDialog.h b/Userland/Libraries/LibGUI/AboutDialog.h index 13949c6a9b..219004d089 100644 --- a/Userland/Libraries/LibGUI/AboutDialog.h +++ b/Userland/Libraries/LibGUI/AboutDialog.h @@ -16,10 +16,10 @@ namespace GUI { class AboutDialog final : public Dialog { C_OBJECT_ABSTRACT(AboutDialog) public: - static ErrorOr> try_create(String name, String version, RefPtr icon = nullptr, Window* parent_window = nullptr); + [[nodiscard]] static NonnullRefPtr create(String name, String version, RefPtr icon = nullptr, Window* parent_window = nullptr); virtual ~AboutDialog() override = default; - static ErrorOr show(String name, String version, RefPtr icon = nullptr, Window* parent_window = nullptr, RefPtr window_icon = nullptr); + static void show(String name, String version, RefPtr icon = nullptr, Window* parent_window = nullptr, RefPtr window_icon = nullptr); private: AboutDialog(String name, String version, RefPtr icon = nullptr, Window* parent_window = nullptr); diff --git a/Userland/Libraries/LibGUI/CommonActions.cpp b/Userland/Libraries/LibGUI/CommonActions.cpp index 6e6b8956fb..5177276d27 100644 --- a/Userland/Libraries/LibGUI/CommonActions.cpp +++ b/Userland/Libraries/LibGUI/CommonActions.cpp @@ -25,8 +25,7 @@ NonnullRefPtr make_about_action(DeprecatedString const& app_name, Icon c String::from_deprecated_string(app_name).release_value_but_fixme_should_propagate_errors(), Core::Version::read_long_version_string().release_value_but_fixme_should_propagate_errors(), app_icon.bitmap_for_size(32), - weak_parent) - .release_value_but_fixme_should_propagate_errors(); + weak_parent); }); action->set_status_tip("Show application about box"_string); return action;