From 2b3790100a3d4f0b8c51e8d7d7a58a0877c545bc Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 20 Jan 2022 11:46:20 +0000 Subject: [PATCH] Browser: Convert file-downloading code to Core::Stream :^) --- Userland/Applications/Browser/DownloadWidget.cpp | 7 +++---- Userland/Applications/Browser/DownloadWidget.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp index 4b2fb937d6..880f9b4566 100644 --- a/Userland/Applications/Browser/DownloadWidget.cpp +++ b/Userland/Applications/Browser/DownloadWidget.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include #include +#include #include #include #include @@ -46,13 +45,13 @@ DownloadWidget::DownloadWidget(const URL& url) }; { - auto file_or_error = Core::File::open(m_destination_path, Core::OpenMode::WriteOnly); + auto file_or_error = Core::Stream::File::open(m_destination_path, Core::Stream::OpenMode::Write); if (file_or_error.is_error()) { GUI::MessageBox::show(window(), String::formatted("Cannot open {} for writing", m_destination_path), "Download failed", GUI::MessageBox::Type::Error); window()->close(); return; } - m_output_file_stream = make(*file_or_error.value()); + m_output_file_stream = file_or_error.release_value(); } m_download->on_finish = [this](bool success, auto) { did_finish(success); }; diff --git a/Userland/Applications/Browser/DownloadWidget.h b/Userland/Applications/Browser/DownloadWidget.h index 7d544eb9e4..8b37aab4ed 100644 --- a/Userland/Applications/Browser/DownloadWidget.h +++ b/Userland/Applications/Browser/DownloadWidget.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -37,7 +37,7 @@ private: RefPtr m_close_button; RefPtr m_close_on_finish_checkbox; RefPtr m_browser_image; - OwnPtr m_output_file_stream; + OwnPtr m_output_file_stream; Core::ElapsedTimer m_elapsed_timer; };