LibCore: Remove Stream.h

Userland/Libraries/LibArchive/TarStream.cpp

@@ -7,6 +7,7 @@
  */
 
 #include <AK/Array.h>
+#include <AK/OwnPtr.h>
 #include <LibArchive/TarStream.h>
 #include <string.h>
 

Userland/Libraries/LibArchive/TarStream.h

@@ -9,8 +9,8 @@
 
 #include <AK/MaybeOwned.h>
 #include <AK/Span.h>
+#include <AK/Stream.h>
 #include <LibArchive/Tar.h>
-#include <LibCore/Stream.h>
 
 namespace Archive {
 

Userland/Libraries/LibArchive/Zip.h

@@ -11,9 +11,10 @@
 #include <AK/DOSPackedTime.h>
 #include <AK/Function.h>
 #include <AK/IterationDecision.h>
+#include <AK/NonnullOwnPtr.h>
+#include <AK/Stream.h>
 #include <AK/String.h>
 #include <AK/Vector.h>
-#include <LibCore/Stream.h>
 #include <string.h>
 
 namespace Archive {

Userland/Libraries/LibAudio/FlacLoader.cpp

@@ -22,7 +22,6 @@
 #include <LibAudio/LoaderError.h>
 #include <LibAudio/Resampler.h>
 #include <LibCore/File.h>
-#include <LibCore/Stream.h>
 
 namespace Audio {
 

Userland/Libraries/LibAudio/FlacLoader.h

@@ -12,7 +12,6 @@
 #include <AK/Error.h>
 #include <AK/Span.h>
 #include <AK/Types.h>
-#include <LibCore/Stream.h>
 
 namespace Audio {
 

Userland/Libraries/LibAudio/Loader.h

@@ -19,7 +19,6 @@
 #include <LibAudio/LoaderError.h>
 #include <LibAudio/Sample.h>
 #include <LibAudio/SampleFormats.h>
-#include <LibCore/Stream.h>
 
 namespace Audio {
 

Userland/Libraries/LibAudio/MP3Loader.h

@@ -11,7 +11,6 @@
 #include <AK/BitStream.h>
 #include <AK/MemoryStream.h>
 #include <AK/Tuple.h>
-#include <LibCore/Stream.h>
 #include <LibDSP/MDCT.h>
 
 namespace Audio {

Userland/Libraries/LibAudio/WavLoader.h

@@ -14,7 +14,6 @@
 #include <AK/Span.h>
 #include <AK/StringView.h>
 #include <LibAudio/Loader.h>
-#include <LibCore/Stream.h>
 
 namespace Audio {
 

Userland/Libraries/LibCompress/Brotli.h

@@ -9,7 +9,7 @@
 #include <AK/BitStream.h>
 #include <AK/CircularQueue.h>
 #include <AK/FixedArray.h>
-#include <LibCore/Stream.h>
+#include <AK/Vector.h>
 
 namespace Compress {
 

Userland/Libraries/LibCompress/Deflate.h

@@ -8,12 +8,13 @@
 #pragma once
 
 #include <AK/ByteBuffer.h>
+#include <AK/CircularBuffer.h>
 #include <AK/Endian.h>
 #include <AK/Forward.h>
 #include <AK/MaybeOwned.h>
+#include <AK/Stream.h>
 #include <AK/Vector.h>
 #include <LibCompress/DeflateTables.h>
-#include <LibCore/Stream.h>
 
 namespace Compress {
 

Userland/Libraries/LibCompress/Gzip.h

@@ -7,8 +7,10 @@
 
 #pragma once
 
+#include <AK/NonnullOwnPtr.h>
+#include <AK/OwnPtr.h>
+#include <AK/Stream.h>
 #include <LibCompress/Deflate.h>
-#include <LibCore/Stream.h>
 #include <LibCrypto/Checksum/CRC32.h>
 
 namespace Compress {

Userland/Libraries/LibCompress/Zlib.h

@@ -7,12 +7,13 @@
 #pragma once
 
 #include <AK/ByteBuffer.h>
+#include <AK/Endian.h>
 #include <AK/MaybeOwned.h>
 #include <AK/Optional.h>
 #include <AK/OwnPtr.h>
 #include <AK/Span.h>
+#include <AK/Stream.h>
 #include <AK/Types.h>
-#include <LibCore/Stream.h>
 #include <LibCrypto/Checksum/Adler32.h>
 
 namespace Compress {

Userland/Libraries/LibCore/ConfigFile.h

@@ -11,11 +11,11 @@
 #include <AK/DeprecatedString.h>
 #include <AK/Forward.h>
 #include <AK/HashMap.h>
+#include <AK/OwnPtr.h>
 #include <AK/RefCounted.h>
 #include <AK/RefPtr.h>
 #include <AK/Vector.h>
 #include <LibCore/File.h>
-#include <LibCore/Stream.h>
 
 namespace Core {
 

Userland/Libraries/LibCore/Directory.h

@@ -12,7 +12,6 @@
 #include <AK/Noncopyable.h>
 #include <AK/Optional.h>
 #include <LibCore/File.h>
-#include <LibCore/Stream.h>
 #include <dirent.h>
 #include <sys/stat.h>
 

Userland/Libraries/LibCore/LocalServer.cpp

@@ -8,7 +8,6 @@
 #include <LibCore/Notifier.h>
 #include <LibCore/SessionManagement.h>
 #include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
 #include <LibCore/System.h>
 #include <LibCore/SystemServerTakeover.h>
 #include <fcntl.h>

Userland/Libraries/LibCore/LocalServer.h

@@ -8,7 +8,6 @@
 
 #include <LibCore/Notifier.h>
 #include <LibCore/Object.h>
-#include <LibCore/Stream.h>
 
 namespace Core {
 

Userland/Libraries/LibCore/NetworkJob.h

@@ -8,9 +8,9 @@
 #pragma once
 
 #include <AK/Function.h>
+#include <AK/Stream.h>
 #include <LibCore/Forward.h>
 #include <LibCore/Object.h>
-#include <LibCore/Stream.h>
 
 namespace Core {
 

Userland/Libraries/LibCore/ProcessStatisticsReader.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/DeprecatedString.h>
-#include <LibCore/Stream.h>
+#include <AK/Vector.h>
 #include <unistd.h>
 
 namespace Core {

Userland/Libraries/LibCore/SOCKSProxyClient.h

@@ -9,7 +9,6 @@
 #include <AK/OwnPtr.h>
 #include <LibCore/Proxy.h>
 #include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
 
 namespace Core {
 class SOCKSProxyClient final : public Socket {

Userland/Libraries/LibCore/Stream.h

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2021, sin-ack <sin-ack@protonmail.com>
- * Copyright (c) 2022, the SerenityOS developers.
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include <AK/Badge.h>
-#include <AK/BufferedStream.h>
-#include <AK/CircularBuffer.h>
-#include <AK/DeprecatedString.h>
-#include <AK/EnumBits.h>
-#include <AK/Function.h>
-#include <AK/IPv4Address.h>
-#include <AK/Noncopyable.h>
-#include <AK/Result.h>
-#include <AK/Span.h>
-#include <AK/Stream.h>
-#include <AK/Time.h>
-#include <AK/Variant.h>
-#include <LibCore/Notifier.h>
-#include <LibCore/SocketAddress.h>
-#include <LibIPC/Forward.h>
-#include <errno.h>
-#include <netdb.h>

Userland/Libraries/LibCore/SystemServerTakeover.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibCore/Stream.h>
+#include <LibCore/Socket.h>
 
 namespace Core {
 

Userland/Libraries/LibCore/TCPServer.h

@@ -10,7 +10,6 @@
 #include <AK/IPv4Address.h>
 #include <LibCore/Notifier.h>
 #include <LibCore/Object.h>
-#include <LibCore/Stream.h>
 
 namespace Core {
 

Userland/Libraries/LibDNS/Name.cpp

@@ -7,6 +7,7 @@
 
 #include "Name.h"
 #include <AK/Random.h>
+#include <AK/Stream.h>
 #include <AK/Vector.h>
 #include <ctype.h>
 

Userland/Libraries/LibDNS/Name.h

@@ -9,7 +9,6 @@
 
 #include <AK/DeprecatedString.h>
 #include <AK/Forward.h>
-#include <LibCore/Stream.h>
 
 namespace DNS {
 

Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp

@@ -7,7 +7,6 @@
 #include "AddressRanges.h"
 #include "DwarfTypes.h"
 #include <AK/LEB128.h>
-#include <LibCore/Stream.h>
 
 namespace Debug::Dwarf {
 

Userland/Libraries/LibDebug/Dwarf/AddressRanges.h

@@ -10,7 +10,6 @@
 #include <AK/Forward.h>
 #include <AK/Function.h>
 #include <AK/Noncopyable.h>
-#include <LibCore/Stream.h>
 
 namespace Debug::Dwarf {
 

Userland/Libraries/LibDebug/Dwarf/DwarfInfo.h

@@ -14,7 +14,6 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/RedBlackTree.h>
 #include <AK/RefCounted.h>
-#include <LibCore/Stream.h>
 #include <LibDebug/Dwarf/DIE.h>
 #include <LibELF/Image.h>
 

Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h

@@ -6,8 +6,9 @@
 
 #pragma once
 
+#include <AK/Error.h>
+#include <AK/Stream.h>
 #include <AK/Types.h>
-#include <LibCore/Stream.h>
 
 namespace Debug::Dwarf {
 

Userland/Libraries/LibDebug/Dwarf/LineProgram.h

@@ -8,7 +8,6 @@
 
 #include <AK/DeprecatedFlyString.h>
 #include <AK/Vector.h>
-#include <LibCore/Stream.h>
 #include <LibDebug/Dwarf/DwarfTypes.h>
 
 namespace Debug::Dwarf {

Userland/Libraries/LibGUI/CommonLocationsProvider.cpp

@@ -11,7 +11,6 @@
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/File.h>
 #include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
 #include <LibGUI/CommonLocationsProvider.h>
 #include <unistd.h>
 

Userland/Libraries/LibGUI/Variant.cpp

@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <AK/JsonValue.h>
 #include <AK/NonnullRefPtr.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Variant.h>

Userland/Libraries/LibGemini/Job.cpp

@@ -8,7 +8,6 @@
 #include <AK/Error.h>
 #include <AK/String.h>
 #include <AK/Utf8View.h>
-#include <LibCore/Stream.h>
 #include <LibGemini/GeminiResponse.h>
 #include <LibGemini/Job.h>
 #include <unistd.h>

Userland/Libraries/LibGfx/Font/BitmapFont.cpp

@@ -10,7 +10,6 @@
 #include <AK/Utf32View.h>
 #include <AK/Utf8View.h>
 #include <LibCore/File.h>
-#include <LibCore/Stream.h>
 #include <LibGfx/Font/FontDatabase.h>
 #include <LibGfx/Font/FontStyleMapping.h>
 #include <LibGfx/Painter.h>

Userland/Libraries/LibGfx/QOILoader.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include <AK/Forward.h>
-#include <LibCore/Stream.h>
 #include <LibGfx/Forward.h>
 #include <LibGfx/ImageDecoder.h>
 

Userland/Libraries/LibHTTP/HttpsJob.h

@@ -8,7 +8,6 @@
 
 #include <AK/HashMap.h>
 #include <LibCore/NetworkJob.h>
-#include <LibCore/Stream.h>
 #include <LibHTTP/HttpRequest.h>
 #include <LibHTTP/HttpResponse.h>
 #include <LibHTTP/Job.h>

Userland/Libraries/LibIDL/IDLParser.cpp

@@ -13,7 +13,6 @@
 #include <AK/QuickSort.h>
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/File.h>
-#include <LibCore/Stream.h>
 
 [[noreturn]] static void report_parsing_error(StringView message, StringView filename, StringView input, size_t offset)
 {

Userland/Libraries/LibIMAP/Client.cpp

@@ -5,7 +5,6 @@
  */
 
 #include <AK/OwnPtr.h>
-#include <LibCore/Stream.h>
 #include <LibIMAP/Client.h>
 
 namespace IMAP {

Userland/Libraries/LibIMAP/Client.h

@@ -8,7 +8,6 @@
 
 #include <AK/Function.h>
 #include <LibCore/Promise.h>
-#include <LibCore/Stream.h>
 #include <LibIMAP/Parser.h>
 #include <LibTLS/TLSv12.h>
 

Userland/Libraries/LibIPC/Connection.h

@@ -14,7 +14,6 @@
 #include <LibCore/EventLoop.h>
 #include <LibCore/Notifier.h>
 #include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
 #include <LibCore/Timer.h>
 #include <LibIPC/Forward.h>
 #include <LibIPC/Message.h>

Userland/Libraries/LibIPC/ConnectionToServer.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include <LibCore/SessionManagement.h>
-#include <LibCore/Stream.h>
 #include <LibIPC/Connection.h>
 
 namespace IPC {

Userland/Libraries/LibIPC/Decoder.h

@@ -15,7 +15,7 @@
 #include <AK/TypeList.h>
 #include <AK/Variant.h>
 #include <LibCore/SharedCircularQueue.h>
-#include <LibCore/Stream.h>
+#include <LibCore/Socket.h>
 #include <LibIPC/Concepts.h>
 #include <LibIPC/File.h>
 #include <LibIPC/Forward.h>

Userland/Libraries/LibIPC/File.h

@@ -10,7 +10,6 @@
 #include <AK/Noncopyable.h>
 #include <AK/StdLibExtras.h>
 #include <LibCore/File.h>
-#include <LibCore/Stream.h>
 #include <unistd.h>
 
 namespace IPC {

Userland/Libraries/LibJS/Print.cpp

@@ -8,6 +8,7 @@
 
 #include <AK/Concepts.h>
 #include <AK/DeprecatedString.h>
+#include <AK/Stream.h>
 #include <LibJS/Print.h>
 #include <LibJS/Runtime/Array.h>
 #include <LibJS/Runtime/ArrayBuffer.h>

Userland/Libraries/LibJS/Print.h

@@ -9,7 +9,6 @@
 #pragma once
 
 #include <AK/HashTable.h>
-#include <LibCore/Stream.h>
 #include <LibJS/Runtime/Value.h>
 
 namespace JS {

Userland/Libraries/LibLine/Editor.h

@@ -23,7 +23,6 @@
 #include <LibCore/EventLoop.h>
 #include <LibCore/Notifier.h>
 #include <LibCore/Object.h>
-#include <LibCore/Stream.h>
 #include <LibLine/KeyCallbackMachine.h>
 #include <LibLine/Span.h>
 #include <LibLine/StringMetrics.h>

Userland/Libraries/LibLine/VT.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <LibCore/Stream.h>
 #include <LibLine/Style.h>
 
 namespace Line {

Userland/Libraries/LibManual/Node.cpp

@@ -13,7 +13,6 @@
 #include <AK/StringView.h>
 #include <AK/URL.h>
 #include <LibCore/DeprecatedFile.h>
-#include <LibCore/Stream.h>
 #include <LibManual/Path.h>
 
 namespace Manual {

Userland/Libraries/LibProtocol/Request.h

@@ -14,7 +14,6 @@
 #include <AK/RefCounted.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/Notifier.h>
-#include <LibCore/Stream.h>
 #include <LibIPC/Forward.h>
 
 namespace Protocol {

Userland/Libraries/LibSQL/Heap.h

@@ -13,7 +13,6 @@
 #include <AK/Vector.h>
 #include <LibCore/File.h>
 #include <LibCore/Object.h>
-#include <LibCore/Stream.h>
 
 namespace SQL {
 

Userland/Libraries/LibSQL/SQLClient.cpp

@@ -14,7 +14,6 @@
 #    include <LibCore/Directory.h>
 #    include <LibCore/SocketAddress.h>
 #    include <LibCore/StandardPaths.h>
-#    include <LibCore/Stream.h>
 #    include <LibCore/System.h>
 #endif
 

Userland/Libraries/LibTLS/TLSv12.h

@@ -11,7 +11,6 @@
 #include <AK/WeakPtr.h>
 #include <LibCore/Notifier.h>
 #include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
 #include <LibCore/Timer.h>
 #include <LibCrypto/Authentication/HMAC.h>
 #include <LibCrypto/BigInt/UnsignedBigInteger.h>

Userland/Libraries/LibTest/JavaScriptTestRunner.h

@@ -18,7 +18,6 @@
 #include <AK/Tuple.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/File.h>
-#include <LibCore/Stream.h>
 #include <LibJS/Bytecode/Interpreter.h>
 #include <LibJS/Interpreter.h>
 #include <LibJS/Lexer.h>

Userland/Libraries/LibVirtGPU/Device.h

@@ -10,7 +10,6 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/Vector.h>
 #include <Kernel/API/VirGL.h>
-#include <LibCore/Stream.h>
 #include <LibGPU/Device.h>
 #include <LibVirtGPU/VirGLProtocol.h>
 

Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.cpp

@@ -6,6 +6,7 @@
  */
 
 #include <AK/Debug.h>
+#include <AK/Endian.h>
 #include <AK/MemoryStream.h>
 #include <LibWasm/AbstractMachine/AbstractMachine.h>
 #include <LibWasm/AbstractMachine/BytecodeInterpreter.h>

Userland/Libraries/LibWasm/Parser/Parser.cpp

@@ -5,6 +5,7 @@
  */
 
 #include <AK/Debug.h>
+#include <AK/Endian.h>
 #include <AK/LEB128.h>
 #include <AK/MemoryStream.h>
 #include <AK/ScopeGuard.h>

Userland/Libraries/LibWasm/Printer/Printer.h

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <LibCore/Stream.h>
 #include <LibWasm/Types.h>
 
 namespace Wasm {

Userland/Libraries/LibWasm/Types.h

@@ -13,7 +13,6 @@
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/Result.h>
 #include <AK/Variant.h>
-#include <LibCore/Stream.h>
 #include <LibWasm/Constants.h>
 #include <LibWasm/Forward.h>
 #include <LibWasm/Opcode.h>

Userland/Libraries/LibWeb/WebDriver/Client.h

@@ -14,7 +14,6 @@
 #include <AK/Variant.h>
 #include <LibCore/Object.h>
 #include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
 #include <LibHTTP/Forward.h>
 #include <LibHTTP/HttpRequest.h>
 #include <LibWeb/WebDriver/Error.h>