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/Applications/Run | |
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/Applications/Run')
-rw-r--r-- | Userland/Applications/Run/RunWindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Userland/Applications/Run/RunWindow.cpp b/Userland/Applications/Run/RunWindow.cpp index 11b6f9231e..b29f736630 100644 --- a/Userland/Applications/Run/RunWindow.cpp +++ b/Userland/Applications/Run/RunWindow.cpp @@ -41,24 +41,24 @@ RunWindow::RunWindow() set_resizable(false); set_minimizable(false); - auto& main_widget = set_main_widget<GUI::Widget>(); - main_widget.load_from_gml(run_gml); + auto main_widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors(); + main_widget->load_from_gml(run_gml); - m_icon_image_widget = *main_widget.find_descendant_of_type_named<GUI::ImageWidget>("icon"); + m_icon_image_widget = *main_widget->find_descendant_of_type_named<GUI::ImageWidget>("icon"); m_icon_image_widget->set_bitmap(app_icon.bitmap_for_size(32)); - m_path_combo_box = *main_widget.find_descendant_of_type_named<GUI::ComboBox>("path"); + m_path_combo_box = *main_widget->find_descendant_of_type_named<GUI::ComboBox>("path"); m_path_combo_box->set_model(m_path_history_model); if (!m_path_history.is_empty()) m_path_combo_box->set_selected_index(0); - m_ok_button = *main_widget.find_descendant_of_type_named<GUI::DialogButton>("ok_button"); + m_ok_button = *main_widget->find_descendant_of_type_named<GUI::DialogButton>("ok_button"); m_ok_button->on_click = [this](auto) { do_run(); }; m_ok_button->set_default(true); - m_cancel_button = *main_widget.find_descendant_of_type_named<GUI::DialogButton>("cancel_button"); + m_cancel_button = *main_widget->find_descendant_of_type_named<GUI::DialogButton>("cancel_button"); m_cancel_button->on_click = [this](auto) { close(); }; |