diff --git a/Meta/Lagom/Tools/CodeGenerators/GMLCompiler/main.cpp b/Meta/Lagom/Tools/CodeGenerators/GMLCompiler/main.cpp index aa2a7954bd..1ba556bbd2 100644 --- a/Meta/Lagom/Tools/CodeGenerators/GMLCompiler/main.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/GMLCompiler/main.cpp @@ -301,7 +301,7 @@ static ErrorOr generate_loader_for_object(GUI::GML::Object const& gml_obje TRY(gml_object.try_for_each_child_object([&](auto const& child) -> ErrorOr { // Spacer is a pseudo-class that insteads causes a call to `Widget::add_spacer` on the parent object. if (child.name() == "GUI::Layout::Spacer"sv) { - TRY(append(generator, "TRY(@object_name@->add_spacer());")); + TRY(append(generator, "@object_name@->add_spacer();")); return {}; } diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp index c4b6497863..0ef34f2677 100644 --- a/Userland/Applications/Browser/DownloadWidget.cpp +++ b/Userland/Applications/Browser/DownloadWidget.cpp @@ -69,7 +69,7 @@ DownloadWidget::DownloadWidget(const URL& url) m_browser_image = animation_container.add(); m_browser_image->load_from_file("/res/graphics/download-animation.gif"sv); - animation_container.add_spacer().release_value_but_fixme_should_propagate_errors(); + animation_container.add_spacer(); auto& source_label = add(String::formatted("File: {}", m_url.basename()).release_value_but_fixme_should_propagate_errors()); source_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -102,7 +102,7 @@ DownloadWidget::DownloadWidget(const URL& url) auto& button_container = add(); button_container.set_layout(); - button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); + button_container.add_spacer(); m_cancel_button = button_container.add("Cancel"_string); m_cancel_button->set_fixed_size(100, 22); m_cancel_button->on_click = [this](auto) { diff --git a/Userland/Applications/Calendar/AddEventDialog.cpp b/Userland/Applications/Calendar/AddEventDialog.cpp index ac615228e5..84ee57ec5f 100644 --- a/Userland/Applications/Calendar/AddEventDialog.cpp +++ b/Userland/Applications/Calendar/AddEventDialog.cpp @@ -88,12 +88,12 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, EventManager& event_man starting_meridiem_combo.set_model(MeridiemListModel::create()); starting_meridiem_combo.set_selected_index(0); - widget->add_spacer().release_value_but_fixme_should_propagate_errors(); + widget->add_spacer(); auto& button_container = widget->add(); button_container.set_fixed_height(20); button_container.set_layout(); - button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); + button_container.add_spacer(); auto& ok_button = button_container.add("OK"_string); ok_button.set_fixed_size(80, 20); ok_button.on_click = [&](auto) { diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index b9faadec97..5d7e23f836 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -82,7 +82,7 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) button_widget->set_layout(GUI::Margins {}, 5); button_widget->set_fixed_height(22); - TRY(button_widget->add_spacer()); + button_widget->add_spacer(); auto ok_button = TRY(make_button("OK"_string, button_widget)); ok_button->on_click = [this](auto) { diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp index 65d2148259..17620e05db 100644 --- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp +++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp @@ -94,7 +94,7 @@ void KeyboardMapperWidget::create_frame() add_map_radio_button("alt_map"sv, "Alt"_string); add_map_radio_button("shift_altgr_map"sv, "Shift+AltGr"_string); - bottom_widget.add_spacer().release_value_but_fixme_should_propagate_errors(); + bottom_widget.add_spacer(); } void KeyboardMapperWidget::add_map_radio_button(const StringView map_name, String button_text) diff --git a/Userland/Applications/Piano/TrackControlsWidget.cpp b/Userland/Applications/Piano/TrackControlsWidget.cpp index b51d9b7c54..ed8f35a192 100644 --- a/Userland/Applications/Piano/TrackControlsWidget.cpp +++ b/Userland/Applications/Piano/TrackControlsWidget.cpp @@ -36,7 +36,7 @@ ErrorOr> TrackControlsWidget::try_create(Weak TRY(widget->m_processor_groups.try_append(mastering_parameters)); - TRY(widget->add_spacer()); + widget->add_spacer(); for (auto& processor : strong_track->processor_chain()) { auto processor_parameters = TRY(widget->try_add()); diff --git a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp index 42ebc1fc39..f731e3bed0 100644 --- a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp @@ -295,7 +295,7 @@ ErrorOr GradientTool::get_properties_widget() auto button_container = TRY(properties_widget->try_add()); button_container->set_fixed_height(22); button_container->set_layout(); - button_container->add_spacer().release_value_but_fixme_should_propagate_errors(); + button_container->add_spacer(); auto apply_button = TRY(button_container->try_add("Apply"_string)); apply_button->on_click = [this](auto) { diff --git a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp index 2f8caf87e1..fc0c31973d 100644 --- a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp +++ b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp @@ -55,7 +55,7 @@ CellTypeDialog::CellTypeDialog(Vector const& positions, Sheet& sheet, auto& buttonbox = main_widget->add(); buttonbox.set_shrink_to_fit(true); buttonbox.set_layout(GUI::Margins {}, 10); - buttonbox.add_spacer().release_value_but_fixme_should_propagate_errors(); + buttonbox.add_spacer(); auto& ok_button = buttonbox.add("OK"_string); ok_button.set_fixed_width(80); ok_button.on_click = [&](auto) { done(ExecResult::OK); }; diff --git a/Userland/Libraries/LibGUI/ColorPicker.cpp b/Userland/Libraries/LibGUI/ColorPicker.cpp index 0a697fc4e5..ee76283efd 100644 --- a/Userland/Libraries/LibGUI/ColorPicker.cpp +++ b/Userland/Libraries/LibGUI/ColorPicker.cpp @@ -226,7 +226,7 @@ void ColorPicker::build_ui() auto& button_container = root_container->add(); button_container.set_preferred_height(GUI::SpecialDimension::Fit); button_container.set_layout(4); - button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); + button_container.add_spacer(); auto& ok_button = button_container.add(); ok_button.set_text("OK"_string); @@ -327,7 +327,7 @@ void ColorPicker::build_ui_custom(Widget& root_container) // Preview selected color m_preview_widget = preview_container.add(m_color); - vertical_container.add_spacer().release_value_but_fixme_should_propagate_errors(); + vertical_container.add_spacer(); // HTML auto& html_container = vertical_container.add(); diff --git a/Userland/Libraries/LibGUI/InputBox.cpp b/Userland/Libraries/LibGUI/InputBox.cpp index 2c74def08f..829618c6a6 100644 --- a/Userland/Libraries/LibGUI/InputBox.cpp +++ b/Userland/Libraries/LibGUI/InputBox.cpp @@ -159,7 +159,7 @@ ErrorOr InputBox::build() auto button_container = TRY(main_widget->try_add()); button_container->set_layout(0, 6); - TRY(button_container->add_spacer()); + button_container->add_spacer(); m_ok_button = TRY(button_container->try_add("OK"_string)); m_ok_button->on_click = [this](auto) { diff --git a/Userland/Libraries/LibGUI/Layout.cpp b/Userland/Libraries/LibGUI/Layout.cpp index 52528515ba..4b91ac79ec 100644 --- a/Userland/Libraries/LibGUI/Layout.cpp +++ b/Userland/Libraries/LibGUI/Layout.cpp @@ -73,15 +73,9 @@ void Layout::add_entry(Entry&& entry) MUST(try_add_entry(move(entry))); } -ErrorOr Layout::try_add_spacer() -{ - TRY(try_add_entry(Entry { .type = Entry::Type::Spacer })); - return {}; -} - void Layout::add_spacer() { - MUST(try_add_spacer()); + add_entry(Entry { .type = Entry::Type::Spacer }); } void Layout::add_layout(OwnPtr&& layout) diff --git a/Userland/Libraries/LibGUI/Layout.h b/Userland/Libraries/LibGUI/Layout.h index d917917e84..503d0fb62b 100644 --- a/Userland/Libraries/LibGUI/Layout.h +++ b/Userland/Libraries/LibGUI/Layout.h @@ -40,7 +40,6 @@ public: ErrorOr try_add_widget(Widget&); ErrorOr try_insert_widget_before(Widget& widget, Widget& before_widget); - ErrorOr try_add_spacer(); void remove_widget(Widget&); diff --git a/Userland/Libraries/LibGUI/MessageBox.cpp b/Userland/Libraries/LibGUI/MessageBox.cpp index fed51d0611..f0eef27895 100644 --- a/Userland/Libraries/LibGUI/MessageBox.cpp +++ b/Userland/Libraries/LibGUI/MessageBox.cpp @@ -179,7 +179,7 @@ ErrorOr MessageBox::build() return button; }; - TRY(button_container->add_spacer()); + button_container->add_spacer(); if (should_include_ok_button()) m_ok_button = TRY(add_button("OK"_string, ExecResult::OK)); if (should_include_yes_button()) @@ -188,7 +188,7 @@ ErrorOr MessageBox::build() m_no_button = TRY(add_button("No"_string, ExecResult::No)); if (should_include_cancel_button()) m_cancel_button = TRY(add_button("Cancel"_string, ExecResult::Cancel)); - TRY(button_container->add_spacer()); + button_container->add_spacer(); return {}; } diff --git a/Userland/Libraries/LibGUI/ProcessChooser.cpp b/Userland/Libraries/LibGUI/ProcessChooser.cpp index 88a84cc28e..2728aa8910 100644 --- a/Userland/Libraries/LibGUI/ProcessChooser.cpp +++ b/Userland/Libraries/LibGUI/ProcessChooser.cpp @@ -49,7 +49,7 @@ ProcessChooser::ProcessChooser(StringView window_title, String button_label, Gfx auto& button_container = widget->add(); button_container.set_fixed_height(30); button_container.set_layout(GUI::Margins { 0, 4, 0 }); - button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); + button_container.add_spacer(); auto& select_button = button_container.add(m_button_label); select_button.set_fixed_width(80); diff --git a/Userland/Libraries/LibGUI/SettingsWindow.cpp b/Userland/Libraries/LibGUI/SettingsWindow.cpp index 1fe98f202a..e42b10c5ba 100644 --- a/Userland/Libraries/LibGUI/SettingsWindow.cpp +++ b/Userland/Libraries/LibGUI/SettingsWindow.cpp @@ -49,7 +49,7 @@ ErrorOr> SettingsWindow::create(DeprecatedString t }; } - TRY(button_container->add_spacer()); + button_container->add_spacer(); window->m_ok_button = TRY(button_container->try_add("OK"_string)); window->m_ok_button->on_click = [window = window->make_weak_ptr()](auto) { diff --git a/Userland/Libraries/LibGUI/Toolbar.cpp b/Userland/Libraries/LibGUI/Toolbar.cpp index 79f15222d9..bedcff39ce 100644 --- a/Userland/Libraries/LibGUI/Toolbar.cpp +++ b/Userland/Libraries/LibGUI/Toolbar.cpp @@ -174,7 +174,7 @@ ErrorOr Toolbar::create_overflow_objects() m_overflow_action->set_status_tip("Show hidden toolbar actions"_string); m_overflow_action->set_enabled(false); - TRY(add_spacer()); + add_spacer(); m_overflow_button = TRY(try_add_action(*m_overflow_action)); m_overflow_button->set_visible(false); diff --git a/Userland/Libraries/LibGUI/Widget.cpp b/Userland/Libraries/LibGUI/Widget.cpp index 4af727daa3..2be933e202 100644 --- a/Userland/Libraries/LibGUI/Widget.cpp +++ b/Userland/Libraries/LibGUI/Widget.cpp @@ -1199,7 +1199,7 @@ ErrorOr Widget::load_from_gml_ast(NonnullRefPtr ast, if (!this->layout()) { return Error::from_string_literal("Specified GUI::Layout::Spacer in GML, but the parent has no Layout."); } - this->layout()->add_spacer(); + add_spacer(); } else { RefPtr child; if (auto* registration = GUI::ObjectClassRegistration::find(class_name)) { @@ -1259,10 +1259,10 @@ bool Widget::is_visible_for_timer_purposes() const return is_visible() && Object::is_visible_for_timer_purposes(); } -ErrorOr Widget::add_spacer() +void Widget::add_spacer() { VERIFY(layout()); - return layout()->try_add_spacer(); + return layout()->add_spacer(); } } diff --git a/Userland/Libraries/LibGUI/Widget.h b/Userland/Libraries/LibGUI/Widget.h index 10609fe609..9cad62e2d6 100644 --- a/Userland/Libraries/LibGUI/Widget.h +++ b/Userland/Libraries/LibGUI/Widget.h @@ -356,7 +356,7 @@ public: // In order for others to be able to call this, it needs to be public. virtual ErrorOr load_from_gml_ast(NonnullRefPtr ast, UnregisteredChildHandler); - ErrorOr add_spacer(); + void add_spacer(); protected: Widget(); diff --git a/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp b/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp index 2ec8b1ee52..4868333ddc 100644 --- a/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp +++ b/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp @@ -39,7 +39,7 @@ ErrorOr WizardDialog::build() auto nav_container_widget = TRY(main_widget->try_add()); nav_container_widget->set_layout(Margins { 0, 10 }, 0); nav_container_widget->set_fixed_height(42); - TRY(nav_container_widget->add_spacer()); + nav_container_widget->add_spacer(); m_back_button = TRY(nav_container_widget->try_add("< Back"_string)); m_back_button->on_click = [&](auto) { diff --git a/Userland/Libraries/LibGUI/Wizards/WizardPage.cpp b/Userland/Libraries/LibGUI/Wizards/WizardPage.cpp index 5ac2527b4b..bde6cd1f17 100644 --- a/Userland/Libraries/LibGUI/Wizards/WizardPage.cpp +++ b/Userland/Libraries/LibGUI/Wizards/WizardPage.cpp @@ -39,7 +39,7 @@ ErrorOr WizardPage::build(String title, String subtitle) m_subtitle_label = TRY(header_widget->try_add