From 6b66e39df443d4be087cb1b9cb1eeba5341811b0 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 16 Feb 2023 21:17:12 +0000 Subject: [PATCH] LibGUI+Userland: Stop returning Layout from `Widget::(try_)set_layout()` Nobody uses this return value any more. It also lets us remove a whole bunch of `(void)` casts. :^) --- .../templates/serenity-application/main.cpp | 2 +- Userland/Applications/CrashReporter/main.cpp | 10 +++++----- .../FileManager/PropertiesWindow.cpp | 4 ++-- Userland/Applications/FileManager/main.cpp | 2 +- Userland/Applications/Piano/MainWidget.cpp | 4 ++-- Userland/Applications/Piano/PlayerWidget.cpp | 2 +- .../Applications/PixelPaint/Filters/Bloom.cpp | 6 +++--- .../PixelPaint/Filters/FastBoxBlur.cpp | 16 ++++++++-------- .../Applications/PixelPaint/Filters/Sepia.cpp | 4 ++-- .../PixelPaint/Tools/GradientTool.cpp | 2 +- .../SpaceAnalyzer/ProgressWindow.cpp | 2 +- Userland/Applications/Terminal/main.cpp | 4 ++-- Userland/Applications/ThemeEditor/MainWidget.cpp | 4 ++-- Userland/Demos/CatDog/main.cpp | 4 ++-- Userland/Demos/ModelGallery/GalleryWidget.cpp | 2 +- Userland/DevTools/Profiler/main.cpp | 10 +++++----- Userland/Games/GameOfLife/main.cpp | 2 +- Userland/Libraries/LibGUI/SettingsWindow.cpp | 4 ++-- Userland/Libraries/LibGUI/Widget.h | 7 +++---- Userland/Services/Taskbar/TaskbarWindow.cpp | 4 ++-- 20 files changed, 47 insertions(+), 48 deletions(-) diff --git a/Base/res/devel/templates/serenity-application/main.cpp b/Base/res/devel/templates/serenity-application/main.cpp index 49a750ba83..f1f058c32b 100644 --- a/Base/res/devel/templates/serenity-application/main.cpp +++ b/Base/res/devel/templates/serenity-application/main.cpp @@ -23,7 +23,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); - (void)TRY(main_widget->try_set_layout(16)); + TRY(main_widget->try_set_layout(16)); auto button = TRY(main_widget->try_add("Click me!")); button->on_click = [&](auto) { diff --git a/Userland/Applications/CrashReporter/main.cpp b/Userland/Applications/CrashReporter/main.cpp index 60f67619ca..eceba09693 100644 --- a/Userland/Applications/CrashReporter/main.cpp +++ b/Userland/Applications/CrashReporter/main.cpp @@ -216,7 +216,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto& tab_widget = *widget->find_descendant_of_type_named("tab_widget"); auto backtrace_tab = TRY(tab_widget.try_add_tab("Backtrace")); - (void)TRY(backtrace_tab->try_set_layout(4)); + TRY(backtrace_tab->try_set_layout(4)); auto backtrace_label = TRY(backtrace_tab->try_add("A backtrace for each thread alive during the crash is listed below:")); backtrace_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -236,7 +236,7 @@ ErrorOr serenity_main(Main::Arguments arguments) cpu_registers_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); auto environment_tab = TRY(tab_widget.try_add_tab("Environment")); - (void)TRY(environment_tab->try_set_layout(4)); + TRY(environment_tab->try_set_layout(4)); auto environment_text_editor = TRY(environment_tab->try_add()); environment_text_editor->set_text(DeprecatedString::join('\n', environment)); @@ -245,7 +245,7 @@ ErrorOr serenity_main(Main::Arguments arguments) environment_text_editor->set_should_hide_unnecessary_scrollbars(true); auto memory_regions_tab = TRY(tab_widget.try_add_tab("Memory Regions")); - (void)TRY(memory_regions_tab->try_set_layout(4)); + TRY(memory_regions_tab->try_set_layout(4)); auto memory_regions_text_editor = TRY(memory_regions_tab->try_add()); memory_regions_text_editor->set_text(DeprecatedString::join('\n', memory_regions)); @@ -303,7 +303,7 @@ ErrorOr serenity_main(Main::Arguments arguments) [&](auto results) -> ErrorOr { for (auto& backtrace : results.thread_backtraces) { auto container = TRY(backtrace_tab_widget->try_add_tab(backtrace.title)); - (void)TRY(container->template try_set_layout(4)); + TRY(container->template try_set_layout(4)); auto backtrace_text_editor = TRY(container->template try_add()); backtrace_text_editor->set_text(backtrace.text); backtrace_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); @@ -314,7 +314,7 @@ ErrorOr serenity_main(Main::Arguments arguments) for (auto& cpu_registers : results.thread_cpu_registers) { auto container = TRY(cpu_registers_tab_widget->try_add_tab(cpu_registers.title)); - (void)TRY(container->template try_set_layout(4)); + TRY(container->template try_set_layout(4)); auto cpu_registers_text_editor = TRY(container->template try_add()); cpu_registers_text_editor->set_text(cpu_registers.text); cpu_registers_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index afebbe3700..f268ddd690 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -53,7 +53,7 @@ PropertiesWindow::PropertiesWindow(DeprecatedString const& path, Window* parent_ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) { auto main_widget = TRY(set_main_widget()); - (void)TRY(main_widget->try_set_layout(4, 6)); + TRY(main_widget->try_set_layout(4, 6)); main_widget->set_fill_with_background_color(true); auto tab_widget = TRY(main_widget->try_add()); @@ -149,7 +149,7 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) TRY(setup_permission_checkboxes(*others_read, *others_write, *others_execute, { S_IROTH, S_IWOTH, S_IXOTH }, m_mode)); auto button_widget = TRY(main_widget->try_add()); - (void)TRY(button_widget->try_set_layout(GUI::Margins {}, 5)); + TRY(button_widget->try_set_layout(GUI::Margins {}, 5)); button_widget->set_fixed_height(22); TRY(button_widget->add_spacer()); diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 9cd52d2656..0fcabe2b8f 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -358,7 +358,7 @@ ErrorOr run_in_desktop_mode() window->set_has_alpha_channel(true); auto desktop_widget = TRY(window->set_main_widget()); - (void)TRY(desktop_widget->try_set_layout()); + TRY(desktop_widget->try_set_layout()); auto directory_view = TRY(desktop_widget->try_add(DirectoryView::Mode::Desktop)); directory_view->set_name("directory_view"); diff --git a/Userland/Applications/Piano/MainWidget.cpp b/Userland/Applications/Piano/MainWidget.cpp index 351eb8032e..d60f0a3762 100644 --- a/Userland/Applications/Piano/MainWidget.cpp +++ b/Userland/Applications/Piano/MainWidget.cpp @@ -34,7 +34,7 @@ MainWidget::MainWidget(TrackManager& track_manager, AudioPlayerLoop& loop) ErrorOr MainWidget::initialize() { - (void)TRY(try_set_layout(2, 2)); + TRY(try_set_layout(2, 2)); set_fill_with_background_color(true); m_wave_widget = TRY(try_add(m_track_manager)); @@ -49,7 +49,7 @@ ErrorOr MainWidget::initialize() m_player_widget = TRY(try_add(m_track_manager, m_audio_loop)); m_keys_and_knobs_container = TRY(try_add()); - (void)TRY(m_keys_and_knobs_container->try_set_layout(GUI::Margins {}, 2)); + TRY(m_keys_and_knobs_container->try_set_layout(GUI::Margins {}, 2)); m_keys_and_knobs_container->set_fixed_height(130); m_keys_and_knobs_container->set_fill_with_background_color(true); diff --git a/Userland/Applications/Piano/PlayerWidget.cpp b/Userland/Applications/Piano/PlayerWidget.cpp index e425a3378e..0b2e54b15a 100644 --- a/Userland/Applications/Piano/PlayerWidget.cpp +++ b/Userland/Applications/Piano/PlayerWidget.cpp @@ -39,7 +39,7 @@ PlayerWidget::PlayerWidget(TrackManager& manager, AudioPlayerLoop& loop) ErrorOr PlayerWidget::initialize() { - (void)TRY(try_set_layout()); + TRY(try_set_layout()); set_fill_with_background_color(true); TRY(m_track_number_choices.try_append("1")); diff --git a/Userland/Applications/PixelPaint/Filters/Bloom.cpp b/Userland/Applications/PixelPaint/Filters/Bloom.cpp index f2b106b98f..6ebad51bce 100644 --- a/Userland/Applications/PixelPaint/Filters/Bloom.cpp +++ b/Userland/Applications/PixelPaint/Filters/Bloom.cpp @@ -38,7 +38,7 @@ ErrorOr> Bloom::get_settings_widget() { if (!m_settings_widget) { auto settings_widget = TRY(GUI::Widget::try_create()); - (void)TRY(settings_widget->try_set_layout()); + TRY(settings_widget->try_set_layout()); auto name_label = TRY(settings_widget->try_add("Bloom Filter")); name_label->set_font_weight(Gfx::FontWeight::Bold); @@ -47,7 +47,7 @@ ErrorOr> Bloom::get_settings_widget() auto luma_lower_container = TRY(settings_widget->try_add()); luma_lower_container->set_fixed_height(50); - (void)TRY(luma_lower_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + TRY(luma_lower_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto luma_lower_label = TRY(luma_lower_container->try_add("Luma lower bound:")); luma_lower_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -63,7 +63,7 @@ ErrorOr> Bloom::get_settings_widget() auto radius_container = TRY(settings_widget->try_add()); radius_container->set_fixed_height(50); - (void)TRY(radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + TRY(radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto radius_label = TRY(radius_container->try_add("Blur Radius:")); radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp index aa4a26e4ea..6be4e75f77 100644 --- a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp +++ b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp @@ -40,7 +40,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() { if (!m_settings_widget) { auto settings_widget = TRY(GUI::Widget::try_create()); - (void)TRY(settings_widget->try_set_layout()); + TRY(settings_widget->try_set_layout()); auto name_label = TRY(settings_widget->try_add("Fast Box Blur Filter")); name_label->set_font_weight(Gfx::FontWeight::Bold); @@ -86,7 +86,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() m_radius_container = TRY(settings_widget->try_add()); m_radius_container->set_fixed_height(20); - (void)TRY(m_radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + TRY(m_radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto radius_label = TRY(m_radius_container->try_add("Radius:")); radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -103,7 +103,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() m_asymmetric_radius_container = TRY(settings_widget->try_add()); m_asymmetric_radius_container->set_visible(false); m_asymmetric_radius_container->set_fixed_height(50); - (void)TRY(m_asymmetric_radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + TRY(m_asymmetric_radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto radius_x_container = TRY(m_asymmetric_radius_container->try_add()); radius_x_container->set_fixed_height(20); @@ -123,7 +123,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() auto radius_y_container = TRY(m_asymmetric_radius_container->try_add()); radius_y_container->set_fixed_height(20); - (void)TRY(radius_y_container->try_set_layout()); + TRY(radius_y_container->try_set_layout()); auto radius_y_label = TRY(radius_y_container->try_add("Radius Y:")); radius_y_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -140,11 +140,11 @@ ErrorOr> FastBoxBlur::get_settings_widget() m_vector_container = TRY(settings_widget->try_add()); m_vector_container->set_visible(false); m_vector_container->set_fixed_height(50); - (void)TRY(m_vector_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + TRY(m_vector_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto angle_container = TRY(m_vector_container->try_add()); angle_container->set_fixed_height(20); - (void)TRY(angle_container->try_set_layout()); + TRY(angle_container->try_set_layout()); auto angle_label = TRY(angle_container->try_add("Angle:")); angle_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -160,7 +160,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() auto magnitude_container = TRY(m_vector_container->try_add()); magnitude_container->set_fixed_height(20); - (void)TRY(magnitude_container->try_set_layout()); + TRY(magnitude_container->try_set_layout()); auto magnitude_label = TRY(magnitude_container->try_add("Magnitude:")); magnitude_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -176,7 +176,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() auto gaussian_container = TRY(settings_widget->try_add()); gaussian_container->set_fixed_height(20); - (void)TRY(gaussian_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + TRY(gaussian_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); m_gaussian_checkbox = TRY(gaussian_container->try_add(TRY(String::from_utf8("Approximate Gaussian Blur"sv)))); m_gaussian_checkbox->set_checked(m_approximate_gauss); diff --git a/Userland/Applications/PixelPaint/Filters/Sepia.cpp b/Userland/Applications/PixelPaint/Filters/Sepia.cpp index c32a2037d8..789ebdc9f5 100644 --- a/Userland/Applications/PixelPaint/Filters/Sepia.cpp +++ b/Userland/Applications/PixelPaint/Filters/Sepia.cpp @@ -21,7 +21,7 @@ ErrorOr> Sepia::get_settings_widget() { if (!m_settings_widget) { auto settings_widget = TRY(GUI::Widget::try_create()); - (void)TRY(settings_widget->try_set_layout()); + TRY(settings_widget->try_set_layout()); auto name_label = TRY(settings_widget->try_add("Sepia Filter")); name_label->set_font_weight(Gfx::FontWeight::Bold); @@ -30,7 +30,7 @@ ErrorOr> Sepia::get_settings_widget() auto amount_container = TRY(settings_widget->try_add()); amount_container->set_fixed_height(20); - (void)TRY(amount_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + TRY(amount_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto amount_label = TRY(amount_container->try_add("Amount:")); amount_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp index 22b7ee06d0..3f46f26f7f 100644 --- a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp @@ -214,7 +214,7 @@ ErrorOr GradientTool::get_properties_widget() auto button_container = TRY(properties_widget->try_add()); button_container->set_fixed_height(22); - (void)TRY(button_container->try_set_layout()); + TRY(button_container->try_set_layout()); button_container->add_spacer().release_value_but_fixme_should_propagate_errors(); auto apply_button = TRY(button_container->try_add(String::from_utf8_short_string("Apply"sv))); diff --git a/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp b/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp index bf87d1ff5e..01b2b08b22 100644 --- a/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp +++ b/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp @@ -16,7 +16,7 @@ ErrorOr> ProgressWindow::try_create(StringView tit auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); - (void)TRY(main_widget->try_set_layout()); + TRY(main_widget->try_set_layout()); auto label = TRY(main_widget->try_add("Analyzing storage space...")); label->set_fixed_height(22); diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp index a947218e90..72da1fc030 100644 --- a/Userland/Applications/Terminal/main.cpp +++ b/Userland/Applications/Terminal/main.cpp @@ -175,10 +175,10 @@ static ErrorOr> create_find_window(VT::TerminalWidget auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); main_widget->set_background_role(ColorRole::Button); - (void)TRY(main_widget->try_set_layout(4)); + TRY(main_widget->try_set_layout(4)); auto find = TRY(main_widget->try_add()); - (void)TRY(find->try_set_layout(4)); + TRY(find->try_set_layout(4)); find->set_fixed_height(30); auto find_textbox = TRY(find->try_add()); diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp index a6621ecc11..adeeca6ad7 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -435,12 +435,12 @@ ErrorOr MainWidget::add_property_tab(PropertyTab const& property_tab) auto properties_list = TRY(GUI::Widget::try_create()); scrollable_container->set_widget(properties_list); - (void)TRY(properties_list->try_set_layout(GUI::Margins { 8 }, 12)); + TRY(properties_list->try_set_layout(GUI::Margins { 8 }, 12)); for (auto const& group : property_tab.property_groups) { NonnullRefPtr group_box = TRY(properties_list->try_add(group.title)); // 1px less on the left makes the text line up with the group title. - (void)TRY(group_box->try_set_layout(GUI::Margins { 8, 8, 8, 7 }, 12)); + TRY(group_box->try_set_layout(GUI::Margins { 8, 8, 8, 7 }, 12)); group_box->set_preferred_height(GUI::SpecialDimension::Fit); for (auto const& property : group.properties) { diff --git a/Userland/Demos/CatDog/main.cpp b/Userland/Demos/CatDog/main.cpp index 4bd9868c14..76e7796dfd 100644 --- a/Userland/Demos/CatDog/main.cpp +++ b/Userland/Demos/CatDog/main.cpp @@ -42,7 +42,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto catdog_widget = TRY(CatDog::create()); window->set_main_widget(catdog_widget); - (void)TRY(catdog_widget->try_set_layout(GUI::Margins {}, 0)); + TRY(catdog_widget->try_set_layout(GUI::Margins {}, 0)); auto context_menu = TRY(GUI::Menu::try_create()); TRY(context_menu->try_add_action(GUI::CommonActions::make_about_action("CatDog Demo", app_icon, window))); @@ -62,7 +62,7 @@ ErrorOr serenity_main(Main::Arguments arguments) advice_window->set_alpha_hit_threshold(1.0f); auto advice_widget = TRY(advice_window->set_main_widget(catdog_widget)); - (void)TRY(advice_widget->try_set_layout(GUI::Margins {}, 0)); + TRY(advice_widget->try_set_layout(GUI::Margins {}, 0)); auto advice_timer = TRY(Core::Timer::create_single_shot(15'000, [&] { window->move_to_front(); diff --git a/Userland/Demos/ModelGallery/GalleryWidget.cpp b/Userland/Demos/ModelGallery/GalleryWidget.cpp index 43e8c090e0..9e746b3ddc 100644 --- a/Userland/Demos/ModelGallery/GalleryWidget.cpp +++ b/Userland/Demos/ModelGallery/GalleryWidget.cpp @@ -13,7 +13,7 @@ GalleryWidget::GalleryWidget() set_layout(); auto& inner_widget = add(); - (void)inner_widget.try_set_layout(4).release_value_but_fixme_should_propagate_errors(); + inner_widget.try_set_layout(4).release_value_but_fixme_should_propagate_errors(); m_tab_widget = inner_widget.try_add().release_value_but_fixme_should_propagate_errors(); m_statusbar = add(); diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp index 7e49cc29cb..0364365d21 100644 --- a/Userland/DevTools/Profiler/main.cpp +++ b/Userland/DevTools/Profiler/main.cpp @@ -132,7 +132,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto tab_widget = TRY(main_splitter->try_add()); auto tree_tab = TRY(tab_widget->try_add_tab("Call Tree")); - (void)TRY(tree_tab->try_set_layout(4)); + TRY(tree_tab->try_set_layout(4)); auto bottom_splitter = TRY(tree_tab->try_add()); auto tree_view = TRY(bottom_splitter->try_add()); @@ -181,7 +181,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }); auto samples_tab = TRY(tab_widget->try_add_tab("Samples")); - (void)TRY(samples_tab->try_set_layout(4)); + TRY(samples_tab->try_set_layout(4)); auto samples_splitter = TRY(samples_tab->try_add()); auto samples_table_view = TRY(samples_splitter->try_add()); @@ -195,7 +195,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }; auto signposts_tab = TRY(tab_widget->try_add_tab("Signposts")); - (void)TRY(signposts_tab->try_set_layout(4)); + TRY(signposts_tab->try_set_layout(4)); auto signposts_splitter = TRY(signposts_tab->try_add()); auto signposts_table_view = TRY(signposts_splitter->try_add()); @@ -209,7 +209,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }; auto flamegraph_tab = TRY(tab_widget->try_add_tab("Flame Graph")); - (void)TRY(flamegraph_tab->try_set_layout(GUI::Margins { 4, 4, 4, 4 })); + TRY(flamegraph_tab->try_set_layout(GUI::Margins { 4, 4, 4, 4 })); auto flamegraph_view = TRY(flamegraph_tab->try_add(profile->model(), ProfileModel::Column::StackFrame, ProfileModel::Column::SampleCount)); @@ -257,7 +257,7 @@ ErrorOr serenity_main(Main::Arguments arguments) flamegraph_view->on_hover_change = [&] { statusbar_update(); }; auto filesystem_events_tab = TRY(tab_widget->try_add_tab("Filesystem events")); - (void)TRY(filesystem_events_tab->try_set_layout(4)); + TRY(filesystem_events_tab->try_set_layout(4)); auto filesystem_events_tree_view = TRY(filesystem_events_tab->try_add()); filesystem_events_tree_view->set_should_fill_selected_rows(true); diff --git a/Userland/Games/GameOfLife/main.cpp b/Userland/Games/GameOfLife/main.cpp index eef4f0c587..e3db2efbdd 100644 --- a/Userland/Games/GameOfLife/main.cpp +++ b/Userland/Games/GameOfLife/main.cpp @@ -60,7 +60,7 @@ ErrorOr serenity_main(Main::Arguments arguments) main_toolbar.layout()->set_margins({ 0, 6 }); auto& board_widget_container = *main_widget->find_descendant_of_type_named("board_widget_container"); - (void)TRY(board_widget_container.try_set_layout(GUI::Margins {}, 0)); + TRY(board_widget_container.try_set_layout(GUI::Margins {}, 0)); auto board_widget = TRY(board_widget_container.try_add(board_rows, board_columns)); board_widget->randomize_cells(); diff --git a/Userland/Libraries/LibGUI/SettingsWindow.cpp b/Userland/Libraries/LibGUI/SettingsWindow.cpp index 95bf8a7235..c859df52e0 100644 --- a/Userland/Libraries/LibGUI/SettingsWindow.cpp +++ b/Userland/Libraries/LibGUI/SettingsWindow.cpp @@ -34,13 +34,13 @@ ErrorOr> SettingsWindow::create(DeprecatedString t auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); - (void)TRY(main_widget->try_set_layout(4, 6)); + TRY(main_widget->try_set_layout(4, 6)); window->m_tab_widget = TRY(main_widget->try_add()); auto button_container = TRY(main_widget->try_add()); button_container->set_preferred_size({ SpecialDimension::Grow, SpecialDimension::Fit }); - (void)TRY(button_container->try_set_layout(GUI::Margins {}, 6)); + TRY(button_container->try_set_layout(GUI::Margins {}, 6)); if (show_defaults_button == ShowDefaultsButton::Yes) { window->m_reset_button = TRY(button_container->try_add(TRY(String::from_utf8("Defaults"sv)))); diff --git a/Userland/Libraries/LibGUI/Widget.h b/Userland/Libraries/LibGUI/Widget.h index bbd0a5a826..75d723467c 100644 --- a/Userland/Libraries/LibGUI/Widget.h +++ b/Userland/Libraries/LibGUI/Widget.h @@ -83,19 +83,18 @@ public: void set_layout(NonnullRefPtr); template - ErrorOr> try_set_layout(Args&&... args) + ErrorOr try_set_layout(Args&&... args) { auto layout = TRY(T::try_create(forward(args)...)); set_layout(*layout); - return layout; + return {}; } template - inline T& set_layout(Args&&... args) + inline void set_layout(Args&&... args) { auto layout = T::construct(forward(args)...); set_layout(*layout); - return layout; } UISize min_size() const { return m_min_size; } diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index 8a973c8edd..f850c2eb39 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -73,13 +73,13 @@ TaskbarWindow::TaskbarWindow() ErrorOr TaskbarWindow::populate_taskbar() { auto main_widget = TRY(set_main_widget()); - (void)TRY(main_widget->try_set_layout(GUI::Margins { 2, 3, 0, 3 })); + TRY(main_widget->try_set_layout(GUI::Margins { 2, 3, 0, 3 })); m_quick_launch = TRY(Taskbar::QuickLaunchWidget::create()); TRY(main_widget->try_add_child(*m_quick_launch)); m_task_button_container = TRY(main_widget->try_add()); - (void)TRY(m_task_button_container->try_set_layout(GUI::Margins {}, 3)); + TRY(m_task_button_container->try_set_layout(GUI::Margins {}, 3)); m_default_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png"sv));