summaryrefslogtreecommitdiff
path: root/Userland/Applications/HexEditor
diff options
context:
space:
mode:
authorSam Atkins <atkinssj@serenityos.org>2023-01-06 16:48:37 +0000
committerAndrew Kaster <andrewdkaster@gmail.com>2023-01-06 13:36:02 -0700
commit0c24522635ec7f07e1fb69d9e1cd350d81e2248f (patch)
tree391782374bada7ee7a986674229551c2ec21f75a /Userland/Applications/HexEditor
parentd223477bc650e271008ccc339fc1e2c0fcc079e7 (diff)
downloadserenity-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/HexEditor')
-rw-r--r--Userland/Applications/HexEditor/FindDialog.cpp14
-rw-r--r--Userland/Applications/HexEditor/GoToOffsetDialog.cpp14
-rw-r--r--Userland/Applications/HexEditor/main.cpp2
3 files changed, 15 insertions, 15 deletions
diff --git a/Userland/Applications/HexEditor/FindDialog.cpp b/Userland/Applications/HexEditor/FindDialog.cpp
index 9f2c2472d8..40c7669e76 100644
--- a/Userland/Applications/HexEditor/FindDialog.cpp
+++ b/Userland/Applications/HexEditor/FindDialog.cpp
@@ -99,16 +99,16 @@ FindDialog::FindDialog()
set_resizable(false);
set_title("Find");
- auto& main_widget = set_main_widget<GUI::Widget>();
- if (!main_widget.load_from_gml(find_dialog_gml))
+ auto main_widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors();
+ if (!main_widget->load_from_gml(find_dialog_gml))
VERIFY_NOT_REACHED();
- m_text_editor = *main_widget.find_descendant_of_type_named<GUI::TextBox>("text_editor");
- m_find_button = *main_widget.find_descendant_of_type_named<GUI::Button>("find_button");
- m_find_all_button = *main_widget.find_descendant_of_type_named<GUI::Button>("find_all_button");
- m_cancel_button = *main_widget.find_descendant_of_type_named<GUI::Button>("cancel_button");
+ m_text_editor = *main_widget->find_descendant_of_type_named<GUI::TextBox>("text_editor");
+ m_find_button = *main_widget->find_descendant_of_type_named<GUI::Button>("find_button");
+ m_find_all_button = *main_widget->find_descendant_of_type_named<GUI::Button>("find_all_button");
+ m_cancel_button = *main_widget->find_descendant_of_type_named<GUI::Button>("cancel_button");
- auto& radio_container = *main_widget.find_descendant_of_type_named<GUI::Widget>("radio_container");
+ auto& radio_container = *main_widget->find_descendant_of_type_named<GUI::Widget>("radio_container");
for (size_t i = 0; i < options.size(); i++) {
auto action = options[i];
auto& radio = radio_container.add<GUI::RadioButton>();
diff --git a/Userland/Applications/HexEditor/GoToOffsetDialog.cpp b/Userland/Applications/HexEditor/GoToOffsetDialog.cpp
index 0918603f8a..c89d0a06d4 100644
--- a/Userland/Applications/HexEditor/GoToOffsetDialog.cpp
+++ b/Userland/Applications/HexEditor/GoToOffsetDialog.cpp
@@ -96,15 +96,15 @@ GoToOffsetDialog::GoToOffsetDialog()
set_resizable(false);
set_title("Go to Offset");
- auto& main_widget = set_main_widget<GUI::Widget>();
- if (!main_widget.load_from_gml(go_to_offset_dialog_gml))
+ auto main_widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors();
+ if (!main_widget->load_from_gml(go_to_offset_dialog_gml))
VERIFY_NOT_REACHED();
- m_text_editor = *main_widget.find_descendant_of_type_named<GUI::TextBox>("text_editor");
- m_go_button = *main_widget.find_descendant_of_type_named<GUI::Button>("go_button");
- m_offset_type_box = *main_widget.find_descendant_of_type_named<GUI::ComboBox>("offset_type");
- m_offset_from_box = *main_widget.find_descendant_of_type_named<GUI::ComboBox>("offset_from");
- m_statusbar = *main_widget.find_descendant_of_type_named<GUI::Statusbar>("statusbar");
+ m_text_editor = *main_widget->find_descendant_of_type_named<GUI::TextBox>("text_editor");
+ m_go_button = *main_widget->find_descendant_of_type_named<GUI::Button>("go_button");
+ m_offset_type_box = *main_widget->find_descendant_of_type_named<GUI::ComboBox>("offset_type");
+ m_offset_from_box = *main_widget->find_descendant_of_type_named<GUI::ComboBox>("offset_from");
+ m_statusbar = *main_widget->find_descendant_of_type_named<GUI::Statusbar>("statusbar");
m_offset_type.append("Decimal");
m_offset_type.append("Hexadecimal");
diff --git a/Userland/Applications/HexEditor/main.cpp b/Userland/Applications/HexEditor/main.cpp
index 7821b2e6b2..cd36a0b2d2 100644
--- a/Userland/Applications/HexEditor/main.cpp
+++ b/Userland/Applications/HexEditor/main.cpp
@@ -35,7 +35,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_title("Hex Editor");
window->resize(640, 400);
- auto hex_editor_widget = TRY(window->try_set_main_widget<HexEditorWidget>());
+ auto hex_editor_widget = TRY(window->set_main_widget<HexEditorWidget>());
window->on_close_request = [&]() -> GUI::Window::CloseRequestDecision {
if (hex_editor_widget->request_close())