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/FileManager | |
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/FileManager')
-rw-r--r-- | Userland/Applications/FileManager/FileUtils.cpp | 2 | ||||
-rw-r--r-- | Userland/Applications/FileManager/PropertiesWindow.cpp | 14 | ||||
-rw-r--r-- | Userland/Applications/FileManager/main.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Userland/Applications/FileManager/FileUtils.cpp b/Userland/Applications/FileManager/FileUtils.cpp index 5a853980e2..468994a515 100644 --- a/Userland/Applications/FileManager/FileUtils.cpp +++ b/Userland/Applications/FileManager/FileUtils.cpp @@ -99,7 +99,7 @@ ErrorOr<void> run_file_operation(FileOperation operation, Vector<DeprecatedStrin auto pipe_input_file = TRY(Core::Stream::File::adopt_fd(pipe_fds[0], Core::Stream::OpenMode::Read)); auto buffered_pipe = TRY(Core::Stream::BufferedFile::create(move(pipe_input_file))); - (void)TRY(window->try_set_main_widget<FileOperationProgressWidget>(operation, move(buffered_pipe), pipe_fds[0])); + (void)TRY(window->set_main_widget<FileOperationProgressWidget>(operation, move(buffered_pipe), pipe_fds[0])); window->resize(320, 190); if (parent_window) window->center_within(*parent_window); diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index 93ed82b47c..146cf99356 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -31,18 +31,18 @@ PropertiesWindow::PropertiesWindow(DeprecatedString const& path, bool disable_re { auto lexical_path = LexicalPath(path); - auto& main_widget = set_main_widget<GUI::Widget>(); - main_widget.set_layout<GUI::VerticalBoxLayout>(); - main_widget.layout()->set_spacing(6); - main_widget.layout()->set_margins(4); - main_widget.set_fill_with_background_color(true); + auto main_widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors(); + main_widget->set_layout<GUI::VerticalBoxLayout>(); + main_widget->layout()->set_spacing(6); + main_widget->layout()->set_margins(4); + main_widget->set_fill_with_background_color(true); set_rect({ 0, 0, 360, 420 }); set_resizable(false); set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/properties.png"sv).release_value_but_fixme_should_propagate_errors()); - auto& tab_widget = main_widget.add<GUI::TabWidget>(); + auto& tab_widget = main_widget->add<GUI::TabWidget>(); auto& general_tab = tab_widget.add_tab<GUI::Widget>("General"); general_tab.load_from_gml(properties_window_general_tab_gml); @@ -142,7 +142,7 @@ PropertiesWindow::PropertiesWindow(DeprecatedString const& path, bool disable_re auto others_execute = general_tab.find_descendant_of_type_named<GUI::CheckBox>("others_execute"); setup_permission_checkboxes(*others_read, *others_write, *others_execute, { S_IROTH, S_IWOTH, S_IXOTH }, m_mode); - auto& button_widget = main_widget.add<GUI::Widget>(); + auto& button_widget = main_widget->add<GUI::Widget>(); button_widget.set_layout<GUI::HorizontalBoxLayout>(); button_widget.set_fixed_height(22); button_widget.layout()->set_spacing(5); diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 6e53198eab..37c5658eaf 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -351,7 +351,7 @@ ErrorOr<int> run_in_desktop_mode() window->set_window_type(GUI::WindowType::Desktop); window->set_has_alpha_channel(true); - auto desktop_widget = TRY(window->try_set_main_widget<FileManager::DesktopWidget>()); + auto desktop_widget = TRY(window->set_main_widget<FileManager::DesktopWidget>()); (void)TRY(desktop_widget->try_set_layout<GUI::VerticalBoxLayout>()); auto directory_view = TRY(desktop_widget->try_add<DirectoryView>(DirectoryView::Mode::Desktop)); @@ -579,7 +579,7 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr auto height = Config::read_i32("FileManager"sv, "Window"sv, "Height"sv, 480); auto was_maximized = Config::read_bool("FileManager"sv, "Window"sv, "Maximized"sv, false); - auto widget = TRY(window->try_set_main_widget<GUI::Widget>()); + auto widget = TRY(window->set_main_widget<GUI::Widget>()); widget->load_from_gml(file_manager_window_gml); |