From 4a916cd3796cef0ef10374fcf9a602c96e226e6c Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Thu, 9 Feb 2023 13:26:53 -0500 Subject: Everywhere: Remove needless copies of Error / ErrorOr instances Either take the underlying objects with release_* methods or move() the instances around. --- .../Applications/KeyboardMapper/KeyboardMapperWidget.cpp | 5 ++--- Userland/Applications/KeyboardMapper/main.cpp | 15 ++++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'Userland/Applications/KeyboardMapper') diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp index 099d3179d7..9d97082a3b 100644 --- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp +++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp @@ -27,9 +27,8 @@ bool KeyboardMapperWidget::request_close() return true; auto result = GUI::MessageBox::ask_about_unsaved_changes(window(), m_filename); if (result == GUI::MessageBox::ExecResult::Yes) { - ErrorOr error_or = save(); - if (error_or.is_error()) - show_error_to_user(error_or.error()); + if (auto error_or = save(); error_or.is_error()) + show_error_to_user(error_or.release_error()); if (!window()->is_modified()) return true; diff --git a/Userland/Applications/KeyboardMapper/main.cpp b/Userland/Applications/KeyboardMapper/main.cpp index 77ef321792..015e0270a2 100644 --- a/Userland/Applications/KeyboardMapper/main.cpp +++ b/Userland/Applications/KeyboardMapper/main.cpp @@ -54,16 +54,14 @@ ErrorOr serenity_main(Main::Arguments arguments) if (!path.has_value()) return; - ErrorOr error_or = keyboard_mapper_widget->load_map_from_file(path.value()); - if (error_or.is_error()) - keyboard_mapper_widget->show_error_to_user(error_or.error()); + if (auto error_or = keyboard_mapper_widget->load_map_from_file(path.value()); error_or.is_error()) + keyboard_mapper_widget->show_error_to_user(error_or.release_error()); }); auto save_action = GUI::CommonActions::make_save_action( [&](auto&) { - ErrorOr error_or = keyboard_mapper_widget->save(); - if (error_or.is_error()) - keyboard_mapper_widget->show_error_to_user(error_or.error()); + if (auto error_or = keyboard_mapper_widget->save(); error_or.is_error()) + keyboard_mapper_widget->show_error_to_user(error_or.release_error()); }); auto save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { @@ -72,9 +70,8 @@ ErrorOr serenity_main(Main::Arguments arguments) if (!save_path.has_value()) return; - ErrorOr error_or = keyboard_mapper_widget->save_to_file(save_path.value()); - if (error_or.is_error()) - keyboard_mapper_widget->show_error_to_user(error_or.error()); + if (auto error_or = keyboard_mapper_widget->save_to_file(save_path.value()); error_or.is_error()) + keyboard_mapper_widget->show_error_to_user(error_or.release_error()); }); auto quit_action = GUI::CommonActions::make_quit_action( -- cgit v1.2.3