Core: Move DirAccess and FileAccess to core/io

File handling APIs are typically considered part of I/O, and we did have most
`FileAccess` implementations in `core/io` already.

core/config/project_settings.cpp

@@ -33,11 +33,11 @@
 #include "core/core_bind.h"
 #include "core/core_string_names.h"
 #include "core/input/input_map.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
 #include "core/io/file_access_network.h"
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
-#include "core/os/dir_access.h"
-#include "core/os/file_access.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/variant/variant_parser.h"

core/core_bind.h

@@ -32,11 +32,11 @@
 #define CORE_BIND_H
 
 #include "core/io/compression.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
 #include "core/io/image.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/os/dir_access.h"
-#include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"

core/io/config_file.h

@@ -31,8 +31,8 @@
 #ifndef CONFIG_FILE_H
 #define CONFIG_FILE_H
 
+#include "core/io/file_access.h"
 #include "core/object/reference.h"
-#include "core/os/file_access.h"
 #include "core/templates/ordered_hash_map.h"
 #include "core/variant/variant_parser.h"
 

core/os/dir_access.cpp → core/io/dir_access.cpp

@@ -31,7 +31,7 @@
 #include "dir_access.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
 

core/io/dtls_server.cpp

@@ -31,7 +31,7 @@
 #include "dtls_server.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 
 DTLSServer *(*DTLSServer::_create)() = nullptr;
 bool DTLSServer::available = false;

core/io/file_access_compressed.h

@@ -32,7 +32,7 @@
 #define FILE_ACCESS_COMPRESSED_H
 
 #include "core/io/compression.h"
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 
 class FileAccessCompressed : public FileAccess {
 	Compression::Mode cmode = Compression::MODE_ZSTD;

core/io/file_access_encrypted.h

@@ -31,7 +31,7 @@
 #ifndef FILE_ACCESS_ENCRYPTED_H
 #define FILE_ACCESS_ENCRYPTED_H
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 
 #define ENCRYPTED_HEADER_MAGIC 0x43454447
 

core/io/file_access_memory.cpp

@@ -31,7 +31,7 @@
 #include "file_access_memory.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/dir_access.h"
+#include "core/io/dir_access.h"
 #include "core/templates/map.h"
 
 static Map<String, Vector<uint8_t>> *files = nullptr;

core/io/file_access_memory.h

@@ -31,7 +31,7 @@
 #ifndef FILE_ACCESS_MEMORY_H
 #define FILE_ACCESS_MEMORY_H
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 
 class FileAccessMemory : public FileAccess {
 	uint8_t *data = nullptr;

core/io/file_access_network.h

@@ -31,8 +31,8 @@
 #ifndef FILE_ACCESS_NETWORK_H
 #define FILE_ACCESS_NETWORK_H
 
+#include "core/io/file_access.h"
 #include "core/io/stream_peer_tcp.h"
-#include "core/os/file_access.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 

core/io/file_access_pack.h

@@ -31,8 +31,8 @@
 #ifndef FILE_ACCESS_PACK_H
 #define FILE_ACCESS_PACK_H
 
-#include "core/os/dir_access.h"
-#include "core/os/file_access.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
 #include "core/string/print_string.h"
 #include "core/templates/list.h"
 #include "core/templates/map.h"

core/io/file_access_zip.cpp

@@ -32,7 +32,7 @@
 
 #include "file_access_zip.h"
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 
 ZipArchive *ZipArchive::instance = nullptr;
 

core/io/image_loader.h

@@ -31,9 +31,9 @@
 #ifndef IMAGE_LOADER_H
 #define IMAGE_LOADER_H
 
+#include "core/io/file_access.h"
 #include "core/io/image.h"
 #include "core/io/resource_loader.h"
-#include "core/os/file_access.h"
 #include "core/string/ustring.h"
 #include "core/templates/list.h"
 

core/io/logger.cpp

@@ -31,7 +31,7 @@
 #include "logger.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/dir_access.h"
+#include "core/io/dir_access.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 

core/io/logger.h

@@ -31,7 +31,7 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 

core/io/packet_peer_dtls.cpp

@@ -30,7 +30,7 @@
 
 #include "packet_peer_dtls.h"
 #include "core/config/project_settings.h"
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 
 PacketPeerDTLS *(*PacketPeerDTLS::_create)() = nullptr;
 bool PacketPeerDTLS::available = false;

core/io/pck_packer.cpp

@@ -31,9 +31,9 @@
 #include "pck_packer.h"
 
 #include "core/crypto/crypto_core.h"
+#include "core/io/file_access.h"
 #include "core/io/file_access_encrypted.h"
 #include "core/io/file_access_pack.h" // PACK_HEADER_MAGIC, PACK_FORMAT_VERSION
-#include "core/os/file_access.h"
 #include "core/version.h"
 
 static int _get_pad(int p_alignment, int p_n) {

core/io/resource.cpp

@@ -31,9 +31,9 @@
 #include "resource.h"
 
 #include "core/core_string_names.h"
+#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
-#include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "scene/main/node.h" //only so casting works
 

core/io/resource_format_binary.cpp

@@ -31,10 +31,10 @@
 #include "resource_format_binary.h"
 
 #include "core/config/project_settings.h"
+#include "core/io/dir_access.h"
 #include "core/io/file_access_compressed.h"
 #include "core/io/image.h"
 #include "core/io/marshalls.h"
-#include "core/os/dir_access.h"
 #include "core/version.h"
 
 //#define print_bl(m_what) print_line(m_what)

core/io/resource_format_binary.h

@@ -31,9 +31,9 @@
 #ifndef RESOURCE_FORMAT_BINARY_H
 #define RESOURCE_FORMAT_BINARY_H
 
+#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/os/file_access.h"
 
 class ResourceLoaderBinary {
 	bool translation_remapped = false;

core/io/resource_loader.cpp

@@ -31,8 +31,8 @@
 #include "resource_loader.h"
 
 #include "core/config/project_settings.h"
+#include "core/io/file_access.h"
 #include "core/io/resource_importer.h"
-#include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/translation.h"

core/io/resource_saver.cpp

@@ -30,9 +30,9 @@
 
 #include "resource_saver.h"
 #include "core/config/project_settings.h"
+#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
-#include "core/os/file_access.h"
 
 Ref<ResourceFormatSaver> ResourceSaver::saver[MAX_SAVERS];
 

core/io/translation_loader_po.cpp

@@ -30,7 +30,7 @@
 
 #include "translation_loader_po.h"
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 #include "core/string/translation.h"
 #include "core/string/translation_po.h"
 

core/io/translation_loader_po.h

@@ -31,8 +31,8 @@
 #ifndef TRANSLATION_LOADER_PO_H
 #define TRANSLATION_LOADER_PO_H
 
+#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/os/file_access.h"
 #include "core/string/translation.h"
 
 class TranslationLoaderPO : public ResourceFormatLoader {

core/io/xml_parser.h

@@ -31,8 +31,8 @@
 #ifndef XML_PARSER_H
 #define XML_PARSER_H
 
+#include "core/io/file_access.h"
 #include "core/object/reference.h"
-#include "core/os/file_access.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 

core/io/zip_io.h

@@ -31,7 +31,7 @@
 #ifndef ZIP_IO_H
 #define ZIP_IO_H
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 
 // Not directly used in this header, but assumed available in downstream users
 // like platform/*/export/export.cpp. Could be fixed, but probably better to have

core/math/delaunay_3d.h

@@ -31,10 +31,10 @@
 #ifndef DELAUNAY_3D_H
 #define DELAUNAY_3D_H
 
+#include "core/io/file_access.h"
 #include "core/math/aabb.h"
 #include "core/math/camera_matrix.h"
 #include "core/math/vector3.h"
-#include "core/os/file_access.h"
 #include "core/string/print_string.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/oa_hash_map.h"

core/os/os.cpp

@@ -32,8 +32,8 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
-#include "core/os/dir_access.h"
-#include "core/os/file_access.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
 #include "core/os/midi_driver.h"
 #include "core/version_generated.gen.h"
 #include "servers/audio_server.h"

core/string/translation_po.cpp

@@ -30,7 +30,7 @@
 
 #include "translation_po.h"
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 
 #ifdef DEBUG_TRANSLATION_PO
 void TranslationPO::print_translation_map() {

core/variant/variant_parser.h

@@ -31,8 +31,8 @@
 #ifndef VARIANT_PARSER_H
 #define VARIANT_PARSER_H
 
+#include "core/io/file_access.h"
 #include "core/io/resource.h"
-#include "core/os/file_access.h"
 #include "core/variant/variant.h"
 
 class VariantParser {

drivers/png/resource_saver_png.cpp

@@ -30,8 +30,8 @@
 
 #include "resource_saver_png.h"
 
+#include "core/io/file_access.h"
 #include "core/io/image.h"
-#include "core/os/file_access.h"
 #include "drivers/png/png_driver_common.h"
 #include "scene/resources/texture.h"
 

drivers/unix/dir_access_unix.h

@@ -33,7 +33,7 @@
 
 #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED)
 
-#include "core/os/dir_access.h"
+#include "core/io/dir_access.h"
 
 #include <dirent.h>
 #include <sys/stat.h>

drivers/unix/file_access_unix.h

@@ -31,7 +31,7 @@
 #ifndef FILE_ACCESS_UNIX_H
 #define FILE_ACCESS_UNIX_H
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 #include "core/os/memory.h"
 
 #include <stdio.h>

drivers/vulkan/rendering_device_vulkan.cpp

@@ -31,7 +31,7 @@
 #include "rendering_device_vulkan.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 #include "core/os/os.h"
 #include "core/templates/hashfuncs.h"
 #include "drivers/vulkan/vulkan_context.h"

drivers/windows/dir_access_windows.h

@@ -33,7 +33,7 @@
 
 #ifdef WINDOWS_ENABLED
 
-#include "core/os/dir_access.h"
+#include "core/io/dir_access.h"
 
 /**
 	@author Juan Linietsky <[email protected]>

drivers/windows/file_access_windows.h

@@ -33,7 +33,7 @@
 
 #ifdef WINDOWS_ENABLED
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 #include "core/os/memory.h"
 
 #include <stdio.h>

editor/dependency_editor.cpp

@@ -30,8 +30,8 @@
 
 #include "dependency_editor.h"
 
+#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/os/file_access.h"
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "scene/gui/margin_container.h"

editor/doc_tools.cpp

@@ -34,9 +34,9 @@
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
 #include "core/io/compression.h"
+#include "core/io/dir_access.h"
 #include "core/io/marshalls.h"
 #include "core/object/script_language.h"
-#include "core/os/dir_access.h"
 #include "core/version.h"
 #include "scene/resources/theme.h"
 

editor/editor_asset_installer.cpp

@@ -30,9 +30,9 @@
 
 #include "editor_asset_installer.h"
 
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
 #include "core/io/zip_io.h"
-#include "core/os/dir_access.h"
-#include "core/os/file_access.h"
 #include "editor_node.h"
 #include "progress_dialog.h"