RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:57:35 +00:00
Code Issues Activity Actions

LibFileSystemAccessClient: Rename try_save_file =>

Browse source 
`try_save_file_deprecated`

This precedes the addition of a new api using `Core::Stream`
This commit is contained in:
Lucas CHOLLET 2022-12-07 23:02:03 +01:00 • committed by Linus Groh
parent c71fc0683f
commit 9ae97c8cb1
12 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/CrashReporter/main.cpp
View file

@ -278,7 +278,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
save_backtrace_button.set_icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/save.png"sv))); save_backtrace_button.set_icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/save.png"sv)));
save_backtrace_button.on_click = [&](auto) { save_backtrace_button.on_click = [&](auto) {
LexicalPath lexical_path(DeprecatedString::formatted("{}_{}_backtrace.txt", pid, app_name)); LexicalPath lexical_path(DeprecatedString::formatted("{}_{}_backtrace.txt", pid, app_name));
auto file_or_error = FileSystemAccessClient::Client::the().try_save_file(window, lexical_path.title(), lexical_path.extension()); auto file_or_error = FileSystemAccessClient::Client::the().try_save_file_deprecated(window, lexical_path.title(), lexical_path.extension());
if (file_or_error.is_error()) if (file_or_error.is_error())
return; return;

2
Userland/Applications/HexEditor/HexEditorWidget.cpp
View file

@ -142,7 +142,7 @@ HexEditorWidget::HexEditorWidget()
}); });
m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
auto response = FileSystemAccessClient::Client::the().try_save_file(window(), m_name, m_extension, Core::OpenMode::ReadWrite | Core::OpenMode::Truncate); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(window(), m_name, m_extension, Core::OpenMode::ReadWrite | Core::OpenMode::Truncate);
if (response.is_error()) if (response.is_error())
return; return;
auto file = response.release_value(); auto file = response.release_value();

2
Userland/Applications/Magnifier/main.cpp
View file

@ -64,7 +64,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(file_menu->try_add_action(GUI::CommonActions::make_save_as_action([&](auto&) { TRY(file_menu->try_add_action(GUI::CommonActions::make_save_as_action([&](auto&) {
AK::DeprecatedString filename = "file for saving"; AK::DeprecatedString filename = "file for saving";
auto do_save = [&]() -> ErrorOr<void> { auto do_save = [&]() -> ErrorOr<void> {
auto response = FileSystemAccessClient::Client::the().try_save_file(window, "Capture", "png"); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(window, "Capture", "png");
if (response.is_error()) if (response.is_error())
return {}; return {};
auto file = response.release_value(); auto file = response.release_value();

2
Userland/Applications/PixelPaint/ImageEditor.cpp
View file

@ -694,7 +694,7 @@ void ImageEditor::save_project()
void ImageEditor::save_project_as() void ImageEditor::save_project_as()
{ {
auto response = FileSystemAccessClient::Client::the().try_save_file(window(), m_title, "pp"); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(window(), m_title, "pp");
if (response.is_error()) if (response.is_error())
return; return;
auto file = response.value(); auto file = response.value();

8
Userland/Applications/PixelPaint/MainWidget.cpp
View file

@ -212,7 +212,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
"As &BMP", [&](auto&) { "As &BMP", [&](auto&) {
auto* editor = current_image_editor(); auto* editor = current_image_editor();
VERIFY(editor); VERIFY(editor);
auto response = FileSystemAccessClient::Client::the().try_save_file(&window, editor->title(), "bmp"); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(&window, editor->title(), "bmp");
if (response.is_error()) if (response.is_error())
return; return;
auto preserve_alpha_channel = GUI::MessageBox::show(&window, "Do you wish to preserve transparency?"sv, "Preserve transparency?"sv, GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo); auto preserve_alpha_channel = GUI::MessageBox::show(&window, "Do you wish to preserve transparency?"sv, "Preserve transparency?"sv, GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo);
@ -227,7 +227,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
auto* editor = current_image_editor(); auto* editor = current_image_editor();
VERIFY(editor); VERIFY(editor);
// TODO: fix bmp on line below? // TODO: fix bmp on line below?
auto response = FileSystemAccessClient::Client::the().try_save_file(&window, editor->title(), "png"); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(&window, editor->title(), "png");
if (response.is_error()) if (response.is_error())
return; return;
auto preserve_alpha_channel = GUI::MessageBox::show(&window, "Do you wish to preserve transparency?"sv, "Preserve transparency?"sv, GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo); auto preserve_alpha_channel = GUI::MessageBox::show(&window, "Do you wish to preserve transparency?"sv, "Preserve transparency?"sv, GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo);
@ -241,7 +241,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
"As &QOI", [&](auto&) { "As &QOI", [&](auto&) {
auto* editor = current_image_editor(); auto* editor = current_image_editor();
VERIFY(editor); VERIFY(editor);
auto response = FileSystemAccessClient::Client::the().try_save_file(&window, editor->title(), "qoi"); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(&window, editor->title(), "qoi");
if (response.is_error()) if (response.is_error())
return; return;
auto result = editor->image().export_qoi_to_file(response.value()); auto result = editor->image().export_qoi_to_file(response.value());
@ -410,7 +410,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
})); }));
m_edit_menu->add_action(GUI::Action::create( m_edit_menu->add_action(GUI::Action::create(
"Sa&ve Color Palette", g_icon_bag.save_color_palette, [&](auto&) { "Sa&ve Color Palette", g_icon_bag.save_color_palette, [&](auto&) {
auto response = FileSystemAccessClient::Client::the().try_save_file(&window, "untitled", "palette"); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(&window, "untitled", "palette");
if (response.is_error()) if (response.is_error())
return; return;

2
Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp
View file

@ -155,7 +155,7 @@ SpreadsheetWidget::SpreadsheetWidget(GUI::Window& parent_window, NonnullRefPtrVe
m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
DeprecatedString name = "workbook"; DeprecatedString name = "workbook";
auto response = FileSystemAccessClient::Client::the().try_save_file(window(), name, "sheets"); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(window(), name, "sheets");
if (response.is_error()) if (response.is_error())
return; return;
save(*response.value()); save(*response.value());

2
Userland/Applications/TextEditor/MainWidget.cpp
View file

@ -280,7 +280,7 @@ MainWidget::MainWidget()
}); });
m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
auto response = FileSystemAccessClient::Client::the().try_save_file(window(), m_name, m_extension); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(window(), m_name, m_extension);
if (response.is_error()) if (response.is_error())
return; return;

4
Userland/Applications/ThemeEditor/MainWidget.cpp
View file

@ -222,7 +222,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return; return;
save_to_file(result.value()); save_to_file(result.value());
} else { } else {
auto result = FileSystemAccessClient::Client::the().try_save_file(&window, "Theme", "ini", Core::OpenMode::ReadWrite | Core::OpenMode::Truncate); auto result = FileSystemAccessClient::Client::the().try_save_file_deprecated(&window, "Theme", "ini", Core::OpenMode::ReadWrite | Core::OpenMode::Truncate);
if (result.is_error()) if (result.is_error())
return; return;
save_to_file(result.value()); save_to_file(result.value());
@ -231,7 +231,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_action));
TRY(file_menu->try_add_action(GUI::CommonActions::make_save_as_action([&](auto&) { TRY(file_menu->try_add_action(GUI::CommonActions::make_save_as_action([&](auto&) {
auto result = FileSystemAccessClient::Client::the().try_save_file(&window, "Theme", "ini", Core::OpenMode::ReadWrite | Core::OpenMode::Truncate); auto result = FileSystemAccessClient::Client::the().try_save_file_deprecated(&window, "Theme", "ini", Core::OpenMode::ReadWrite | Core::OpenMode::Truncate);
if (result.is_error()) if (result.is_error())
return; return;
save_to_file(result.value()); save_to_file(result.value());

2
Userland/DevTools/GMLPlayground/main.cpp
View file

@ -134,7 +134,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto file_menu = TRY(window->try_add_menu("&File")); auto file_menu = TRY(window->try_add_menu("&File"));
auto save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { auto save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
auto response = FileSystemAccessClient::Client::the().try_save_file(window, "Untitled", "gml"); auto response = FileSystemAccessClient::Client::the().try_save_file_deprecated(window, "Untitled", "gml");
if (response.is_error()) if (response.is_error())
return; return;

2
Userland/Games/Chess/main.cpp
View file

@ -75,7 +75,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
dbgln("Imported PGN file from {}", result.value()->filename()); dbgln("Imported PGN file from {}", result.value()->filename());
}))); })));
TRY(game_menu->try_add_action(GUI::Action::create("&Export PGN...", { Mod_Ctrl, Key_S }, [&](auto&) { TRY(game_menu->try_add_action(GUI::Action::create("&Export PGN...", { Mod_Ctrl, Key_S }, [&](auto&) {
auto result = FileSystemAccessClient::Client::the().try_save_file(window, "Untitled", "pgn"); auto result = FileSystemAccessClient::Client::the().try_save_file_deprecated(window, "Untitled", "pgn");
if (result.is_error()) if (result.is_error())
return; return;

2
Userland/Libraries/LibFileSystemAccessClient/Client.cpp
View file

@ -93,7 +93,7 @@ DeprecatedResult Client::try_open_file(GUI::Window* parent_window, DeprecatedStr
return handle_promise(id); return handle_promise(id);
} }
DeprecatedResult Client::try_save_file(GUI::Window* parent_window, DeprecatedString const& name, DeprecatedString const ext, Core::OpenMode requested_access) DeprecatedResult Client::try_save_file_deprecated(GUI::Window* parent_window, DeprecatedString const& name, DeprecatedString const ext, Core::OpenMode requested_access)
{ {
auto const id = get_new_id(); auto const id = get_new_id();
m_promises.set(id, PromiseAndWindow { Core::Promise<DeprecatedResult>::construct(), parent_window }); m_promises.set(id, PromiseAndWindow { Core::Promise<DeprecatedResult>::construct(), parent_window });

2
Userland/Libraries/LibFileSystemAccessClient/Client.h
View file

@ -29,7 +29,7 @@ public:
DeprecatedResult try_request_file_read_only_approved(GUI::Window* parent_window, DeprecatedString const& path); DeprecatedResult try_request_file_read_only_approved(GUI::Window* parent_window, DeprecatedString const& path);
DeprecatedResult try_request_file(GUI::Window* parent_window, DeprecatedString const& path, Core::OpenMode mode); DeprecatedResult try_request_file(GUI::Window* parent_window, DeprecatedString const& path, Core::OpenMode mode);
DeprecatedResult try_open_file(GUI::Window* parent_window, DeprecatedString const& window_title = {}, StringView path = Core::StandardPaths::home_directory(), Core::OpenMode requested_access = Core::OpenMode::ReadOnly); DeprecatedResult try_open_file(GUI::Window* parent_window, DeprecatedString const& window_title = {}, StringView path = Core::StandardPaths::home_directory(), Core::OpenMode requested_access = Core::OpenMode::ReadOnly);
DeprecatedResult try_save_file(GUI::Window* parent_window, DeprecatedString const& name, DeprecatedString const ext, Core::OpenMode requested_access = Core::OpenMode::WriteOnly | Core::OpenMode::Truncate); DeprecatedResult try_save_file_deprecated(GUI::Window* parent_window, DeprecatedString const& name, DeprecatedString const ext, Core::OpenMode requested_access = Core::OpenMode::WriteOnly | Core::OpenMode::Truncate);
static Client& the(); static Client& the();