diff options
author | Tim Schumacher <timschumi@gmx.de> | 2023-02-09 03:02:46 +0100 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2023-02-13 00:50:07 +0000 |
commit | 606a3982f34d777f121fcc4aa964141199676c20 (patch) | |
tree | 836fef41d11f1b77f4dac7d699e5c9f720ee4ff1 /Userland/Applications/FileManager | |
parent | a96339b72b3b417ffaa4fbb4e7575149f749acaa (diff) | |
download | serenity-606a3982f34d777f121fcc4aa964141199676c20.zip |
LibCore: Move Stream-based file into the `Core` namespace
Diffstat (limited to 'Userland/Applications/FileManager')
3 files changed, 6 insertions, 5 deletions
diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp index a185c4e58e..90613a0be0 100644 --- a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp +++ b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp @@ -18,7 +18,7 @@ namespace FileManager { -FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation, NonnullOwnPtr<Core::Stream::BufferedFile> helper_pipe, int helper_pipe_fd) +FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation, NonnullOwnPtr<Core::BufferedFile> helper_pipe, int helper_pipe_fd) : m_operation(operation) , m_helper_pipe(move(helper_pipe)) { diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.h b/Userland/Applications/FileManager/FileOperationProgressWidget.h index 1fc7366f5e..907edd12f5 100644 --- a/Userland/Applications/FileManager/FileOperationProgressWidget.h +++ b/Userland/Applications/FileManager/FileOperationProgressWidget.h @@ -8,6 +8,7 @@ #include "FileUtils.h" #include <LibCore/ElapsedTimer.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <LibGUI/Widget.h> @@ -21,7 +22,7 @@ public: private: // FIXME: The helper_pipe_fd parameter is only needed because we can't get the fd from a Core::Stream. - FileOperationProgressWidget(FileOperation, NonnullOwnPtr<Core::Stream::BufferedFile> helper_pipe, int helper_pipe_fd); + FileOperationProgressWidget(FileOperation, NonnullOwnPtr<Core::BufferedFile> helper_pipe, int helper_pipe_fd); void did_finish(); void did_error(StringView message); @@ -34,6 +35,6 @@ private: FileOperation m_operation; RefPtr<Core::Notifier> m_notifier; - OwnPtr<Core::Stream::BufferedFile> m_helper_pipe; + OwnPtr<Core::BufferedFile> m_helper_pipe; }; } diff --git a/Userland/Applications/FileManager/FileUtils.cpp b/Userland/Applications/FileManager/FileUtils.cpp index c25b0457a8..0f5c3c423f 100644 --- a/Userland/Applications/FileManager/FileUtils.cpp +++ b/Userland/Applications/FileManager/FileUtils.cpp @@ -99,8 +99,8 @@ ErrorOr<void> run_file_operation(FileOperation operation, Vector<DeprecatedStrin VERIFY_NOT_REACHED(); } - 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))); + auto pipe_input_file = TRY(Core::File::adopt_fd(pipe_fds[0], Core::File::OpenMode::Read)); + auto buffered_pipe = TRY(Core::BufferedFile::create(move(pipe_input_file))); (void)TRY(window->set_main_widget<FileOperationProgressWidget>(operation, move(buffered_pipe), pipe_fds[0])); window->resize(320, 190); |