diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2023-01-06 16:48:37 +0000 |
---|---|---|
committer | Andrew Kaster <andrewdkaster@gmail.com> | 2023-01-06 13:36:02 -0700 |
commit | 0c24522635ec7f07e1fb69d9e1cd350d81e2248f (patch) | |
tree | 391782374bada7ee7a986674229551c2ec21f75a /Userland/Games/Hearts | |
parent | d223477bc650e271008ccc339fc1e2c0fcc079e7 (diff) | |
download | serenity-0c24522635ec7f07e1fb69d9e1cd350d81e2248f.zip |
LibGUI+Everywhere: Use fallible Window::set_main_widget() everywhere :^)
Rip that bandaid off!
This does the following, in one big, awkward jump:
- Replace all uses of `set_main_widget<Foo>()` with the `try` version.
- Remove `set_main_widget<Foo>()`.
- Rename the `try` version to just be `set_main_widget` because it's now
the only one.
The majority of places that call `set_main_widget<Foo>()` are inside
constructors, so this unfortunately gives us a big batch of new
`release_value_but_fixme_should_propagate_errors()` calls.
Diffstat (limited to 'Userland/Games/Hearts')
-rw-r--r-- | Userland/Games/Hearts/Game.cpp | 10 | ||||
-rw-r--r-- | Userland/Games/Hearts/SettingsDialog.cpp | 10 | ||||
-rw-r--r-- | Userland/Games/Hearts/main.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Userland/Games/Hearts/Game.cpp b/Userland/Games/Hearts/Game.cpp index c62dc48858..4afcdb770f 100644 --- a/Userland/Games/Hearts/Game.cpp +++ b/Userland/Games/Hearts/Game.cpp @@ -122,16 +122,16 @@ void Game::show_score_card(bool game_over) score_dialog->set_resizable(false); score_dialog->set_icon(window()->icon()); - auto& score_widget = score_dialog->set_main_widget<GUI::Widget>(); - score_widget.set_fill_with_background_color(true); - auto& layout = score_widget.set_layout<GUI::HorizontalBoxLayout>(); + auto score_widget = score_dialog->set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors(); + score_widget->set_fill_with_background_color(true); + auto& layout = score_widget->set_layout<GUI::HorizontalBoxLayout>(); layout.set_margins(10); layout.set_spacing(15); - auto& card_container = score_widget.add<GUI::Widget>(); + auto& card_container = score_widget->add<GUI::Widget>(); auto& score_card = card_container.add<ScoreCard>(m_players, game_over); - auto& button_container = score_widget.add<GUI::Widget>(); + auto& button_container = score_widget->add<GUI::Widget>(); button_container.set_shrink_to_fit(true); button_container.set_layout<GUI::VerticalBoxLayout>(); diff --git a/Userland/Games/Hearts/SettingsDialog.cpp b/Userland/Games/Hearts/SettingsDialog.cpp index f218d9b337..f96482f0cd 100644 --- a/Userland/Games/Hearts/SettingsDialog.cpp +++ b/Userland/Games/Hearts/SettingsDialog.cpp @@ -19,13 +19,13 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name set_icon(parent->icon()); set_resizable(false); - auto& main_widget = set_main_widget<GUI::Widget>(); - main_widget.set_fill_with_background_color(true); + auto main_widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors(); + main_widget->set_fill_with_background_color(true); - auto& layout = main_widget.set_layout<GUI::VerticalBoxLayout>(); + auto& layout = main_widget->set_layout<GUI::VerticalBoxLayout>(); layout.set_margins(4); - auto& name_box = main_widget.add<GUI::Widget>(); + auto& name_box = main_widget->add<GUI::Widget>(); auto& input_layout = name_box.set_layout<GUI::HorizontalBoxLayout>(); input_layout.set_spacing(4); @@ -38,7 +38,7 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name m_player_name = textbox.text(); }; - auto& button_box = main_widget.add<GUI::Widget>(); + auto& button_box = main_widget->add<GUI::Widget>(); auto& button_layout = button_box.set_layout<GUI::HorizontalBoxLayout>(); button_layout.set_spacing(10); diff --git a/Userland/Games/Hearts/main.cpp b/Userland/Games/Hearts/main.cpp index d954994caa..30617193fe 100644 --- a/Userland/Games/Hearts/main.cpp +++ b/Userland/Games/Hearts/main.cpp @@ -50,7 +50,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) auto window = TRY(GUI::Window::try_create()); window->set_title("Hearts"); - auto widget = TRY(window->try_set_main_widget<GUI::Widget>()); + auto widget = TRY(window->set_main_widget<GUI::Widget>()); widget->load_from_gml(hearts_gml); auto& game = *widget->find_descendant_of_type_named<Hearts::Game>("game"); |