From 5df88dab074fc5ed8c3ae307c3feb1890dd95db1 Mon Sep 17 00:00:00 2001 From: Tim Ledbetter Date: Fri, 22 Sep 2023 23:53:28 +0100 Subject: [PATCH] FileManager: Make `PropertiesWindow::make_button()` non-fallible --- .../Applications/FileManager/PropertiesWindow.cpp | 12 ++++++------ Userland/Applications/FileManager/PropertiesWindow.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index fb04f27bdc..49817731ac 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -84,17 +84,17 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) button_widget.add_spacer(); - auto ok_button = TRY(make_button("OK"_string, button_widget)); - ok_button->on_click = [this](auto) { + auto& ok_button = make_button("OK"_string, button_widget); + ok_button.on_click = [this](auto) { if (apply_changes()) close(); }; - auto cancel_button = TRY(make_button("Cancel"_string, button_widget)); - cancel_button->on_click = [this](auto) { + auto& cancel_button = make_button("Cancel"_string, button_widget); + cancel_button.on_click = [this](auto) { close(); }; - m_apply_button = TRY(make_button("Apply"_string, button_widget)); + m_apply_button = make_button("Apply"_string, button_widget); m_apply_button->on_click = [this](auto) { apply_changes(); }; m_apply_button->set_enabled(false); @@ -592,7 +592,7 @@ ErrorOr PropertiesWindow::setup_permission_checkboxes(GUI::CheckBox& box_r return {}; } -ErrorOr> PropertiesWindow::make_button(String text, GUI::Widget& parent) +GUI::Button& PropertiesWindow::make_button(String text, GUI::Widget& parent) { auto& button = parent.add(text); button.set_fixed_size(70, 22); diff --git a/Userland/Applications/FileManager/PropertiesWindow.h b/Userland/Applications/FileManager/PropertiesWindow.h index a7d63b86f7..1e3f3de996 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.h +++ b/Userland/Applications/FileManager/PropertiesWindow.h @@ -79,7 +79,7 @@ private: return "Unknown"sv; } - static ErrorOr> make_button(String, GUI::Widget& parent); + static GUI::Button& make_button(String, GUI::Widget& parent); ErrorOr setup_permission_checkboxes(GUI::CheckBox& box_read, GUI::CheckBox& box_write, GUI::CheckBox& box_execute, PermissionMasks masks, mode_t mode); void permission_changed(mode_t mask, bool set); bool apply_changes();