diff --git a/AK/BufferedStream.h b/AK/BufferedStream.h index 7c24828e3fc..b34868952f2 100644 --- a/AK/BufferedStream.h +++ b/AK/BufferedStream.h @@ -14,7 +14,7 @@ namespace AK { template -concept StreamLike = IsBaseOf; +concept StreamLike = IsBaseOf; template concept SeekableStreamLike = IsBaseOf; diff --git a/AK/LEB128.h b/AK/LEB128.h index fa01236fc0b..4054eb3bcb3 100644 --- a/AK/LEB128.h +++ b/AK/LEB128.h @@ -24,7 +24,7 @@ public: constexpr operator ValueType() const { return m_value; } - static ErrorOr> read_from_stream(AK::Stream& stream) + static ErrorOr> read_from_stream(Stream& stream) requires(Unsigned) { ValueType result {}; @@ -53,7 +53,7 @@ public: return LEB128 { result }; } - static ErrorOr> read_from_stream(AK::Stream& stream) + static ErrorOr> read_from_stream(Stream& stream) requires(Signed) { // Note: We read into a u64 to simplify the parsing logic; diff --git a/Ladybird/RequestManagerQt.h b/Ladybird/RequestManagerQt.h index eb8b7365c0e..4c3d99ea905 100644 --- a/Ladybird/RequestManagerQt.h +++ b/Ladybird/RequestManagerQt.h @@ -44,7 +44,7 @@ private: virtual void set_should_buffer_all_input(bool) override { } virtual bool stop() override { return false; } - virtual void stream_into(AK::Stream&) override { } + virtual void stream_into(Stream&) override { } void did_finish(); diff --git a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp index 080784ee13c..e6a988bafee 100644 --- a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp @@ -338,7 +338,7 @@ public:)~~~"); static i32 static_message_id() { return (int)MessageID::@message.pascal_name@; } virtual const char* message_name() const override { return "@endpoint.name@::@message.pascal_name@"; } - static ErrorOr> decode(AK::Stream& stream, Core::LocalSocket& socket) + static ErrorOr> decode(Stream& stream, Core::LocalSocket& socket) { IPC::Decoder decoder { stream, socket };)~~~"); diff --git a/Meta/Lagom/Wasm/js_repl.cpp b/Meta/Lagom/Wasm/js_repl.cpp index b508b92fa6e..2db5097a213 100644 --- a/Meta/Lagom/Wasm/js_repl.cpp +++ b/Meta/Lagom/Wasm/js_repl.cpp @@ -62,7 +62,7 @@ void displayln(CheckedFormatString format_string, Args const&... args) void displayln() { user_display("\n", 1); } -class UserDisplayStream final : public AK::Stream { +class UserDisplayStream final : public Stream { virtual ErrorOr read(Bytes) override { return Error::from_string_view("Not readable"sv); }; virtual ErrorOr write(ReadonlyBytes bytes) override { diff --git a/Tests/AK/TestBitStream.cpp b/Tests/AK/TestBitStream.cpp index 06ffa0a5741..a76b4a778a8 100644 --- a/Tests/AK/TestBitStream.cpp +++ b/Tests/AK/TestBitStream.cpp @@ -15,8 +15,8 @@ TEST_CASE(little_endian_bit_stream_input_output_match) // Note: The bit stream only ever reads from/writes to the underlying stream in one byte chunks, // so testing with sizes that will not trigger a write will yield unexpected results. - LittleEndianOutputBitStream bit_write_stream { MaybeOwned(*memory_stream) }; - LittleEndianInputBitStream bit_read_stream { MaybeOwned(*memory_stream) }; + LittleEndianOutputBitStream bit_write_stream { MaybeOwned(*memory_stream) }; + LittleEndianInputBitStream bit_read_stream { MaybeOwned(*memory_stream) }; // Test two mirrored chunks of a fully mirrored pattern to check that we are not dropping bits. { @@ -71,8 +71,8 @@ TEST_CASE(big_endian_bit_stream_input_output_match) // Note: The bit stream only ever reads from/writes to the underlying stream in one byte chunks, // so testing with sizes that will not trigger a write will yield unexpected results. - BigEndianOutputBitStream bit_write_stream { MaybeOwned(*memory_stream) }; - BigEndianInputBitStream bit_read_stream { MaybeOwned(*memory_stream) }; + BigEndianOutputBitStream bit_write_stream { MaybeOwned(*memory_stream) }; + BigEndianInputBitStream bit_read_stream { MaybeOwned(*memory_stream) }; // Test two mirrored chunks of a fully mirrored pattern to check that we are not dropping bits. { diff --git a/Userland/Applications/PixelPaint/Image.cpp b/Userland/Applications/PixelPaint/Image.cpp index 42b5b70fb3f..7d0f5dfb184 100644 --- a/Userland/Applications/PixelPaint/Image.cpp +++ b/Userland/Applications/PixelPaint/Image.cpp @@ -171,7 +171,7 @@ RefPtr Image::copy_bitmap(Selection const& selection) const return cropped_bitmap_or_error.release_value_but_fixme_should_propagate_errors(); } -ErrorOr Image::export_bmp_to_file(NonnullOwnPtr stream, bool preserve_alpha_channel) const +ErrorOr Image::export_bmp_to_file(NonnullOwnPtr stream, bool preserve_alpha_channel) const { auto bitmap_format = preserve_alpha_channel ? Gfx::BitmapFormat::BGRA8888 : Gfx::BitmapFormat::BGRx8888; auto bitmap = TRY(compose_bitmap(bitmap_format)); @@ -182,7 +182,7 @@ ErrorOr Image::export_bmp_to_file(NonnullOwnPtr stream, bool p return {}; } -ErrorOr Image::export_png_to_file(NonnullOwnPtr stream, bool preserve_alpha_channel) const +ErrorOr Image::export_png_to_file(NonnullOwnPtr stream, bool preserve_alpha_channel) const { auto bitmap_format = preserve_alpha_channel ? Gfx::BitmapFormat::BGRA8888 : Gfx::BitmapFormat::BGRx8888; auto bitmap = TRY(compose_bitmap(bitmap_format)); @@ -192,7 +192,7 @@ ErrorOr Image::export_png_to_file(NonnullOwnPtr stream, bool p return {}; } -ErrorOr Image::export_qoi_to_file(NonnullOwnPtr stream) const +ErrorOr Image::export_qoi_to_file(NonnullOwnPtr stream) const { auto bitmap = TRY(compose_bitmap(Gfx::BitmapFormat::BGRA8888)); diff --git a/Userland/Applications/PixelPaint/Image.h b/Userland/Applications/PixelPaint/Image.h index 599ad95036c..41cba3f1139 100644 --- a/Userland/Applications/PixelPaint/Image.h +++ b/Userland/Applications/PixelPaint/Image.h @@ -72,9 +72,9 @@ public: void paint_into(GUI::Painter&, Gfx::IntRect const& dest_rect, float scale) const; ErrorOr serialize_as_json(JsonObjectSerializer& json) const; - ErrorOr export_bmp_to_file(NonnullOwnPtr, bool preserve_alpha_channel) const; - ErrorOr export_png_to_file(NonnullOwnPtr, bool preserve_alpha_channel) const; - ErrorOr export_qoi_to_file(NonnullOwnPtr) const; + ErrorOr export_bmp_to_file(NonnullOwnPtr, bool preserve_alpha_channel) const; + ErrorOr export_png_to_file(NonnullOwnPtr, bool preserve_alpha_channel) const; + ErrorOr export_qoi_to_file(NonnullOwnPtr) const; void move_layer_to_front(Layer&); void move_layer_to_back(Layer&); diff --git a/Userland/Applications/Spreadsheet/ExportDialog.cpp b/Userland/Applications/Spreadsheet/ExportDialog.cpp index 35b1ca676f7..b4cfc87641d 100644 --- a/Userland/Applications/Spreadsheet/ExportDialog.cpp +++ b/Userland/Applications/Spreadsheet/ExportDialog.cpp @@ -88,7 +88,7 @@ CSVExportDialogPage::CSVExportDialogPage(Sheet const& sheet) update_preview(); } -auto CSVExportDialogPage::generate(AK::Stream& stream, GenerationType type) -> ErrorOr +auto CSVExportDialogPage::generate(Stream& stream, GenerationType type) -> ErrorOr { auto delimiter = TRY([this]() -> ErrorOr { if (m_delimiter_other_radio->is_checked()) { diff --git a/Userland/Applications/Spreadsheet/ExportDialog.h b/Userland/Applications/Spreadsheet/ExportDialog.h index c3e5fab677a..bdef59826b6 100644 --- a/Userland/Applications/Spreadsheet/ExportDialog.h +++ b/Userland/Applications/Spreadsheet/ExportDialog.h @@ -27,7 +27,7 @@ struct CSVExportDialogPage { Preview }; - ErrorOr generate(AK::Stream&, GenerationType); + ErrorOr generate(Stream&, GenerationType); protected: void update_preview(); diff --git a/Userland/Applications/Spreadsheet/Writers/CSV.h b/Userland/Applications/Spreadsheet/Writers/CSV.h index e8e07341d32..7fb5f4148d5 100644 --- a/Userland/Applications/Spreadsheet/Writers/CSV.h +++ b/Userland/Applications/Spreadsheet/Writers/CSV.h @@ -15,13 +15,13 @@ namespace Writer { class CSV { public: template - static ErrorOr generate(AK::Stream& output, ContainerType const& data, Vector headers = {}, WriterBehavior behaviors = default_behaviors()) + static ErrorOr generate(Stream& output, ContainerType const& data, Vector headers = {}, WriterBehavior behaviors = default_behaviors()) { return XSV::generate(output, data, { ",", "\"", WriterTraits::Repeat }, move(headers), behaviors); } template - static ErrorOr generate_preview(AK::Stream& output, ContainerType const& data, Vector headers = {}, WriterBehavior behaviors = default_behaviors()) + static ErrorOr generate_preview(Stream& output, ContainerType const& data, Vector headers = {}, WriterBehavior behaviors = default_behaviors()) { return XSV::generate_preview(output, data, { ",", "\"", WriterTraits::Repeat }, move(headers), behaviors); } diff --git a/Userland/Applications/Spreadsheet/Writers/XSV.h b/Userland/Applications/Spreadsheet/Writers/XSV.h index f003dfadf7a..f7272032c97 100644 --- a/Userland/Applications/Spreadsheet/Writers/XSV.h +++ b/Userland/Applications/Spreadsheet/Writers/XSV.h @@ -42,7 +42,7 @@ constexpr WriterBehavior default_behaviors() template> class XSV { public: - static ErrorOr generate(AK::Stream& output, ContainerType const& data, WriterTraits traits, HeaderType headers = {}, WriterBehavior behaviors = default_behaviors()) + static ErrorOr generate(Stream& output, ContainerType const& data, WriterTraits traits, HeaderType headers = {}, WriterBehavior behaviors = default_behaviors()) { auto writer = XSV(output, data, traits, headers, behaviors); auto with_headers = has_flag(writer.m_behaviors, WriterBehavior::WriteHeaders); @@ -63,7 +63,7 @@ public: return {}; } - static ErrorOr generate_preview(AK::Stream& output, ContainerType const& data, WriterTraits traits, HeaderType headers = {}, WriterBehavior behaviors = default_behaviors()) + static ErrorOr generate_preview(Stream& output, ContainerType const& data, WriterTraits traits, HeaderType headers = {}, WriterBehavior behaviors = default_behaviors()) { auto writer = XSV(output, data, traits, headers, behaviors); auto lines_written = 0; @@ -93,7 +93,7 @@ public: } private: - XSV(AK::Stream& output, ContainerType const& data, WriterTraits traits, HeaderType headers = {}, WriterBehavior behaviors = default_behaviors()) + XSV(Stream& output, ContainerType const& data, WriterTraits traits, HeaderType headers = {}, WriterBehavior behaviors = default_behaviors()) : m_data(data) , m_traits(move(traits)) , m_behaviors(behaviors) @@ -170,7 +170,7 @@ private: WriterTraits m_traits; WriterBehavior m_behaviors; HeaderType m_names; - AK::Stream& m_output; + Stream& m_output; }; } diff --git a/Userland/DevTools/UserspaceEmulator/Emulator.cpp b/Userland/DevTools/UserspaceEmulator/Emulator.cpp index c4157b1ca43..93e0c41a1f4 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator.cpp +++ b/Userland/DevTools/UserspaceEmulator/Emulator.cpp @@ -499,7 +499,7 @@ void Emulator::dump_backtrace() dump_backtrace(raw_backtrace()); } -void Emulator::emit_profile_sample(AK::Stream& output) +void Emulator::emit_profile_sample(Stream& output) { if (!is_in_region_of_interest()) return; @@ -512,7 +512,7 @@ void Emulator::emit_profile_sample(AK::Stream& output) output.write_entire_buffer(builder.string_view().bytes()).release_value_but_fixme_should_propagate_errors(); } -void Emulator::emit_profile_event(AK::Stream& output, StringView event_name, DeprecatedString const& contents) +void Emulator::emit_profile_event(Stream& output, StringView event_name, DeprecatedString const& contents) { StringBuilder builder; timeval tv {}; diff --git a/Userland/DevTools/UserspaceEmulator/Emulator.h b/Userland/DevTools/UserspaceEmulator/Emulator.h index 8675911b194..c08be6e9c37 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator.h +++ b/Userland/DevTools/UserspaceEmulator/Emulator.h @@ -32,7 +32,7 @@ public: Emulator(DeprecatedString const& executable_path, Vector const& arguments, Vector const& environment); - void set_profiling_details(bool should_dump_profile, size_t instruction_interval, AK::Stream* profile_stream, NonnullOwnPtrVector* profiler_strings, Vector* profiler_string_id_map) + void set_profiling_details(bool should_dump_profile, size_t instruction_interval, Stream* profile_stream, NonnullOwnPtrVector* profiler_strings, Vector* profiler_string_id_map) { m_is_profiling = should_dump_profile; m_profile_instruction_interval = instruction_interval; @@ -46,7 +46,7 @@ public: m_is_in_region_of_interest = value; } - AK::Stream& profile_stream() { return *m_profile_stream; } + Stream& profile_stream() { return *m_profile_stream; } NonnullOwnPtrVector& profiler_strings() { return *m_profiler_strings; } Vector& profiler_string_id_map() { return *m_profiler_string_id_map; } @@ -139,8 +139,8 @@ private: void send_signal(int); - void emit_profile_sample(AK::Stream&); - void emit_profile_event(AK::Stream&, StringView event_name, DeprecatedString const& contents); + void emit_profile_sample(Stream&); + void emit_profile_event(Stream&, StringView event_name, DeprecatedString const& contents); int virt$accept4(FlatPtr); u32 virt$allocate_tls(FlatPtr, size_t); @@ -295,7 +295,7 @@ private: RangeAllocator m_range_allocator; - AK::Stream* m_profile_stream { nullptr }; + Stream* m_profile_stream { nullptr }; Vector* m_profiler_string_id_map { nullptr }; NonnullOwnPtrVector* m_profiler_strings { nullptr }; diff --git a/Userland/DevTools/UserspaceEmulator/main.cpp b/Userland/DevTools/UserspaceEmulator/main.cpp index 52e497f69d1..097128e7988 100644 --- a/Userland/DevTools/UserspaceEmulator/main.cpp +++ b/Userland/DevTools/UserspaceEmulator/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char** argv, char** env) if (dump_profile && profile_dump_path.is_empty()) profile_dump_path = DeprecatedString::formatted("{}.{}.profile", LexicalPath(executable_path).basename(), getpid()); - OwnPtr profile_stream; + OwnPtr profile_stream; OwnPtr> profile_strings; OwnPtr> profile_string_id_map; diff --git a/Userland/Libraries/LibArchive/TarStream.cpp b/Userland/Libraries/LibArchive/TarStream.cpp index 53f8625d05c..f2c7725cefc 100644 --- a/Userland/Libraries/LibArchive/TarStream.cpp +++ b/Userland/Libraries/LibArchive/TarStream.cpp @@ -52,7 +52,7 @@ ErrorOr TarFileStream::write(ReadonlyBytes) return Error::from_errno(EBADF); } -ErrorOr> TarInputStream::construct(NonnullOwnPtr stream) +ErrorOr> TarInputStream::construct(NonnullOwnPtr stream) { auto tar_stream = TRY(adopt_nonnull_own_or_enomem(new (nothrow) TarInputStream(move(stream)))); @@ -61,7 +61,7 @@ ErrorOr> TarInputStream::construct(NonnullOwnPtr stream) +TarInputStream::TarInputStream(NonnullOwnPtr stream) : m_stream(move(stream)) { } @@ -137,7 +137,7 @@ TarFileStream TarInputStream::file_contents() return TarFileStream(*this); } -TarOutputStream::TarOutputStream(MaybeOwned stream) +TarOutputStream::TarOutputStream(MaybeOwned stream) : m_stream(move(stream)) { } diff --git a/Userland/Libraries/LibArchive/TarStream.h b/Userland/Libraries/LibArchive/TarStream.h index 370b4a36212..61e104b35b6 100644 --- a/Userland/Libraries/LibArchive/TarStream.h +++ b/Userland/Libraries/LibArchive/TarStream.h @@ -16,7 +16,7 @@ namespace Archive { class TarInputStream; -class TarFileStream : public AK::Stream { +class TarFileStream : public Stream { public: virtual ErrorOr read(Bytes) override; virtual ErrorOr write(ReadonlyBytes) override; @@ -34,7 +34,7 @@ private: class TarInputStream { public: - static ErrorOr> construct(NonnullOwnPtr); + static ErrorOr> construct(NonnullOwnPtr); ErrorOr advance(); bool finished() const { return m_found_end_of_archive || m_stream->is_eof(); } ErrorOr valid() const; @@ -45,11 +45,11 @@ public: ErrorOr for_each_extended_header(F func); private: - TarInputStream(NonnullOwnPtr); + TarInputStream(NonnullOwnPtr); ErrorOr load_next_header(); TarFileHeader m_header; - NonnullOwnPtr m_stream; + NonnullOwnPtr m_stream; unsigned long m_file_offset { 0 }; int m_generation { 0 }; bool m_found_end_of_archive { false }; @@ -59,14 +59,14 @@ private: class TarOutputStream { public: - TarOutputStream(MaybeOwned); + TarOutputStream(MaybeOwned); ErrorOr add_file(StringView path, mode_t, ReadonlyBytes); ErrorOr add_link(StringView path, mode_t, StringView); ErrorOr add_directory(StringView path, mode_t); ErrorOr finish(); private: - MaybeOwned m_stream; + MaybeOwned m_stream; bool m_finished { false }; friend class TarFileStream; diff --git a/Userland/Libraries/LibArchive/Zip.cpp b/Userland/Libraries/LibArchive/Zip.cpp index 535ebce4034..33e5e6e70ee 100644 --- a/Userland/Libraries/LibArchive/Zip.cpp +++ b/Userland/Libraries/LibArchive/Zip.cpp @@ -102,7 +102,7 @@ ErrorOr Zip::for_each_member(Function return true; } -ZipOutputStream::ZipOutputStream(NonnullOwnPtr stream) +ZipOutputStream::ZipOutputStream(NonnullOwnPtr stream) : m_stream(move(stream)) { } diff --git a/Userland/Libraries/LibArchive/Zip.h b/Userland/Libraries/LibArchive/Zip.h index 2cf7c4341b8..e7f1ccbf596 100644 --- a/Userland/Libraries/LibArchive/Zip.h +++ b/Userland/Libraries/LibArchive/Zip.h @@ -57,7 +57,7 @@ struct [[gnu::packed]] EndOfCentralDirectory { return true; } - ErrorOr write(AK::Stream& stream) const + ErrorOr write(Stream& stream) const { auto write_value = [&stream](auto value) { return stream.write_entire_buffer({ &value, sizeof(value) }); @@ -143,7 +143,7 @@ struct [[gnu::packed]] CentralDirectoryRecord { return true; } - ErrorOr write(AK::Stream& stream) const + ErrorOr write(Stream& stream) const { auto write_value = [&stream](auto value) { return stream.write_entire_buffer({ &value, sizeof(value) }); @@ -212,7 +212,7 @@ struct [[gnu::packed]] LocalFileHeader { return true; } - ErrorOr write(AK::Stream& stream) const + ErrorOr write(Stream& stream) const { auto write_value = [&stream](auto value) { return stream.write_entire_buffer({ &value, sizeof(value) }); @@ -271,13 +271,13 @@ private: class ZipOutputStream { public: - ZipOutputStream(NonnullOwnPtr); + ZipOutputStream(NonnullOwnPtr); ErrorOr add_member(ZipMember const&); ErrorOr finish(); private: - NonnullOwnPtr m_stream; + NonnullOwnPtr m_stream; Vector m_members; bool m_finished { false }; diff --git a/Userland/Libraries/LibAudio/FlacLoader.cpp b/Userland/Libraries/LibAudio/FlacLoader.cpp index e79c823b6a7..8709ecdb44a 100644 --- a/Userland/Libraries/LibAudio/FlacLoader.cpp +++ b/Userland/Libraries/LibAudio/FlacLoader.cpp @@ -60,7 +60,7 @@ MaybeLoaderError FlacLoaderPlugin::initialize() // 11.5 STREAM MaybeLoaderError FlacLoaderPlugin::parse_header() { - BigEndianInputBitStream bit_input { MaybeOwned(*m_stream) }; + BigEndianInputBitStream bit_input { MaybeOwned(*m_stream) }; // A mixture of VERIFY and the non-crashing TRY(). #define FLAC_VERIFY(check, category, msg) \ @@ -79,7 +79,7 @@ MaybeLoaderError FlacLoaderPlugin::parse_header() auto streaminfo = TRY(next_meta_block(bit_input)); FLAC_VERIFY(streaminfo.type == FlacMetadataBlockType::STREAMINFO, LoaderError::Category::Format, "First block must be STREAMINFO"); FixedMemoryStream streaminfo_data_memory { streaminfo.data.bytes() }; - BigEndianInputBitStream streaminfo_data { MaybeOwned(streaminfo_data_memory) }; + BigEndianInputBitStream streaminfo_data { MaybeOwned(streaminfo_data_memory) }; // 11.10 METADATA_BLOCK_STREAMINFO m_min_block_size = LOADER_TRY(streaminfo_data.read_bits(16)); @@ -150,7 +150,7 @@ MaybeLoaderError FlacLoaderPlugin::parse_header() MaybeLoaderError FlacLoaderPlugin::load_picture(FlacRawMetadataBlock& block) { FixedMemoryStream memory_stream { block.data.bytes() }; - BigEndianInputBitStream picture_block_bytes { MaybeOwned(memory_stream) }; + BigEndianInputBitStream picture_block_bytes { MaybeOwned(memory_stream) }; PictureData picture {}; @@ -187,7 +187,7 @@ MaybeLoaderError FlacLoaderPlugin::load_picture(FlacRawMetadataBlock& block) MaybeLoaderError FlacLoaderPlugin::load_seektable(FlacRawMetadataBlock& block) { FixedMemoryStream memory_stream { block.data.bytes() }; - BigEndianInputBitStream seektable_bytes { MaybeOwned(memory_stream) }; + BigEndianInputBitStream seektable_bytes { MaybeOwned(memory_stream) }; for (size_t i = 0; i < block.length / 18; ++i) { // 11.14. SEEKPOINT FlacSeekPoint seekpoint { @@ -333,7 +333,7 @@ MaybeLoaderError FlacLoaderPlugin::next_frame(Span target_vector) } \ } while (0) - BigEndianInputBitStream bit_stream { MaybeOwned(*m_stream) }; + BigEndianInputBitStream bit_stream { MaybeOwned(*m_stream) }; // TODO: Check the CRC-16 checksum (and others) by keeping track of read data diff --git a/Userland/Libraries/LibAudio/MP3Loader.cpp b/Userland/Libraries/LibAudio/MP3Loader.cpp index 0bb9a5873a5..d8bd4be9a42 100644 --- a/Userland/Libraries/LibAudio/MP3Loader.cpp +++ b/Userland/Libraries/LibAudio/MP3Loader.cpp @@ -42,7 +42,7 @@ Result, LoaderError> MP3LoaderPlugin::create(Byte MaybeLoaderError MP3LoaderPlugin::initialize() { - m_bitstream = LOADER_TRY(try_make(MaybeOwned(*m_stream))); + m_bitstream = LOADER_TRY(try_make(MaybeOwned(*m_stream))); TRY(synchronize()); @@ -243,7 +243,7 @@ ErrorOr MP3LoaderPlugin::read_frame_data(MP3::Header TRY(m_bit_reservoir.discard(old_reservoir_size - frame.main_data_begin)); - BigEndianInputBitStream reservoir_stream { MaybeOwned(m_bit_reservoir) }; + BigEndianInputBitStream reservoir_stream { MaybeOwned(m_bit_reservoir) }; for (size_t granule_index = 0; granule_index < 2; granule_index++) { for (size_t channel_index = 0; channel_index < header.channel_count(); channel_index++) { diff --git a/Userland/Libraries/LibAudio/WavLoader.cpp b/Userland/Libraries/LibAudio/WavLoader.cpp index 3a9723883bf..d69bd734c6f 100644 --- a/Userland/Libraries/LibAudio/WavLoader.cpp +++ b/Userland/Libraries/LibAudio/WavLoader.cpp @@ -52,7 +52,7 @@ MaybeLoaderError WavLoaderPlugin::initialize() } template -MaybeLoaderError WavLoaderPlugin::read_samples_from_stream(AK::Stream& stream, SampleReader read_sample, FixedArray& samples) const +MaybeLoaderError WavLoaderPlugin::read_samples_from_stream(Stream& stream, SampleReader read_sample, FixedArray& samples) const { switch (m_num_channels) { case 1: @@ -73,7 +73,7 @@ MaybeLoaderError WavLoaderPlugin::read_samples_from_stream(AK::Stream& stream, S } // There's no i24 type + we need to do the endianness conversion manually anyways. -static ErrorOr read_sample_int24(AK::Stream& stream) +static ErrorOr read_sample_int24(Stream& stream) { u8 byte = 0; TRY(stream.read(Bytes { &byte, 1 })); @@ -94,7 +94,7 @@ static ErrorOr read_sample_int24(AK::Stream& stream) } template -static ErrorOr read_sample(AK::Stream& stream) +static ErrorOr read_sample(Stream& stream) { T sample { 0 }; TRY(stream.read(Bytes { &sample, sizeof(T) })); diff --git a/Userland/Libraries/LibAudio/WavLoader.h b/Userland/Libraries/LibAudio/WavLoader.h index 0a022359e51..c1d8042301e 100644 --- a/Userland/Libraries/LibAudio/WavLoader.h +++ b/Userland/Libraries/LibAudio/WavLoader.h @@ -53,7 +53,7 @@ private: LoaderSamples samples_from_pcm_data(Bytes const& data, size_t samples_to_read) const; template - MaybeLoaderError read_samples_from_stream(AK::Stream& stream, SampleReader read_sample, FixedArray& samples) const; + MaybeLoaderError read_samples_from_stream(Stream& stream, SampleReader read_sample, FixedArray& samples) const; u32 m_sample_rate { 0 }; u16 m_num_channels { 0 }; diff --git a/Userland/Libraries/LibCompress/Brotli.h b/Userland/Libraries/LibCompress/Brotli.h index acd44b41f58..735abf9aa29 100644 --- a/Userland/Libraries/LibCompress/Brotli.h +++ b/Userland/Libraries/LibCompress/Brotli.h @@ -13,9 +13,6 @@ namespace Compress { -using AK::LittleEndianInputBitStream; -using AK::Stream; - class BrotliDecompressionStream : public Stream { public: enum class State { diff --git a/Userland/Libraries/LibCompress/Deflate.cpp b/Userland/Libraries/LibCompress/Deflate.cpp index 0dc24c55a1b..96fa7da2eca 100644 --- a/Userland/Libraries/LibCompress/Deflate.cpp +++ b/Userland/Libraries/LibCompress/Deflate.cpp @@ -189,13 +189,13 @@ ErrorOr DeflateDecompressor::UncompressedBlock::try_read_more() return true; } -ErrorOr> DeflateDecompressor::construct(MaybeOwned stream) +ErrorOr> DeflateDecompressor::construct(MaybeOwned stream) { auto output_buffer = TRY(CircularBuffer::create_empty(32 * KiB)); return TRY(adopt_nonnull_own_or_enomem(new (nothrow) DeflateDecompressor(move(stream), move(output_buffer)))); } -DeflateDecompressor::DeflateDecompressor(MaybeOwned stream, CircularBuffer output_buffer) +DeflateDecompressor::DeflateDecompressor(MaybeOwned stream, CircularBuffer output_buffer) : m_input_stream(make(move(stream))) , m_output_buffer(move(output_buffer)) { @@ -447,7 +447,7 @@ ErrorOr DeflateDecompressor::decode_codes(CanonicalCode& literal_code, Opt return {}; } -ErrorOr> DeflateCompressor::construct(MaybeOwned stream, CompressionLevel compression_level) +ErrorOr> DeflateCompressor::construct(MaybeOwned stream, CompressionLevel compression_level) { auto bit_stream = TRY(try_make(move(stream))); auto deflate_compressor = TRY(adopt_nonnull_own_or_enomem(new (nothrow) DeflateCompressor(move(bit_stream), compression_level))); @@ -1018,7 +1018,7 @@ ErrorOr DeflateCompressor::final_flush() ErrorOr DeflateCompressor::compress_all(ReadonlyBytes bytes, CompressionLevel compression_level) { auto output_stream = TRY(try_make()); - auto deflate_stream = TRY(DeflateCompressor::construct(MaybeOwned(*output_stream), compression_level)); + auto deflate_stream = TRY(DeflateCompressor::construct(MaybeOwned(*output_stream), compression_level)); TRY(deflate_stream->write_entire_buffer(bytes)); TRY(deflate_stream->final_flush()); diff --git a/Userland/Libraries/LibCompress/Deflate.h b/Userland/Libraries/LibCompress/Deflate.h index 203af4e5a41..1e165f9a7a0 100644 --- a/Userland/Libraries/LibCompress/Deflate.h +++ b/Userland/Libraries/LibCompress/Deflate.h @@ -39,7 +39,7 @@ private: Array m_bit_code_lengths {}; }; -class DeflateDecompressor final : public AK::Stream { +class DeflateDecompressor final : public Stream { private: class CompressedBlock { public: @@ -76,7 +76,7 @@ public: friend CompressedBlock; friend UncompressedBlock; - static ErrorOr> construct(MaybeOwned stream); + static ErrorOr> construct(MaybeOwned stream); ~DeflateDecompressor(); virtual ErrorOr read(Bytes) override; @@ -88,7 +88,7 @@ public: static ErrorOr decompress_all(ReadonlyBytes); private: - DeflateDecompressor(MaybeOwned stream, CircularBuffer buffer); + DeflateDecompressor(MaybeOwned stream, CircularBuffer buffer); ErrorOr decode_length(u32); ErrorOr decode_distance(u32); @@ -106,7 +106,7 @@ private: CircularBuffer m_output_buffer; }; -class DeflateCompressor final : public AK::Stream { +class DeflateCompressor final : public Stream { public: static constexpr size_t block_size = 32 * KiB - 1; // TODO: this can theoretically be increased to 64 KiB - 2 static constexpr size_t window_size = block_size * 2; @@ -141,7 +141,7 @@ public: BEST // WARNING: this one can take an unreasonable amount of time! }; - static ErrorOr> construct(MaybeOwned, CompressionLevel = CompressionLevel::GOOD); + static ErrorOr> construct(MaybeOwned, CompressionLevel = CompressionLevel::GOOD); ~DeflateCompressor(); virtual ErrorOr read(Bytes) override; diff --git a/Userland/Libraries/LibCompress/Gzip.cpp b/Userland/Libraries/LibCompress/Gzip.cpp index 3fcb2adb22b..0fb1980f4bd 100644 --- a/Userland/Libraries/LibCompress/Gzip.cpp +++ b/Userland/Libraries/LibCompress/Gzip.cpp @@ -38,9 +38,9 @@ bool BlockHeader::supported_by_implementation() const return true; } -ErrorOr> GzipDecompressor::Member::construct(BlockHeader header, AK::Stream& stream) +ErrorOr> GzipDecompressor::Member::construct(BlockHeader header, Stream& stream) { - auto deflate_stream = TRY(DeflateDecompressor::construct(MaybeOwned(stream))); + auto deflate_stream = TRY(DeflateDecompressor::construct(MaybeOwned(stream))); return TRY(adopt_nonnull_own_or_enomem(new (nothrow) Member(header, move(deflate_stream)))); } @@ -50,7 +50,7 @@ GzipDecompressor::Member::Member(BlockHeader header, NonnullOwnPtr stream) +GzipDecompressor::GzipDecompressor(NonnullOwnPtr stream) : m_input_stream(move(stream)) { } @@ -186,7 +186,7 @@ ErrorOr GzipDecompressor::write(ReadonlyBytes) return Error::from_errno(EBADF); } -GzipCompressor::GzipCompressor(MaybeOwned stream) +GzipCompressor::GzipCompressor(MaybeOwned stream) : m_output_stream(move(stream)) { } @@ -236,7 +236,7 @@ void GzipCompressor::close() ErrorOr GzipCompressor::compress_all(ReadonlyBytes bytes) { auto output_stream = TRY(try_make()); - GzipCompressor gzip_stream { MaybeOwned(*output_stream) }; + GzipCompressor gzip_stream { MaybeOwned(*output_stream) }; TRY(gzip_stream.write_entire_buffer(bytes)); diff --git a/Userland/Libraries/LibCompress/Gzip.h b/Userland/Libraries/LibCompress/Gzip.h index acf50e15b65..2a297103efb 100644 --- a/Userland/Libraries/LibCompress/Gzip.h +++ b/Userland/Libraries/LibCompress/Gzip.h @@ -40,9 +40,9 @@ struct Flags { static constexpr u8 MAX = FTEXT | FHCRC | FEXTRA | FNAME | FCOMMENT; }; -class GzipDecompressor final : public AK::Stream { +class GzipDecompressor final : public Stream { public: - GzipDecompressor(NonnullOwnPtr); + GzipDecompressor(NonnullOwnPtr); ~GzipDecompressor(); virtual ErrorOr read(Bytes) override; @@ -58,7 +58,7 @@ public: private: class Member { public: - static ErrorOr> construct(BlockHeader header, AK::Stream&); + static ErrorOr> construct(BlockHeader header, Stream&); BlockHeader m_header; NonnullOwnPtr m_stream; @@ -72,7 +72,7 @@ private: Member const& current_member() const { return *m_current_member; } Member& current_member() { return *m_current_member; } - NonnullOwnPtr m_input_stream; + NonnullOwnPtr m_input_stream; u8 m_partial_header[sizeof(BlockHeader)]; size_t m_partial_header_offset { 0 }; OwnPtr m_current_member {}; @@ -80,9 +80,9 @@ private: bool m_eof { false }; }; -class GzipCompressor final : public AK::Stream { +class GzipCompressor final : public Stream { public: - GzipCompressor(MaybeOwned); + GzipCompressor(MaybeOwned); virtual ErrorOr read(Bytes) override; virtual ErrorOr write(ReadonlyBytes) override; @@ -93,7 +93,7 @@ public: static ErrorOr compress_all(ReadonlyBytes bytes); private: - MaybeOwned m_output_stream; + MaybeOwned m_output_stream; }; } diff --git a/Userland/Libraries/LibCompress/Zlib.cpp b/Userland/Libraries/LibCompress/Zlib.cpp index a62d0633a1a..04fa6be768b 100644 --- a/Userland/Libraries/LibCompress/Zlib.cpp +++ b/Userland/Libraries/LibCompress/Zlib.cpp @@ -69,7 +69,7 @@ u32 ZlibDecompressor::checksum() return m_checksum; } -ErrorOr> ZlibCompressor::construct(MaybeOwned stream, ZlibCompressionLevel compression_level) +ErrorOr> ZlibCompressor::construct(MaybeOwned stream, ZlibCompressionLevel compression_level) { // Zlib only defines Deflate as a compression method. auto compression_method = ZlibCompressionMethod::Deflate; @@ -83,7 +83,7 @@ ErrorOr> ZlibCompressor::construct(MaybeOwned stream, NonnullOwnPtr compressor_stream) +ZlibCompressor::ZlibCompressor(MaybeOwned stream, NonnullOwnPtr compressor_stream) : m_output_stream(move(stream)) , m_compressor(move(compressor_stream)) { @@ -164,7 +164,7 @@ ErrorOr ZlibCompressor::finish() ErrorOr ZlibCompressor::compress_all(ReadonlyBytes bytes, ZlibCompressionLevel compression_level) { auto output_stream = TRY(try_make()); - auto zlib_stream = TRY(ZlibCompressor::construct(MaybeOwned(*output_stream), compression_level)); + auto zlib_stream = TRY(ZlibCompressor::construct(MaybeOwned(*output_stream), compression_level)); TRY(zlib_stream->write_entire_buffer(bytes)); diff --git a/Userland/Libraries/LibCompress/Zlib.h b/Userland/Libraries/LibCompress/Zlib.h index 56bb0e0f11a..44eb4e1bf48 100644 --- a/Userland/Libraries/LibCompress/Zlib.h +++ b/Userland/Libraries/LibCompress/Zlib.h @@ -62,9 +62,9 @@ private: ReadonlyBytes m_data_bytes; }; -class ZlibCompressor : public AK::Stream { +class ZlibCompressor : public Stream { public: - static ErrorOr> construct(MaybeOwned, ZlibCompressionLevel = ZlibCompressionLevel::Default); + static ErrorOr> construct(MaybeOwned, ZlibCompressionLevel = ZlibCompressionLevel::Default); ~ZlibCompressor(); virtual ErrorOr read(Bytes) override; @@ -77,12 +77,12 @@ public: static ErrorOr compress_all(ReadonlyBytes bytes, ZlibCompressionLevel = ZlibCompressionLevel::Default); private: - ZlibCompressor(MaybeOwned stream, NonnullOwnPtr compressor_stream); + ZlibCompressor(MaybeOwned stream, NonnullOwnPtr compressor_stream); ErrorOr write_header(ZlibCompressionMethod, ZlibCompressionLevel); bool m_finished { false }; - MaybeOwned m_output_stream; - NonnullOwnPtr m_compressor; + MaybeOwned m_output_stream; + NonnullOwnPtr m_compressor; Crypto::Checksum::Adler32 m_adler32_checksum; }; diff --git a/Userland/Libraries/LibCore/NetworkJob.cpp b/Userland/Libraries/LibCore/NetworkJob.cpp index d83814f503b..ac6ea631834 100644 --- a/Userland/Libraries/LibCore/NetworkJob.cpp +++ b/Userland/Libraries/LibCore/NetworkJob.cpp @@ -11,7 +11,7 @@ namespace Core { -NetworkJob::NetworkJob(AK::Stream& output_stream) +NetworkJob::NetworkJob(Stream& output_stream) : m_output_stream(output_stream) { } diff --git a/Userland/Libraries/LibCore/NetworkJob.h b/Userland/Libraries/LibCore/NetworkJob.h index dcd024e093a..5b013273be5 100644 --- a/Userland/Libraries/LibCore/NetworkJob.h +++ b/Userland/Libraries/LibCore/NetworkJob.h @@ -52,7 +52,7 @@ public: } protected: - NetworkJob(AK::Stream&); + NetworkJob(Stream&); void did_finish(NonnullRefPtr&&); void did_fail(Error); void did_progress(Optional total_size, u32 downloaded); @@ -61,7 +61,7 @@ protected: private: RefPtr m_response; - AK::Stream& m_output_stream; + Stream& m_output_stream; Error m_error { Error::None }; }; diff --git a/Userland/Libraries/LibCore/Socket.h b/Userland/Libraries/LibCore/Socket.h index 5b95e722866..08310046ce3 100644 --- a/Userland/Libraries/LibCore/Socket.h +++ b/Userland/Libraries/LibCore/Socket.h @@ -18,7 +18,7 @@ namespace Core { /// The Socket class is the base class for all concrete BSD-style socket /// classes. Sockets are non-seekable streams which can be read byte-wise. -class Socket : public AK::Stream { +class Socket : public Stream { public: Socket(Socket&&) = default; Socket& operator=(Socket&&) = default; diff --git a/Userland/Libraries/LibCrypto/ASN1/DER.cpp b/Userland/Libraries/LibCrypto/ASN1/DER.cpp index c3d661fa8ce..e5c069c9173 100644 --- a/Userland/Libraries/LibCrypto/ASN1/DER.cpp +++ b/Userland/Libraries/LibCrypto/ASN1/DER.cpp @@ -224,7 +224,7 @@ ErrorOr Decoder::leave() return {}; } -ErrorOr pretty_print(Decoder& decoder, AK::Stream& stream, int indent) +ErrorOr pretty_print(Decoder& decoder, Stream& stream, int indent) { while (!decoder.eof()) { auto tag = TRY(decoder.peek()); diff --git a/Userland/Libraries/LibCrypto/ASN1/DER.h b/Userland/Libraries/LibCrypto/ASN1/DER.h index 634a91ff0f2..d4333e5b940 100644 --- a/Userland/Libraries/LibCrypto/ASN1/DER.h +++ b/Userland/Libraries/LibCrypto/ASN1/DER.h @@ -211,6 +211,6 @@ private: Optional m_current_tag; }; -ErrorOr pretty_print(Decoder&, AK::Stream&, int indent = 0); +ErrorOr pretty_print(Decoder&, Stream&, int indent = 0); } diff --git a/Userland/Libraries/LibDNS/Name.cpp b/Userland/Libraries/LibDNS/Name.cpp index ccabb48c190..b6582b97174 100644 --- a/Userland/Libraries/LibDNS/Name.cpp +++ b/Userland/Libraries/LibDNS/Name.cpp @@ -76,7 +76,7 @@ void Name::randomize_case() m_name = builder.to_deprecated_string(); } -ErrorOr Name::write_to_stream(AK::Stream& stream) const +ErrorOr Name::write_to_stream(Stream& stream) const { auto parts = as_string().split_view('.'); for (auto& part : parts) { diff --git a/Userland/Libraries/LibDNS/Name.h b/Userland/Libraries/LibDNS/Name.h index 59c9a05f28b..cf84c8df8ed 100644 --- a/Userland/Libraries/LibDNS/Name.h +++ b/Userland/Libraries/LibDNS/Name.h @@ -21,7 +21,7 @@ public: size_t serialized_size() const; DeprecatedString const& as_string() const { return m_name; } - ErrorOr write_to_stream(AK::Stream&) const; + ErrorOr write_to_stream(Stream&) const; void randomize_case(); diff --git a/Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp b/Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp index 548480d0bdb..38e10b3b67e 100644 --- a/Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp +++ b/Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp @@ -10,7 +10,7 @@ namespace Debug::Dwarf { -AddressRangesV5::AddressRangesV5(NonnullOwnPtr range_lists_stream, CompilationUnit const& compilation_unit) +AddressRangesV5::AddressRangesV5(NonnullOwnPtr range_lists_stream, CompilationUnit const& compilation_unit) : m_range_lists_stream(move(range_lists_stream)) , m_compilation_unit(compilation_unit) { @@ -77,7 +77,7 @@ ErrorOr AddressRangesV5::for_each_range(Function callback) return {}; } -AddressRangesV4::AddressRangesV4(NonnullOwnPtr ranges_stream, CompilationUnit const& compilation_unit) +AddressRangesV4::AddressRangesV4(NonnullOwnPtr ranges_stream, CompilationUnit const& compilation_unit) : m_ranges_stream(move(ranges_stream)) , m_compilation_unit(compilation_unit) { diff --git a/Userland/Libraries/LibDebug/Dwarf/AddressRanges.h b/Userland/Libraries/LibDebug/Dwarf/AddressRanges.h index c1b77d254a4..8b8ec7b15b4 100644 --- a/Userland/Libraries/LibDebug/Dwarf/AddressRanges.h +++ b/Userland/Libraries/LibDebug/Dwarf/AddressRanges.h @@ -24,12 +24,12 @@ class AddressRangesV5 { public: // FIXME: This should be fine with using a non-owned stream. - AddressRangesV5(NonnullOwnPtr range_lists_stream, CompilationUnit const& compilation_unit); + AddressRangesV5(NonnullOwnPtr range_lists_stream, CompilationUnit const& compilation_unit); ErrorOr for_each_range(Function); private: - NonnullOwnPtr m_range_lists_stream; + NonnullOwnPtr m_range_lists_stream; CompilationUnit const& m_compilation_unit; }; @@ -38,12 +38,12 @@ class AddressRangesV4 { AK_MAKE_NONMOVABLE(AddressRangesV4); public: - AddressRangesV4(NonnullOwnPtr ranges_stream, CompilationUnit const&); + AddressRangesV4(NonnullOwnPtr ranges_stream, CompilationUnit const&); ErrorOr for_each_range(Function); private: - NonnullOwnPtr m_ranges_stream; + NonnullOwnPtr m_ranges_stream; CompilationUnit const& m_compilation_unit; }; diff --git a/Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h b/Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h index 6ae6d81c311..f429fd72296 100644 --- a/Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h +++ b/Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h @@ -55,7 +55,7 @@ struct [[gnu::packed]] CompilationUnitHeader { u32 abbrev_offset() const { return (common.version <= 4) ? v4.abbrev_offset : v5.abbrev_offset; } u8 address_size() const { return (common.version <= 4) ? v4.address_size : v5.address_size; } - static ErrorOr read_from_stream(AK::Stream& stream) + static ErrorOr read_from_stream(Stream& stream) { CompilationUnitHeader header; TRY(stream.read_entire_buffer(Bytes { &header.common, sizeof(header.common) })); diff --git a/Userland/Libraries/LibDebug/Dwarf/LineProgram.h b/Userland/Libraries/LibDebug/Dwarf/LineProgram.h index 15fba6b03ce..bbf9f877efb 100644 --- a/Userland/Libraries/LibDebug/Dwarf/LineProgram.h +++ b/Userland/Libraries/LibDebug/Dwarf/LineProgram.h @@ -65,7 +65,7 @@ struct [[gnu::packed]] LineProgramUnitHeader32 { u8 line_range() const { return (common.version <= 4) ? v4.line_range : v5.line_range; } u8 opcode_base() const { return (common.version <= 4) ? v4.opcode_base : v5.opcode_base; } - static ErrorOr read_from_stream(AK::Stream& stream) + static ErrorOr read_from_stream(Stream& stream) { LineProgramUnitHeader32 header; TRY(stream.read_entire_buffer(Bytes { &header.common, sizeof(header.common) })); diff --git a/Userland/Libraries/LibGemini/Job.cpp b/Userland/Libraries/LibGemini/Job.cpp index dbf1c5688a2..b7937c6af65 100644 --- a/Userland/Libraries/LibGemini/Job.cpp +++ b/Userland/Libraries/LibGemini/Job.cpp @@ -14,7 +14,7 @@ namespace Gemini { -Job::Job(GeminiRequest const& request, AK::Stream& output_stream) +Job::Job(GeminiRequest const& request, Stream& output_stream) : Core::NetworkJob(output_stream) , m_request(request) { diff --git a/Userland/Libraries/LibGemini/Job.h b/Userland/Libraries/LibGemini/Job.h index 904c242f7e9..e2f53df2adc 100644 --- a/Userland/Libraries/LibGemini/Job.h +++ b/Userland/Libraries/LibGemini/Job.h @@ -18,7 +18,7 @@ class Job : public Core::NetworkJob { C_OBJECT(Job); public: - explicit Job(GeminiRequest const&, AK::Stream&); + explicit Job(GeminiRequest const&, Stream&); virtual ~Job() override = default; virtual void start(Core::Socket&) override; diff --git a/Userland/Libraries/LibGfx/DDSLoader.cpp b/Userland/Libraries/LibGfx/DDSLoader.cpp index acf638fb94b..cd52d8d615d 100644 --- a/Userland/Libraries/LibGfx/DDSLoader.cpp +++ b/Userland/Libraries/LibGfx/DDSLoader.cpp @@ -202,7 +202,7 @@ static DXGIFormat get_format(DDSPixelFormat format) return DXGI_FORMAT_UNKNOWN; } -static ErrorOr decode_dx5_alpha_block(AK::Stream& stream, DDSLoadingContext& context, u64 bitmap_x, u64 bitmap_y) +static ErrorOr decode_dx5_alpha_block(Stream& stream, DDSLoadingContext& context, u64 bitmap_x, u64 bitmap_y) { auto color0 = TRY(stream.read_value>()); auto color1 = TRY(stream.read_value>()); @@ -265,7 +265,7 @@ static ErrorOr decode_dx5_alpha_block(AK::Stream& stream, DDSLoadingContex return {}; } -static ErrorOr decode_dx3_alpha_block(AK::Stream& stream, DDSLoadingContext& context, u64 bitmap_x, u64 bitmap_y) +static ErrorOr decode_dx3_alpha_block(Stream& stream, DDSLoadingContext& context, u64 bitmap_x, u64 bitmap_y) { auto a0 = TRY(stream.read_value>()); auto a1 = TRY(stream.read_value>()); @@ -313,7 +313,7 @@ static void unpack_rbg_565(u32 rgb, u8* output) output[3] = 255; } -static ErrorOr decode_color_block(AK::Stream& stream, DDSLoadingContext& context, bool dxt1, u64 bitmap_x, u64 bitmap_y) +static ErrorOr decode_color_block(Stream& stream, DDSLoadingContext& context, bool dxt1, u64 bitmap_x, u64 bitmap_y) { auto c0_low = TRY(stream.read_value>()); auto c0_high = TRY(stream.read_value>()); @@ -369,7 +369,7 @@ static ErrorOr decode_color_block(AK::Stream& stream, DDSLoadingContext& c return {}; } -static ErrorOr decode_dxt(AK::Stream& stream, DDSLoadingContext& context, DXGIFormat format, u64 width, u64 y) +static ErrorOr decode_dxt(Stream& stream, DDSLoadingContext& context, DXGIFormat format, u64 width, u64 y) { if (format == DXGI_FORMAT_BC1_UNORM) { for (size_t x = 0; x < width; x += 4) { @@ -393,7 +393,7 @@ static ErrorOr decode_dxt(AK::Stream& stream, DDSLoadingContext& context, return {}; } -static ErrorOr decode_bitmap(AK::Stream& stream, DDSLoadingContext& context, DXGIFormat format, u64 width, u64 height) +static ErrorOr decode_bitmap(Stream& stream, DDSLoadingContext& context, DXGIFormat format, u64 width, u64 height) { Vector dxt_formats = { DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC3_UNORM }; if (dxt_formats.contains_slow(format)) { diff --git a/Userland/Libraries/LibGfx/GIFLoader.cpp b/Userland/Libraries/LibGfx/GIFLoader.cpp index 26a52083806..d952d05ed74 100644 --- a/Userland/Libraries/LibGfx/GIFLoader.cpp +++ b/Userland/Libraries/LibGfx/GIFLoader.cpp @@ -89,7 +89,7 @@ enum class GIFFormat { GIF89a, }; -static ErrorOr decode_gif_header(AK::Stream& stream) +static ErrorOr decode_gif_header(Stream& stream) { static auto valid_header_87 = "GIF87a"sv; static auto valid_header_89 = "GIF89a"sv; diff --git a/Userland/Libraries/LibGfx/ICOLoader.cpp b/Userland/Libraries/LibGfx/ICOLoader.cpp index ad4fcb5edf7..fb6b25baa2b 100644 --- a/Userland/Libraries/LibGfx/ICOLoader.cpp +++ b/Userland/Libraries/LibGfx/ICOLoader.cpp @@ -75,7 +75,7 @@ struct ICOLoadingContext { size_t largest_index; }; -static ErrorOr decode_ico_header(AK::Stream& stream) +static ErrorOr decode_ico_header(Stream& stream) { auto header = TRY(stream.read_value()); if (header.must_be_0 != 0 || header.must_be_1 != 1) @@ -83,7 +83,7 @@ static ErrorOr decode_ico_header(AK::Stream& stream) return { header.image_count }; } -static ErrorOr decode_ico_direntry(AK::Stream& stream) +static ErrorOr decode_ico_direntry(Stream& stream) { auto entry = TRY(stream.read_value()); ICOImageDescriptor desc = { entry.width, entry.height, entry.bits_per_pixel, entry.offset, entry.size, nullptr }; diff --git a/Userland/Libraries/LibGfx/JPGLoader.cpp b/Userland/Libraries/LibGfx/JPGLoader.cpp index 3fe1d8f2971..69124fb91a6 100644 --- a/Userland/Libraries/LibGfx/JPGLoader.cpp +++ b/Userland/Libraries/LibGfx/JPGLoader.cpp @@ -460,7 +460,7 @@ static inline bool is_valid_marker(const Marker marker) return false; } -static inline ErrorOr read_marker_at_cursor(AK::Stream& stream) +static inline ErrorOr read_marker_at_cursor(Stream& stream) { u16 marker = TRY(stream.read_value>()); if (is_valid_marker(marker)) @@ -839,7 +839,7 @@ static ErrorOr read_quantization_table(AK::SeekableStream& stream, JPGLoad return {}; } -static ErrorOr skip_marker_with_length(AK::Stream& stream) +static ErrorOr skip_marker_with_length(Stream& stream) { u16 bytes_to_skip = TRY(stream.read_value>()) - 2; TRY(stream.discard(bytes_to_skip)); diff --git a/Userland/Libraries/LibGfx/QOILoader.cpp b/Userland/Libraries/LibGfx/QOILoader.cpp index 08ee5f04a55..bddf442cd35 100644 --- a/Userland/Libraries/LibGfx/QOILoader.cpp +++ b/Userland/Libraries/LibGfx/QOILoader.cpp @@ -21,7 +21,7 @@ static constexpr u8 QOI_OP_RUN = 0b11000000; static constexpr u8 QOI_MASK_2 = 0b11000000; static constexpr u8 END_MARKER[] = { 0, 0, 0, 0, 0, 0, 0, 1 }; -static ErrorOr decode_qoi_header(AK::Stream& stream) +static ErrorOr decode_qoi_header(Stream& stream) { auto header = TRY(stream.read_value()); if (StringView { header.magic, array_size(header.magic) } != QOI_MAGIC) @@ -31,7 +31,7 @@ static ErrorOr decode_qoi_header(AK::Stream& stream) return header; } -static ErrorOr decode_qoi_op_rgb(AK::Stream& stream, u8 first_byte, Color pixel) +static ErrorOr decode_qoi_op_rgb(Stream& stream, u8 first_byte, Color pixel) { VERIFY(first_byte == QOI_OP_RGB); u8 bytes[3]; @@ -41,7 +41,7 @@ static ErrorOr decode_qoi_op_rgb(AK::Stream& stream, u8 first_byte, Color return Color { bytes[0], bytes[1], bytes[2], pixel.alpha() }; } -static ErrorOr decode_qoi_op_rgba(AK::Stream& stream, u8 first_byte) +static ErrorOr decode_qoi_op_rgba(Stream& stream, u8 first_byte) { VERIFY(first_byte == QOI_OP_RGBA); u8 bytes[4]; @@ -49,7 +49,7 @@ static ErrorOr decode_qoi_op_rgba(AK::Stream& stream, u8 first_byte) return Color { bytes[0], bytes[1], bytes[2], bytes[3] }; } -static ErrorOr decode_qoi_op_index(AK::Stream&, u8 first_byte) +static ErrorOr decode_qoi_op_index(Stream&, u8 first_byte) { VERIFY((first_byte & QOI_MASK_2) == QOI_OP_INDEX); u8 index = first_byte & ~QOI_MASK_2; @@ -57,7 +57,7 @@ static ErrorOr decode_qoi_op_index(AK::Stream&, u8 first_byte) return index; } -static ErrorOr decode_qoi_op_diff(AK::Stream&, u8 first_byte, Color pixel) +static ErrorOr decode_qoi_op_diff(Stream&, u8 first_byte, Color pixel) { VERIFY((first_byte & QOI_MASK_2) == QOI_OP_DIFF); u8 dr = (first_byte & 0b00110000) >> 4; @@ -74,7 +74,7 @@ static ErrorOr decode_qoi_op_diff(AK::Stream&, u8 first_byte, Color pixel }; } -static ErrorOr decode_qoi_op_luma(AK::Stream& stream, u8 first_byte, Color pixel) +static ErrorOr decode_qoi_op_luma(Stream& stream, u8 first_byte, Color pixel) { VERIFY((first_byte & QOI_MASK_2) == QOI_OP_LUMA); auto byte = TRY(stream.read_value()); @@ -91,7 +91,7 @@ static ErrorOr decode_qoi_op_luma(AK::Stream& stream, u8 first_byte, Colo }; } -static ErrorOr decode_qoi_op_run(AK::Stream&, u8 first_byte) +static ErrorOr decode_qoi_op_run(Stream&, u8 first_byte) { VERIFY((first_byte & QOI_MASK_2) == QOI_OP_RUN); u8 run = first_byte & ~QOI_MASK_2; @@ -107,7 +107,7 @@ static ErrorOr decode_qoi_op_run(AK::Stream&, u8 first_byte) return run; } -static ErrorOr decode_qoi_end_marker(AK::Stream& stream) +static ErrorOr decode_qoi_end_marker(Stream& stream) { u8 bytes[array_size(END_MARKER)]; TRY(stream.read_entire_buffer({ &bytes, array_size(bytes) })); @@ -118,7 +118,7 @@ static ErrorOr decode_qoi_end_marker(AK::Stream& stream) return {}; } -static ErrorOr> decode_qoi_image(AK::Stream& stream, u32 width, u32 height) +static ErrorOr> decode_qoi_image(Stream& stream, u32 width, u32 height) { // FIXME: Why is Gfx::Bitmap's size signed? Makes no sense whatsoever. if (width > NumericLimits::max()) @@ -162,7 +162,7 @@ static ErrorOr> decode_qoi_image(AK::Stream& stream, u32 w return { move(bitmap) }; } -QOIImageDecoderPlugin::QOIImageDecoderPlugin(NonnullOwnPtr stream) +QOIImageDecoderPlugin::QOIImageDecoderPlugin(NonnullOwnPtr stream) { m_context = make(); m_context->stream = move(stream); @@ -232,7 +232,7 @@ ErrorOr QOIImageDecoderPlugin::frame(size_t index) return ImageFrameDescriptor { m_context->bitmap, 0 }; } -ErrorOr QOIImageDecoderPlugin::decode_header_and_update_context(AK::Stream& stream) +ErrorOr QOIImageDecoderPlugin::decode_header_and_update_context(Stream& stream) { VERIFY(m_context->state < QOILoadingContext::State::HeaderDecoded); auto error_or_header = decode_qoi_header(stream); @@ -245,7 +245,7 @@ ErrorOr QOIImageDecoderPlugin::decode_header_and_update_context(AK::Stream return {}; } -ErrorOr QOIImageDecoderPlugin::decode_image_and_update_context(AK::Stream& stream) +ErrorOr QOIImageDecoderPlugin::decode_image_and_update_context(Stream& stream) { VERIFY(m_context->state < QOILoadingContext::State::ImageDecoded); auto error_or_bitmap = decode_qoi_image(stream, m_context->header.width, m_context->header.height); diff --git a/Userland/Libraries/LibGfx/QOILoader.h b/Userland/Libraries/LibGfx/QOILoader.h index 7631f982f65..e6555bdfe8a 100644 --- a/Userland/Libraries/LibGfx/QOILoader.h +++ b/Userland/Libraries/LibGfx/QOILoader.h @@ -31,7 +31,7 @@ struct QOILoadingContext { Error, }; State state { State::NotDecoded }; - OwnPtr stream {}; + OwnPtr stream {}; QOIHeader header {}; RefPtr bitmap; }; @@ -54,10 +54,10 @@ public: virtual ErrorOr> icc_data() override; private: - ErrorOr decode_header_and_update_context(AK::Stream&); - ErrorOr decode_image_and_update_context(AK::Stream&); + ErrorOr decode_header_and_update_context(Stream&); + ErrorOr decode_image_and_update_context(Stream&); - QOIImageDecoderPlugin(NonnullOwnPtr); + QOIImageDecoderPlugin(NonnullOwnPtr); OwnPtr m_context; }; diff --git a/Userland/Libraries/LibHTTP/HttpsJob.h b/Userland/Libraries/LibHTTP/HttpsJob.h index f93b66df361..2b22c31b3cb 100644 --- a/Userland/Libraries/LibHTTP/HttpsJob.h +++ b/Userland/Libraries/LibHTTP/HttpsJob.h @@ -30,7 +30,7 @@ public: Function()> on_certificate_requested; private: - explicit HttpsJob(HttpRequest&& request, AK::Stream& output_stream) + explicit HttpsJob(HttpRequest&& request, Stream& output_stream) : Job(move(request), output_stream) { } diff --git a/Userland/Libraries/LibHTTP/Job.cpp b/Userland/Libraries/LibHTTP/Job.cpp index ce1e7c513f7..2a64ee3354f 100644 --- a/Userland/Libraries/LibHTTP/Job.cpp +++ b/Userland/Libraries/LibHTTP/Job.cpp @@ -27,7 +27,7 @@ static ErrorOr handle_content_encoding(ByteBuffer const& buf, Deprec // FIXME: Actually do the decompression of the data using streams, instead of all at once when everything has been // received. This will require that some of the decompression algorithms are implemented in a streaming way. - // Gzip and Deflate are implemented using AK::Stream, while Brotli uses the newer Core::Stream. The Gzip and + // Gzip and Deflate are implemented using Stream, while Brotli uses the newer Core::Stream. The Gzip and // Deflate implementations will likely need to be changed to LibCore::Stream for this to work easily. if (content_encoding == "gzip") { @@ -86,7 +86,7 @@ static ErrorOr handle_content_encoding(ByteBuffer const& buf, Deprec return buf; } -Job::Job(HttpRequest&& request, AK::Stream& output_stream) +Job::Job(HttpRequest&& request, Stream& output_stream) : Core::NetworkJob(output_stream) , m_request(move(request)) { diff --git a/Userland/Libraries/LibHTTP/Job.h b/Userland/Libraries/LibHTTP/Job.h index 367a538bb7d..8792fcfc177 100644 --- a/Userland/Libraries/LibHTTP/Job.h +++ b/Userland/Libraries/LibHTTP/Job.h @@ -20,7 +20,7 @@ class Job : public Core::NetworkJob { C_OBJECT(Job); public: - explicit Job(HttpRequest&&, AK::Stream&); + explicit Job(HttpRequest&&, Stream&); virtual ~Job() override = default; virtual void start(Core::Socket&) override; diff --git a/Userland/Libraries/LibIPC/Decoder.h b/Userland/Libraries/LibIPC/Decoder.h index 5ddc8156232..d1ff1b9d542 100644 --- a/Userland/Libraries/LibIPC/Decoder.h +++ b/Userland/Libraries/LibIPC/Decoder.h @@ -32,7 +32,7 @@ inline ErrorOr decode(Decoder&) class Decoder { public: - Decoder(AK::Stream& stream, Core::LocalSocket& socket) + Decoder(Stream& stream, Core::LocalSocket& socket) : m_stream(stream) , m_socket(socket) { @@ -59,7 +59,7 @@ public: Core::LocalSocket& socket() { return m_socket; } private: - AK::Stream& m_stream; + Stream& m_stream; Core::LocalSocket& m_socket; }; diff --git a/Userland/Libraries/LibJS/Print.h b/Userland/Libraries/LibJS/Print.h index d6cc9524a77..d1339a3e85c 100644 --- a/Userland/Libraries/LibJS/Print.h +++ b/Userland/Libraries/LibJS/Print.h @@ -14,7 +14,7 @@ namespace JS { struct PrintContext { JS::VM& vm; - AK::Stream& stream; + Stream& stream; bool strip_ansi { false }; }; diff --git a/Userland/Libraries/LibLine/Editor.cpp b/Userland/Libraries/LibLine/Editor.cpp index 722df187b5d..afeac4f4860 100644 --- a/Userland/Libraries/LibLine/Editor.cpp +++ b/Userland/Libraries/LibLine/Editor.cpp @@ -1582,7 +1582,7 @@ void Editor::strip_styles(bool strip_anchored) m_refresh_needed = true; } -ErrorOr Editor::reposition_cursor(AK::Stream& stream, bool to_end) +ErrorOr Editor::reposition_cursor(Stream& stream, bool to_end) { auto cursor = m_cursor; auto saved_cursor = m_cursor; @@ -1604,12 +1604,12 @@ ErrorOr Editor::reposition_cursor(AK::Stream& stream, bool to_end) return {}; } -ErrorOr VT::move_absolute(u32 row, u32 col, AK::Stream& stream) +ErrorOr VT::move_absolute(u32 row, u32 col, Stream& stream) { return stream.write_entire_buffer(DeprecatedString::formatted("\033[{};{}H", row, col).bytes()); } -ErrorOr VT::move_relative(int row, int col, AK::Stream& stream) +ErrorOr VT::move_relative(int row, int col, Stream& stream) { char x_op = 'A', y_op = 'D'; @@ -1761,7 +1761,7 @@ DeprecatedString Style::to_deprecated_string() const return builder.to_deprecated_string(); } -ErrorOr VT::apply_style(Style const& style, AK::Stream& stream, bool is_starting) +ErrorOr VT::apply_style(Style const& style, Stream& stream, bool is_starting) { if (is_starting) { TRY(stream.write_entire_buffer(DeprecatedString::formatted("\033[{};{};{}m{}{}{}", @@ -1779,7 +1779,7 @@ ErrorOr VT::apply_style(Style const& style, AK::Stream& stream, bool is_st return {}; } -ErrorOr VT::clear_lines(size_t count_above, size_t count_below, AK::Stream& stream) +ErrorOr VT::clear_lines(size_t count_above, size_t count_below, Stream& stream) { if (count_below + count_above == 0) { TRY(stream.write_entire_buffer("\033[2K"sv.bytes())); @@ -1798,17 +1798,17 @@ ErrorOr VT::clear_lines(size_t count_above, size_t count_below, AK::Stream return {}; } -ErrorOr VT::save_cursor(AK::Stream& stream) +ErrorOr VT::save_cursor(Stream& stream) { return stream.write_entire_buffer("\033[s"sv.bytes()); } -ErrorOr VT::restore_cursor(AK::Stream& stream) +ErrorOr VT::restore_cursor(Stream& stream) { return stream.write_entire_buffer("\033[u"sv.bytes()); } -ErrorOr VT::clear_to_end_of_line(AK::Stream& stream) +ErrorOr VT::clear_to_end_of_line(Stream& stream) { return stream.write_entire_buffer("\033[K"sv.bytes()); } diff --git a/Userland/Libraries/LibLine/Editor.h b/Userland/Libraries/LibLine/Editor.h index 8454794bce1..5a6ea4e7e48 100644 --- a/Userland/Libraries/LibLine/Editor.h +++ b/Userland/Libraries/LibLine/Editor.h @@ -392,7 +392,7 @@ private: } void recalculate_origin(); - ErrorOr reposition_cursor(AK::Stream&, bool to_end = false); + ErrorOr reposition_cursor(Stream&, bool to_end = false); struct CodepointRange { size_t start { 0 }; diff --git a/Userland/Libraries/LibLine/VT.h b/Userland/Libraries/LibLine/VT.h index 1ead34c949b..77190153adf 100644 --- a/Userland/Libraries/LibLine/VT.h +++ b/Userland/Libraries/LibLine/VT.h @@ -12,13 +12,13 @@ namespace Line { namespace VT { -ErrorOr save_cursor(AK::Stream&); -ErrorOr restore_cursor(AK::Stream&); -ErrorOr clear_to_end_of_line(AK::Stream&); -ErrorOr clear_lines(size_t count_above, size_t count_below, AK::Stream&); -ErrorOr move_relative(int x, int y, AK::Stream&); -ErrorOr move_absolute(u32 x, u32 y, AK::Stream&); -ErrorOr apply_style(Style const&, AK::Stream&, bool is_starting = true); +ErrorOr save_cursor(Stream&); +ErrorOr restore_cursor(Stream&); +ErrorOr clear_to_end_of_line(Stream&); +ErrorOr clear_lines(size_t count_above, size_t count_below, Stream&); +ErrorOr move_relative(int x, int y, Stream&); +ErrorOr move_absolute(u32 x, u32 y, Stream&); +ErrorOr apply_style(Style const&, Stream&, bool is_starting = true); } } diff --git a/Userland/Libraries/LibProtocol/Request.cpp b/Userland/Libraries/LibProtocol/Request.cpp index d533c33ec88..930c5e30929 100644 --- a/Userland/Libraries/LibProtocol/Request.cpp +++ b/Userland/Libraries/LibProtocol/Request.cpp @@ -20,7 +20,7 @@ bool Request::stop() return m_client->stop_request({}, *this); } -void Request::stream_into(AK::Stream& stream) +void Request::stream_into(Stream& stream) { VERIFY(!m_internal_stream_data); diff --git a/Userland/Libraries/LibProtocol/Request.h b/Userland/Libraries/LibProtocol/Request.h index 9709b3761d4..1dd1d0b1406 100644 --- a/Userland/Libraries/LibProtocol/Request.h +++ b/Userland/Libraries/LibProtocol/Request.h @@ -36,7 +36,7 @@ public: int fd() const { return m_fd; } bool stop(); - void stream_into(AK::Stream&); + void stream_into(Stream&); bool should_buffer_all_input() const { return m_should_buffer_all_input; } /// Note: Will override `on_finish', and `on_headers_received', and expects `on_buffered_request_finish' to be set! @@ -73,12 +73,12 @@ private: }; struct InternalStreamData { - InternalStreamData(NonnullOwnPtr stream) + InternalStreamData(NonnullOwnPtr stream) : read_stream(move(stream)) { } - NonnullOwnPtr read_stream; + NonnullOwnPtr read_stream; RefPtr read_notifier; bool success; u32 total_size { 0 }; diff --git a/Userland/Libraries/LibWasm/Parser/Parser.cpp b/Userland/Libraries/LibWasm/Parser/Parser.cpp index 4cab3675809..68303398ff3 100644 --- a/Userland/Libraries/LibWasm/Parser/Parser.cpp +++ b/Userland/Libraries/LibWasm/Parser/Parser.cpp @@ -14,7 +14,7 @@ namespace Wasm { -ParseError with_eof_check(AK::Stream const& stream, ParseError error_if_not_eof) +ParseError with_eof_check(Stream const& stream, ParseError error_if_not_eof) { if (stream.is_eof()) return ParseError::UnexpectedEof; @@ -22,7 +22,7 @@ ParseError with_eof_check(AK::Stream const& stream, ParseError error_if_not_eof) } template -static auto parse_vector(AK::Stream& stream) +static auto parse_vector(Stream& stream) { ScopeLogger logger; if constexpr (requires { T::parse(stream); }) { @@ -73,7 +73,7 @@ static auto parse_vector(AK::Stream& stream) } } -static ParseResult parse_name(AK::Stream& stream) +static ParseResult parse_name(Stream& stream) { ScopeLogger logger; auto data = parse_vector(stream); @@ -89,8 +89,8 @@ struct ParseUntilAnyOfResult { Vector values; }; template -static ParseResult> parse_until_any_of(AK::Stream& stream, Args&... args) -requires(requires(AK::Stream& stream, Args... args) { T::parse(stream, args...); }) +static ParseResult> parse_until_any_of(Stream& stream, Args&... args) +requires(requires(Stream& stream, Args... args) { T::parse(stream, args...); }) { ScopeLogger logger; ReconsumableStream new_stream { stream }; @@ -119,7 +119,7 @@ requires(requires(AK::Stream& stream, Args... args) { T::parse(stream, args...); } } -ParseResult ValueType::parse(AK::Stream& stream) +ParseResult ValueType::parse(Stream& stream) { ScopeLogger logger("ValueType"sv); auto tag_or_error = stream.read_value(); @@ -146,7 +146,7 @@ ParseResult ValueType::parse(AK::Stream& stream) } } -ParseResult ResultType::parse(AK::Stream& stream) +ParseResult ResultType::parse(Stream& stream) { ScopeLogger logger("ResultType"sv); auto types = parse_vector(stream); @@ -155,7 +155,7 @@ ParseResult ResultType::parse(AK::Stream& stream) return ResultType { types.release_value() }; } -ParseResult FunctionType::parse(AK::Stream& stream) +ParseResult FunctionType::parse(Stream& stream) { ScopeLogger logger("FunctionType"sv); auto tag_or_error = stream.read_value(); @@ -179,7 +179,7 @@ ParseResult FunctionType::parse(AK::Stream& stream) return FunctionType { parameters_result.release_value(), results_result.release_value() }; } -ParseResult Limits::parse(AK::Stream& stream) +ParseResult Limits::parse(Stream& stream) { ScopeLogger logger("Limits"sv); auto flag_or_error = stream.read_value(); @@ -207,7 +207,7 @@ ParseResult Limits::parse(AK::Stream& stream) return Limits { static_cast(min), move(max) }; } -ParseResult MemoryType::parse(AK::Stream& stream) +ParseResult MemoryType::parse(Stream& stream) { ScopeLogger logger("MemoryType"sv); auto limits_result = Limits::parse(stream); @@ -216,7 +216,7 @@ ParseResult MemoryType::parse(AK::Stream& stream) return MemoryType { limits_result.release_value() }; } -ParseResult TableType::parse(AK::Stream& stream) +ParseResult TableType::parse(Stream& stream) { ScopeLogger logger("TableType"sv); auto type_result = ValueType::parse(stream); @@ -230,7 +230,7 @@ ParseResult TableType::parse(AK::Stream& stream) return TableType { type_result.release_value(), limits_result.release_value() }; } -ParseResult GlobalType::parse(AK::Stream& stream) +ParseResult GlobalType::parse(Stream& stream) { ScopeLogger logger("GlobalType"sv); auto type_result = ValueType::parse(stream); @@ -249,7 +249,7 @@ ParseResult GlobalType::parse(AK::Stream& stream) return GlobalType { type_result.release_value(), mutable_ == 0x01 }; } -ParseResult BlockType::parse(AK::Stream& stream) +ParseResult BlockType::parse(Stream& stream) { ScopeLogger logger("BlockType"sv); auto kind_or_error = stream.read_value(); @@ -282,7 +282,7 @@ ParseResult BlockType::parse(AK::Stream& stream) return BlockType { TypeIndex(index_value) }; } -ParseResult> Instruction::parse(AK::Stream& stream, InstructionPointer& ip) +ParseResult> Instruction::parse(Stream& stream, InstructionPointer& ip) { struct NestedInstructionState { Vector prior_instructions; @@ -782,7 +782,7 @@ ParseResult> Instruction::parse(AK::Stream& stream, Instruct return resulting_instructions; } -ParseResult CustomSection::parse(AK::Stream& stream) +ParseResult CustomSection::parse(Stream& stream) { ScopeLogger logger("CustomSection"sv); auto name = parse_name(stream); @@ -808,7 +808,7 @@ ParseResult CustomSection::parse(AK::Stream& stream) return CustomSection(name.release_value(), move(data_buffer)); } -ParseResult TypeSection::parse(AK::Stream& stream) +ParseResult TypeSection::parse(Stream& stream) { ScopeLogger logger("TypeSection"sv); auto types = parse_vector(stream); @@ -817,7 +817,7 @@ ParseResult TypeSection::parse(AK::Stream& stream) return TypeSection { types.release_value() }; } -ParseResult ImportSection::Import::parse(AK::Stream& stream) +ParseResult ImportSection::Import::parse(Stream& stream) { ScopeLogger logger("Import"sv); auto module = parse_name(stream); @@ -850,7 +850,7 @@ ParseResult ImportSection::Import::parse(AK::Stream& stre } } -ParseResult ImportSection::parse(AK::Stream& stream) +ParseResult ImportSection::parse(Stream& stream) { ScopeLogger logger("ImportSection"sv); auto imports = parse_vector(stream); @@ -859,7 +859,7 @@ ParseResult ImportSection::parse(AK::Stream& stream) return ImportSection { imports.release_value() }; } -ParseResult FunctionSection::parse(AK::Stream& stream) +ParseResult FunctionSection::parse(Stream& stream) { ScopeLogger logger("FunctionSection"sv); auto indices = parse_vector(stream); @@ -874,7 +874,7 @@ ParseResult FunctionSection::parse(AK::Stream& stream) return FunctionSection { move(typed_indices) }; } -ParseResult TableSection::Table::parse(AK::Stream& stream) +ParseResult TableSection::Table::parse(Stream& stream) { ScopeLogger logger("Table"sv); auto type = TableType::parse(stream); @@ -883,7 +883,7 @@ ParseResult TableSection::Table::parse(AK::Stream& stream) return Table { type.release_value() }; } -ParseResult TableSection::parse(AK::Stream& stream) +ParseResult TableSection::parse(Stream& stream) { ScopeLogger logger("TableSection"sv); auto tables = parse_vector(stream); @@ -892,7 +892,7 @@ ParseResult TableSection::parse(AK::Stream& stream) return TableSection { tables.release_value() }; } -ParseResult MemorySection::Memory::parse(AK::Stream& stream) +ParseResult MemorySection::Memory::parse(Stream& stream) { ScopeLogger logger("Memory"sv); auto type = MemoryType::parse(stream); @@ -901,7 +901,7 @@ ParseResult MemorySection::Memory::parse(AK::Stream& stre return Memory { type.release_value() }; } -ParseResult MemorySection::parse(AK::Stream& stream) +ParseResult MemorySection::parse(Stream& stream) { ScopeLogger logger("MemorySection"sv); auto memories = parse_vector(stream); @@ -910,7 +910,7 @@ ParseResult MemorySection::parse(AK::Stream& stream) return MemorySection { memories.release_value() }; } -ParseResult Expression::parse(AK::Stream& stream) +ParseResult Expression::parse(Stream& stream) { ScopeLogger logger("Expression"sv); InstructionPointer ip { 0 }; @@ -921,7 +921,7 @@ ParseResult Expression::parse(AK::Stream& stream) return Expression { move(instructions.value().values) }; } -ParseResult GlobalSection::Global::parse(AK::Stream& stream) +ParseResult GlobalSection::Global::parse(Stream& stream) { ScopeLogger logger("Global"sv); auto type = GlobalType::parse(stream); @@ -933,7 +933,7 @@ ParseResult GlobalSection::Global::parse(AK::Stream& stre return Global { type.release_value(), exprs.release_value() }; } -ParseResult GlobalSection::parse(AK::Stream& stream) +ParseResult GlobalSection::parse(Stream& stream) { ScopeLogger logger("GlobalSection"sv); auto result = parse_vector(stream); @@ -942,7 +942,7 @@ ParseResult GlobalSection::parse(AK::Stream& stream) return GlobalSection { result.release_value() }; } -ParseResult ExportSection::Export::parse(AK::Stream& stream) +ParseResult ExportSection::Export::parse(Stream& stream) { ScopeLogger logger("Export"sv); auto name = parse_name(stream); @@ -973,7 +973,7 @@ ParseResult ExportSection::Export::parse(AK::Stream& stre } } -ParseResult ExportSection::parse(AK::Stream& stream) +ParseResult ExportSection::parse(Stream& stream) { ScopeLogger logger("ExportSection"sv); auto result = parse_vector(stream); @@ -982,7 +982,7 @@ ParseResult ExportSection::parse(AK::Stream& stream) return ExportSection { result.release_value() }; } -ParseResult StartSection::StartFunction::parse(AK::Stream& stream) +ParseResult StartSection::StartFunction::parse(Stream& stream) { ScopeLogger logger("StartFunction"sv); auto index = GenericIndexParser::parse(stream); @@ -991,7 +991,7 @@ ParseResult StartSection::StartFunction::parse(AK:: return StartFunction { index.release_value() }; } -ParseResult StartSection::parse(AK::Stream& stream) +ParseResult StartSection::parse(Stream& stream) { ScopeLogger logger("StartSection"sv); auto result = StartFunction::parse(stream); @@ -1000,7 +1000,7 @@ ParseResult StartSection::parse(AK::Stream& stream) return StartSection { result.release_value() }; } -ParseResult ElementSection::SegmentType0::parse(AK::Stream& stream) +ParseResult ElementSection::SegmentType0::parse(Stream& stream) { auto expression = Expression::parse(stream); if (expression.is_error()) @@ -1012,7 +1012,7 @@ ParseResult ElementSection::SegmentType0::parse(AK return SegmentType0 { indices.release_value(), Active { 0, expression.release_value() } }; } -ParseResult ElementSection::SegmentType1::parse(AK::Stream& stream) +ParseResult ElementSection::SegmentType1::parse(Stream& stream) { auto kind_or_error = stream.read_value(); if (kind_or_error.is_error()) @@ -1028,49 +1028,49 @@ ParseResult ElementSection::SegmentType1::parse(AK return SegmentType1 { indices.release_value() }; } -ParseResult ElementSection::SegmentType2::parse(AK::Stream& stream) +ParseResult ElementSection::SegmentType2::parse(Stream& stream) { dbgln("Type 2"); (void)stream; return ParseError::NotImplemented; } -ParseResult ElementSection::SegmentType3::parse(AK::Stream& stream) +ParseResult ElementSection::SegmentType3::parse(Stream& stream) { dbgln("Type 3"); (void)stream; return ParseError::NotImplemented; } -ParseResult ElementSection::SegmentType4::parse(AK::Stream& stream) +ParseResult ElementSection::SegmentType4::parse(Stream& stream) { dbgln("Type 4"); (void)stream; return ParseError::NotImplemented; } -ParseResult ElementSection::SegmentType5::parse(AK::Stream& stream) +ParseResult ElementSection::SegmentType5::parse(Stream& stream) { dbgln("Type 5"); (void)stream; return ParseError::NotImplemented; } -ParseResult ElementSection::SegmentType6::parse(AK::Stream& stream) +ParseResult ElementSection::SegmentType6::parse(Stream& stream) { dbgln("Type 6"); (void)stream; return ParseError::NotImplemented; } -ParseResult ElementSection::SegmentType7::parse(AK::Stream& stream) +ParseResult ElementSection::SegmentType7::parse(Stream& stream) { dbgln("Type 7"); (void)stream; return ParseError::NotImplemented; } -ParseResult ElementSection::Element::parse(AK::Stream& stream) +ParseResult ElementSection::Element::parse(Stream& stream) { ScopeLogger logger("Element"sv); auto tag_or_error = stream.read_value(); @@ -1139,7 +1139,7 @@ ParseResult ElementSection::Element::parse(AK::Stream& } } -ParseResult ElementSection::parse(AK::Stream& stream) +ParseResult ElementSection::parse(Stream& stream) { ScopeLogger logger("ElementSection"sv); auto result = parse_vector(stream); @@ -1148,7 +1148,7 @@ ParseResult ElementSection::parse(AK::Stream& stream) return ElementSection { result.release_value() }; } -ParseResult Locals::parse(AK::Stream& stream) +ParseResult Locals::parse(Stream& stream) { ScopeLogger logger("Locals"sv); auto count_or_error = stream.read_value>(); @@ -1166,7 +1166,7 @@ ParseResult Locals::parse(AK::Stream& stream) return Locals { static_cast(count), type.release_value() }; } -ParseResult CodeSection::Func::parse(AK::Stream& stream) +ParseResult CodeSection::Func::parse(Stream& stream) { ScopeLogger logger("Func"sv); auto locals = parse_vector(stream); @@ -1178,7 +1178,7 @@ ParseResult CodeSection::Func::parse(AK::Stream& stream) return Func { locals.release_value(), body.release_value() }; } -ParseResult CodeSection::Code::parse(AK::Stream& stream) +ParseResult CodeSection::Code::parse(Stream& stream) { ScopeLogger logger("Code"sv); auto size_or_error = stream.read_value>(); @@ -1195,7 +1195,7 @@ ParseResult CodeSection::Code::parse(AK::Stream& stream) return Code { static_cast(size), func.release_value() }; } -ParseResult CodeSection::parse(AK::Stream& stream) +ParseResult CodeSection::parse(Stream& stream) { ScopeLogger logger("CodeSection"sv); auto result = parse_vector(stream); @@ -1204,7 +1204,7 @@ ParseResult CodeSection::parse(AK::Stream& stream) return CodeSection { result.release_value() }; } -ParseResult DataSection::Data::parse(AK::Stream& stream) +ParseResult DataSection::Data::parse(Stream& stream) { ScopeLogger logger("Data"sv); auto tag_or_error = stream.read_value(); @@ -1246,7 +1246,7 @@ ParseResult DataSection::Data::parse(AK::Stream& stream) VERIFY_NOT_REACHED(); } -ParseResult DataSection::parse(AK::Stream& stream) +ParseResult DataSection::parse(Stream& stream) { ScopeLogger logger("DataSection"sv); auto data = parse_vector(stream); @@ -1256,7 +1256,7 @@ ParseResult DataSection::parse(AK::Stream& stream) return DataSection { data.release_value() }; } -ParseResult DataCountSection::parse([[maybe_unused]] AK::Stream& stream) +ParseResult DataCountSection::parse([[maybe_unused]] Stream& stream) { ScopeLogger logger("DataCountSection"sv); auto value_or_error = stream.read_value>(); @@ -1272,7 +1272,7 @@ ParseResult DataCountSection::parse([[maybe_unused]] AK::Strea return DataCountSection { value }; } -ParseResult Module::parse(AK::Stream& stream) +ParseResult Module::parse(Stream& stream) { ScopeLogger logger("Module"sv); u8 buf[4]; diff --git a/Userland/Libraries/LibWasm/Printer/Printer.h b/Userland/Libraries/LibWasm/Printer/Printer.h index c79475fd7c5..d977d9d8bbf 100644 --- a/Userland/Libraries/LibWasm/Printer/Printer.h +++ b/Userland/Libraries/LibWasm/Printer/Printer.h @@ -17,7 +17,7 @@ DeprecatedString instruction_name(OpCode const& opcode); Optional instruction_from_name(StringView name); struct Printer { - explicit Printer(AK::Stream& stream, size_t initial_indent = 0) + explicit Printer(Stream& stream, size_t initial_indent = 0) : m_stream(stream) , m_indent(initial_indent) { @@ -71,7 +71,7 @@ private: m_stream.write_entire_buffer(builder.string_view().bytes()).release_value_but_fixme_should_propagate_errors(); } - AK::Stream& m_stream; + Stream& m_stream; size_t m_indent { 0 }; }; diff --git a/Userland/Libraries/LibWasm/Types.h b/Userland/Libraries/LibWasm/Types.h index adbe900f272..08d417272fc 100644 --- a/Userland/Libraries/LibWasm/Types.h +++ b/Userland/Libraries/LibWasm/Types.h @@ -58,11 +58,11 @@ AK_TYPEDEF_DISTINCT_ORDERED_ID(size_t, LabelIndex); AK_TYPEDEF_DISTINCT_ORDERED_ID(size_t, DataIndex); AK_TYPEDEF_DISTINCT_NUMERIC_GENERAL(u64, InstructionPointer, Arithmetic, Comparison, Flags, Increment); -ParseError with_eof_check(AK::Stream const& stream, ParseError error_if_not_eof); +ParseError with_eof_check(Stream const& stream, ParseError error_if_not_eof); template struct GenericIndexParser { - static ParseResult parse(AK::Stream& stream) + static ParseResult parse(Stream& stream) { auto value_or_error = stream.read_value>(); if (value_or_error.is_error()) @@ -72,9 +72,9 @@ struct GenericIndexParser { } }; -class ReconsumableStream : public AK::Stream { +class ReconsumableStream : public Stream { public: - explicit ReconsumableStream(AK::Stream& stream) + explicit ReconsumableStream(Stream& stream) : m_stream(stream) { } @@ -132,13 +132,13 @@ private: m_stream.close(); } - AK::Stream& m_stream; + Stream& m_stream; Vector m_buffer; }; -class ConstrainedStream : public AK::Stream { +class ConstrainedStream : public Stream { public: - explicit ConstrainedStream(AK::Stream& stream, size_t size) + explicit ConstrainedStream(Stream& stream, size_t size) : m_stream(stream) , m_bytes_left(size) { @@ -181,7 +181,7 @@ private: m_stream.close(); } - AK::Stream& m_stream; + Stream& m_stream; size_t m_bytes_left { 0 }; }; @@ -210,7 +210,7 @@ public: auto is_numeric() const { return !is_reference(); } auto kind() const { return m_kind; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); static DeprecatedString kind_name(Kind kind) { @@ -249,7 +249,7 @@ public: auto const& types() const { return m_types; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_types; @@ -267,7 +267,7 @@ public: auto& parameters() const { return m_parameters; } auto& results() const { return m_results; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_parameters; @@ -286,7 +286,7 @@ public: auto min() const { return m_min; } auto& max() const { return m_max; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: u32 m_min { 0 }; @@ -303,7 +303,7 @@ public: auto& limits() const { return m_limits; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Limits m_limits; @@ -322,7 +322,7 @@ public: auto& limits() const { return m_limits; } auto& element_type() const { return m_element_type; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: ValueType m_element_type; @@ -341,7 +341,7 @@ public: auto& type() const { return m_type; } auto is_mutable() const { return m_is_mutable; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: ValueType m_type; @@ -387,7 +387,7 @@ public: return m_type_index; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Kind m_kind { Empty }; @@ -451,7 +451,7 @@ public: { } - static ParseResult> parse(AK::Stream& stream, InstructionPointer& ip); + static ParseResult> parse(Stream& stream, InstructionPointer& ip); auto& opcode() const { return m_opcode; } auto& arguments() const { return m_arguments; } @@ -498,7 +498,7 @@ public: auto& name() const { return m_name; } auto& contents() const { return m_contents; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: DeprecatedString m_name; @@ -516,7 +516,7 @@ public: auto& types() const { return m_types; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_types; @@ -538,7 +538,7 @@ public: auto& name() const { return m_name; } auto& description() const { return m_description; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: template @@ -565,7 +565,7 @@ public: auto& imports() const { return m_imports; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_imports; @@ -582,7 +582,7 @@ public: auto& types() const { return m_types; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_types; @@ -599,7 +599,7 @@ public: auto& type() const { return m_type; } - static ParseResult
parse(AK::Stream& stream); + static ParseResult
parse(Stream& stream); private: TableType m_type; @@ -615,7 +615,7 @@ public: auto& tables() const { return m_tables; }; - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector
m_tables; @@ -632,7 +632,7 @@ public: auto& type() const { return m_type; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: MemoryType m_type; @@ -648,7 +648,7 @@ public: auto& memories() const { return m_memories; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_memories; @@ -663,7 +663,7 @@ public: auto& instructions() const { return m_instructions; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_instructions; @@ -682,7 +682,7 @@ public: auto& type() const { return m_type; } auto& expression() const { return m_expression; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: GlobalType m_type; @@ -699,7 +699,7 @@ public: auto& entries() const { return m_entries; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_entries; @@ -721,7 +721,7 @@ public: auto& name() const { return m_name; } auto& description() const { return m_description; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: DeprecatedString m_name; @@ -737,7 +737,7 @@ public: auto& entries() const { return m_entries; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_entries; @@ -754,7 +754,7 @@ public: auto& index() const { return m_index; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: FunctionIndex m_index; @@ -769,7 +769,7 @@ public: auto& function() const { return m_function; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: StartFunction m_function; @@ -788,43 +788,43 @@ public: struct SegmentType0 { // FIXME: Implement me! - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); Vector function_indices; Active mode; }; struct SegmentType1 { - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); Vector function_indices; }; struct SegmentType2 { // FIXME: Implement me! - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); }; struct SegmentType3 { // FIXME: Implement me! - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); }; struct SegmentType4 { // FIXME: Implement me! - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); }; struct SegmentType5 { // FIXME: Implement me! - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); }; struct SegmentType6 { // FIXME: Implement me! - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); }; struct SegmentType7 { // FIXME: Implement me! - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); }; struct Element { - static ParseResult parse(AK::Stream&); + static ParseResult parse(Stream&); ValueType type; Vector init; @@ -840,7 +840,7 @@ public: auto& segments() const { return m_segments; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_segments; @@ -858,7 +858,7 @@ public: auto n() const { return m_n; } auto& type() const { return m_type; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: u32 m_n { 0 }; @@ -879,7 +879,7 @@ public: auto& locals() const { return m_locals; } auto& body() const { return m_body; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_locals; @@ -896,7 +896,7 @@ public: auto size() const { return m_size; } auto& func() const { return m_func; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: u32 m_size { 0 }; @@ -912,7 +912,7 @@ public: auto& functions() const { return m_functions; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_functions; @@ -939,7 +939,7 @@ public: auto& value() const { return m_value; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Value m_value; @@ -954,7 +954,7 @@ public: auto& data() const { return m_data; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Vector m_data; @@ -971,7 +971,7 @@ public: auto& count() const { return m_count; } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: Optional m_count; @@ -1066,7 +1066,7 @@ public: StringView validation_error() const { return *m_validation_error; } void set_validation_error(DeprecatedString error) { m_validation_error = move(error); } - static ParseResult parse(AK::Stream& stream); + static ParseResult parse(Stream& stream); private: bool populate_sections(); diff --git a/Userland/Libraries/LibWeb/Loader/ResourceLoader.h b/Userland/Libraries/LibWeb/Loader/ResourceLoader.h index 58819202026..fad5a00eef6 100644 --- a/Userland/Libraries/LibWeb/Loader/ResourceLoader.h +++ b/Userland/Libraries/LibWeb/Loader/ResourceLoader.h @@ -61,7 +61,7 @@ public: virtual void set_should_buffer_all_input(bool) = 0; virtual bool stop() = 0; - virtual void stream_into(AK::Stream&) = 0; + virtual void stream_into(Stream&) = 0; Function const& response_headers, Optional response_code, ReadonlyBytes payload)> on_buffered_request_finish; Function on_finish; diff --git a/Userland/Libraries/LibWebView/RequestServerAdapter.cpp b/Userland/Libraries/LibWebView/RequestServerAdapter.cpp index b08f293233b..a403c6c7e08 100644 --- a/Userland/Libraries/LibWebView/RequestServerAdapter.cpp +++ b/Userland/Libraries/LibWebView/RequestServerAdapter.cpp @@ -63,7 +63,7 @@ bool RequestServerRequestAdapter::stop() return m_request->stop(); } -void RequestServerRequestAdapter::stream_into(AK::Stream& stream) +void RequestServerRequestAdapter::stream_into(Stream& stream) { m_request->stream_into(stream); } diff --git a/Userland/Libraries/LibWebView/RequestServerAdapter.h b/Userland/Libraries/LibWebView/RequestServerAdapter.h index 728e441d840..c9c9e8ce232 100644 --- a/Userland/Libraries/LibWebView/RequestServerAdapter.h +++ b/Userland/Libraries/LibWebView/RequestServerAdapter.h @@ -27,7 +27,7 @@ public: virtual void set_should_buffer_all_input(bool) override; virtual bool stop() override; - virtual void stream_into(AK::Stream&) override; + virtual void stream_into(Stream&) override; private: RequestServerRequestAdapter(NonnullRefPtr); diff --git a/Userland/Services/WebServer/Client.cpp b/Userland/Services/WebServer/Client.cpp index ae65737e3f4..a64c9b3f412 100644 --- a/Userland/Services/WebServer/Client.cpp +++ b/Userland/Services/WebServer/Client.cpp @@ -176,7 +176,7 @@ ErrorOr Client::handle_request(ReadonlyBytes raw_request) return true; } -ErrorOr Client::send_response(AK::Stream& response, HTTP::HttpRequest const& request, ContentInfo content_info) +ErrorOr Client::send_response(Stream& response, HTTP::HttpRequest const& request, ContentInfo content_info) { StringBuilder builder; builder.append("HTTP/1.0 200 OK\r\n"sv); diff --git a/Userland/Services/WebServer/Client.h b/Userland/Services/WebServer/Client.h index fea868536ea..93365d73320 100644 --- a/Userland/Services/WebServer/Client.h +++ b/Userland/Services/WebServer/Client.h @@ -30,7 +30,7 @@ private: }; ErrorOr handle_request(ReadonlyBytes); - ErrorOr send_response(AK::Stream&, HTTP::HttpRequest const&, ContentInfo); + ErrorOr send_response(Stream&, HTTP::HttpRequest const&, ContentInfo); ErrorOr send_redirect(StringView redirect, HTTP::HttpRequest const&); ErrorOr send_error_response(unsigned code, HTTP::HttpRequest const&, Vector const& headers = {}); void die(); diff --git a/Userland/Utilities/gunzip.cpp b/Userland/Utilities/gunzip.cpp index 531c753e3fc..a0fb4048a78 100644 --- a/Userland/Utilities/gunzip.cpp +++ b/Userland/Utilities/gunzip.cpp @@ -11,7 +11,7 @@ #include #include -static ErrorOr decompress_file(NonnullOwnPtr input_stream, AK::Stream& output_stream) +static ErrorOr decompress_file(NonnullOwnPtr input_stream, Stream& output_stream) { auto gzip_stream = Compress::GzipDecompressor { move(input_stream) }; diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp index 52c62d712d3..d4cfb15a772 100644 --- a/Userland/Utilities/headless-browser.cpp +++ b/Userland/Utilities/headless-browser.cpp @@ -334,7 +334,7 @@ public: return false; } - virtual void stream_into(AK::Stream&) override + virtual void stream_into(Stream&) override { } @@ -413,7 +413,7 @@ public: return false; } - virtual void stream_into(AK::Stream&) override + virtual void stream_into(Stream&) override { } @@ -482,7 +482,7 @@ public: return false; } - virtual void stream_into(AK::Stream&) override + virtual void stream_into(Stream&) override { } diff --git a/Userland/Utilities/js.cpp b/Userland/Utilities/js.cpp index 5c1f1b92132..a12af0420d4 100644 --- a/Userland/Utilities/js.cpp +++ b/Userland/Utilities/js.cpp @@ -81,7 +81,7 @@ static String s_history_path = String {}; static int s_repl_line_level = 0; static bool s_fail_repl = false; -static ErrorOr print(JS::Value value, AK::Stream& stream) +static ErrorOr print(JS::Value value, Stream& stream) { JS::PrintContext print_context { .vm = *g_vm, .stream = stream, .strip_ansi = s_strip_ansi }; return JS::print(value, print_context); diff --git a/Userland/Utilities/pro.cpp b/Userland/Utilities/pro.cpp index 150f80394dd..e81a733a12c 100644 --- a/Userland/Utilities/pro.cpp +++ b/Userland/Utilities/pro.cpp @@ -104,9 +104,9 @@ private: /// Wraps a stream to silently ignore writes when the condition isn't true. template -class ConditionalOutputStream final : public AK::Stream { +class ConditionalOutputStream final : public Stream { public: - ConditionalOutputStream(ConditionT&& condition, MaybeOwned stream) + ConditionalOutputStream(ConditionT&& condition, MaybeOwned stream) : m_stream(move(stream)) , m_condition(condition) { @@ -141,7 +141,7 @@ public: } private: - MaybeOwned m_stream; + MaybeOwned m_stream; ConditionT m_condition; }; diff --git a/Userland/Utilities/tar.cpp b/Userland/Utilities/tar.cpp index 31b2dc98bf7..6d2cbb19cbe 100644 --- a/Userland/Utilities/tar.cpp +++ b/Userland/Utilities/tar.cpp @@ -63,7 +63,7 @@ ErrorOr serenity_main(Main::Arguments arguments) if (!directory.is_empty()) TRY(Core::System::chdir(directory)); - NonnullOwnPtr input_stream = TRY(Core::File::open_file_or_standard_stream(archive_file, Core::File::OpenMode::Read)); + NonnullOwnPtr input_stream = TRY(Core::File::open_file_or_standard_stream(archive_file, Core::File::OpenMode::Read)); if (gzip) input_stream = make(move(input_stream)); @@ -205,7 +205,7 @@ ErrorOr serenity_main(Main::Arguments arguments) return 1; } - NonnullOwnPtr output_stream = TRY(Core::File::standard_output()); + NonnullOwnPtr output_stream = TRY(Core::File::standard_output()); if (!archive_file.is_empty()) output_stream = TRY(Core::File::open(archive_file, Core::File::OpenMode::Write)); diff --git a/Userland/Utilities/wasm.cpp b/Userland/Utilities/wasm.cpp index d82ff82fa2d..00652bbd579 100644 --- a/Userland/Utilities/wasm.cpp +++ b/Userland/Utilities/wasm.cpp @@ -19,7 +19,7 @@ #include RefPtr g_line_editor; -static OwnPtr g_stdout {}; +static OwnPtr g_stdout {}; static OwnPtr g_printer {}; static bool g_continue { false }; static void (*old_signal)(int);