diff --git a/Libraries/LibCore/File.cpp b/Libraries/LibCore/File.cpp index 81d9513c31..07192a9b18 100644 --- a/Libraries/LibCore/File.cpp +++ b/Libraries/LibCore/File.cpp @@ -241,7 +241,7 @@ static RefPtr stdin_file; static RefPtr stdout_file; static RefPtr stderr_file; -NonnullRefPtr File::stdin() +NonnullRefPtr File::standard_input() { if (!stdin_file) { stdin_file = File::construct(); @@ -250,7 +250,7 @@ NonnullRefPtr File::stdin() return *stdin_file; } -NonnullRefPtr File::stdout() +NonnullRefPtr File::standard_output() { if (!stdout_file) { stdout_file = File::construct(); @@ -259,7 +259,7 @@ NonnullRefPtr File::stdout() return *stdout_file; } -NonnullRefPtr File::stderr() +NonnullRefPtr File::standard_error() { if (!stderr_file) { stderr_file = File::construct(); diff --git a/Libraries/LibCore/File.h b/Libraries/LibCore/File.h index de328957aa..040a2813b7 100644 --- a/Libraries/LibCore/File.h +++ b/Libraries/LibCore/File.h @@ -58,9 +58,9 @@ public: }; bool open(int fd, IODevice::OpenMode, ShouldCloseFileDescriptor); - static NonnullRefPtr stdin(); - static NonnullRefPtr stdout(); - static NonnullRefPtr stderr(); + static NonnullRefPtr standard_input(); + static NonnullRefPtr standard_output(); + static NonnullRefPtr standard_error(); private: File(Object* parent = nullptr) diff --git a/Libraries/LibCore/FileStream.h b/Libraries/LibCore/FileStream.h index c297e96333..0c8774d28a 100644 --- a/Libraries/LibCore/FileStream.h +++ b/Libraries/LibCore/FileStream.h @@ -128,14 +128,14 @@ public: return Buffered { file_result.value() }; } - static OutputFileStream stdout() + static OutputFileStream standard_output() { - return OutputFileStream { Core::File::stdout() }; + return OutputFileStream { Core::File::standard_output() }; } static Buffered stdout_buffered() { - return Buffered { Core::File::stdout() }; + return Buffered { Core::File::standard_output() }; } size_t write(ReadonlyBytes bytes) override diff --git a/Services/ChessEngine/main.cpp b/Services/ChessEngine/main.cpp index 690c7417d5..60d6ec8397 100644 --- a/Services/ChessEngine/main.cpp +++ b/Services/ChessEngine/main.cpp @@ -44,6 +44,6 @@ int main() return 1; } - auto engine = ChessEngine::construct(Core::File::stdin(), Core::File::stdout()); + auto engine = ChessEngine::construct(Core::File::standard_input(), Core::File::standard_output()); return loop.exec(); } diff --git a/Userland/grep.cpp b/Userland/grep.cpp index faf3342f22..b06e0accfb 100644 --- a/Userland/grep.cpp +++ b/Userland/grep.cpp @@ -186,7 +186,7 @@ int main(int argc, char** argv) }; if (!files.size() && !recursive) { - auto stdin_file = Core::File::stdin(); + auto stdin_file = Core::File::standard_input(); for (;;) { auto line = stdin_file->read_line(); bool is_binary = line.bytes().contains_slow(0); diff --git a/Userland/hexdump.cpp b/Userland/hexdump.cpp index 8d6dd3310b..a4c4b04cb8 100644 --- a/Userland/hexdump.cpp +++ b/Userland/hexdump.cpp @@ -41,7 +41,7 @@ int main(int argc, char** argv) RefPtr file; if (!path) { - file = Core::File::stdin(); + file = Core::File::standard_input(); } else { auto file_or_error = Core::File::open(path, Core::File::ReadOnly); if (file_or_error.is_error()) { diff --git a/Userland/tar.cpp b/Userland/tar.cpp index 75eb635da9..b828e3d8d1 100644 --- a/Userland/tar.cpp +++ b/Userland/tar.cpp @@ -62,7 +62,7 @@ int main(int argc, char** argv) } if (list || extract) { - auto file = Core::File::stdin(); + auto file = Core::File::standard_input(); if (archive_file) { auto maybe_file = Core::File::open(archive_file, Core::IODevice::OpenMode::ReadOnly);