diff --git a/core/core_bind.cpp b/core/core_bind.cpp index b010c5b1125..6ef148089da 100644 --- a/core/core_bind.cpp +++ b/core/core_bind.cpp @@ -35,6 +35,7 @@ #include "core/crypto/crypto_core.h" #include "core/debugger/engine_debugger.h" #include "core/debugger/script_debugger.h" +#include "core/io/file_access.h" #include "core/io/marshalls.h" #include "core/math/geometry_2d.h" #include "core/math/geometry_3d.h" diff --git a/core/io/json.cpp b/core/io/json.cpp index 872d7e67452..ffc9efb26e5 100644 --- a/core/io/json.cpp +++ b/core/io/json.cpp @@ -31,6 +31,7 @@ #include "json.h" #include "core/config/engine.h" +#include "core/io/file_access.h" #include "core/object/script_language.h" #include "core/variant/container_type_validate.h" diff --git a/core/io/logger.cpp b/core/io/logger.cpp index e15a61f7eed..c9625354d25 100644 --- a/core/io/logger.cpp +++ b/core/io/logger.cpp @@ -32,6 +32,8 @@ #include "core/core_globals.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" +#include "core/object/script_backtrace.h" #include "core/os/time.h" #include "core/templates/rb_set.h" diff --git a/core/io/logger.h b/core/io/logger.h index 4acd17df442..6fa0cc24860 100644 --- a/core/io/logger.h +++ b/core/io/logger.h @@ -30,14 +30,15 @@ #pragma once -#include "core/io/file_access.h" -#include "core/object/script_backtrace.h" +#include "core/object/ref_counted.h" #include "core/string/ustring.h" #include "core/templates/vector.h" #include +class FileAccess; class RegEx; +class ScriptBacktrace; class Logger { protected: diff --git a/drivers/accesskit/accessibility_driver_accesskit.cpp b/drivers/accesskit/accessibility_driver_accesskit.cpp index a85e0b83912..fd7695af1c1 100644 --- a/drivers/accesskit/accessibility_driver_accesskit.cpp +++ b/drivers/accesskit/accessibility_driver_accesskit.cpp @@ -33,6 +33,7 @@ #include "accessibility_driver_accesskit.h" #include "core/config/project_settings.h" +#include "core/io/file_access.h" #include "core/version.h" #include "servers/text/text_server.h" diff --git a/drivers/apple/os_log_logger.cpp b/drivers/apple/os_log_logger.cpp index 23b0fe2ae65..50b695dfa9c 100644 --- a/drivers/apple/os_log_logger.cpp +++ b/drivers/apple/os_log_logger.cpp @@ -30,6 +30,7 @@ #include "os_log_logger.h" +#include "core/object/script_backtrace.h" #include "core/string/print_string.h" #include // For malloc/free diff --git a/drivers/egl/egl_manager.cpp b/drivers/egl/egl_manager.cpp index 5f7aca41cf7..f240c7c8674 100644 --- a/drivers/egl/egl_manager.cpp +++ b/drivers/egl/egl_manager.cpp @@ -32,6 +32,7 @@ #include "core/crypto/crypto_core.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" #include "drivers/gles3/rasterizer_gles3.h" #ifdef EGL_ENABLED diff --git a/drivers/metal/rendering_shader_container_metal.mm b/drivers/metal/rendering_shader_container_metal.mm index d1b7a54cdae..65efa989785 100644 --- a/drivers/metal/rendering_shader_container_metal.mm +++ b/drivers/metal/rendering_shader_container_metal.mm @@ -32,6 +32,7 @@ #import "metal_utils.h" +#import "core/io/file_access.h" #import "core/io/marshalls.h" #import "servers/rendering/rendering_device.h" diff --git a/editor/file_system/editor_paths.cpp b/editor/file_system/editor_paths.cpp index cd17559ac3d..bb80f2f616a 100644 --- a/editor/file_system/editor_paths.cpp +++ b/editor/file_system/editor_paths.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" #include "core/os/os.h" #include "main/main.h" diff --git a/modules/jpg/movie_writer_mjpeg.cpp b/modules/jpg/movie_writer_mjpeg.cpp index 5f2ba31cc5e..a20e0c922a4 100644 --- a/modules/jpg/movie_writer_mjpeg.cpp +++ b/modules/jpg/movie_writer_mjpeg.cpp @@ -30,6 +30,7 @@ #include "movie_writer_mjpeg.h" #include "core/config/project_settings.h" +#include "core/io/file_access.h" uint32_t MovieWriterMJPEG::get_audio_mix_rate() const { return mix_rate; diff --git a/modules/mbedtls/tests/test_crypto_mbedtls.cpp b/modules/mbedtls/tests/test_crypto_mbedtls.cpp index b96a0721468..beb8d9d65dd 100644 --- a/modules/mbedtls/tests/test_crypto_mbedtls.cpp +++ b/modules/mbedtls/tests/test_crypto_mbedtls.cpp @@ -32,6 +32,7 @@ #include "../crypto_mbedtls.h" +#include "core/io/file_access.h" #include "tests/test_macros.h" #include "tests/test_utils.h" diff --git a/modules/minimp3/audio_stream_mp3.cpp b/modules/minimp3/audio_stream_mp3.cpp index 48d8d273a81..6b955f3a118 100644 --- a/modules/minimp3/audio_stream_mp3.cpp +++ b/modules/minimp3/audio_stream_mp3.cpp @@ -33,6 +33,7 @@ #define MINIMP3_NO_STDIO #include "audio_stream_mp3.h" +#include "core/io/file_access.h" int AudioStreamPlaybackMP3::_mix_internal(AudioFrame *p_buffer, int p_frames) { if (!active) { diff --git a/modules/objectdb_profiler/editor/snapshot_data.cpp b/modules/objectdb_profiler/editor/snapshot_data.cpp index 023dc619c9e..6e73e995a86 100644 --- a/modules/objectdb_profiler/editor/snapshot_data.cpp +++ b/modules/objectdb_profiler/editor/snapshot_data.cpp @@ -31,6 +31,7 @@ #include "snapshot_data.h" #include "core/core_bind.h" +#include "core/io/compression.h" #include "core/object/script_language.h" #include "scene/debugger/scene_debugger.h" diff --git a/modules/objectdb_profiler/snapshot_collector.cpp b/modules/objectdb_profiler/snapshot_collector.cpp index 15fbe928a15..2e9adda205c 100644 --- a/modules/objectdb_profiler/snapshot_collector.cpp +++ b/modules/objectdb_profiler/snapshot_collector.cpp @@ -32,6 +32,7 @@ #include "core/core_bind.h" #include "core/debugger/engine_debugger.h" +#include "core/io/compression.h" #include "core/os/time.h" #include "core/version.h" #include "scene/main/node.h" diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index cfe21c18b79..8cc94cd4df0 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -49,6 +49,7 @@ using namespace godot; #include "core/config/project_settings.h" #include "core/error/error_macros.h" +#include "core/io/file_access.h" #include "core/object/worker_thread_pool.h" #include "core/string/translation_server.h" #include "scene/resources/image_texture.h" diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 53b9fb16c07..f4fea532b78 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -51,6 +51,7 @@ using namespace godot; #include "core/config/project_settings.h" #include "core/error/error_macros.h" +#include "core/io/file_access.h" #include "core/string/print_string.h" #include "core/string/translation_server.h" diff --git a/modules/theora/editor/movie_writer_ogv.cpp b/modules/theora/editor/movie_writer_ogv.cpp index f0b1b357ad8..cfe6677300e 100644 --- a/modules/theora/editor/movie_writer_ogv.cpp +++ b/modules/theora/editor/movie_writer_ogv.cpp @@ -31,6 +31,7 @@ #include "movie_writer_ogv.h" #include "core/config/project_settings.h" +#include "core/io/file_access.h" #include "rgb2yuv.h" void MovieWriterOGV::push_audio(const int32_t *p_audio_data) { diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp index 5560930a15e..60b40d8a0ad 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "audio_stream_ogg_vorbis.h" +#include "core/io/file_access.h" #include "core/templates/rb_map.h" diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index 0c307690fdd..ff35a830585 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -32,6 +32,7 @@ #include "core/io/certs_compressed.gen.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" #ifdef SDL_ENABLED #include "drivers/sdl/joypad_sdl.h" #endif diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp index 088b7ed9c0a..8e2b32a8ae8 100644 --- a/platform/linuxbsd/wayland/display_server_wayland.cpp +++ b/platform/linuxbsd/wayland/display_server_wayland.cpp @@ -46,6 +46,7 @@ #endif #ifdef GLES3_ENABLED +#include "core/io/file_access.h" #include "detect_prime_egl.h" #include "drivers/gles3/rasterizer_gles3.h" #include "wayland/egl_manager_wayland.h" diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 0be999cc867..af59cf1a140 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -36,6 +36,7 @@ #include "x11/key_mapping_x11.h" #include "core/config/project_settings.h" +#include "core/io/file_access.h" #include "core/math/math_funcs.h" #include "core/string/print_string.h" #include "core/string/ustring.h" diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index 7eac6cdd0e4..6a9b361e77c 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -45,6 +45,7 @@ #import "os_macos.h" #include "core/config/project_settings.h" +#include "core/io/file_access.h" #include "core/io/marshalls.h" #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" diff --git a/platform/macos/os_macos.mm b/platform/macos/os_macos.mm index 8f0f6662e69..7af4744266c 100644 --- a/platform/macos/os_macos.mm +++ b/platform/macos/os_macos.mm @@ -39,6 +39,7 @@ #import "godot_application_delegate.h" #include "core/crypto/crypto_core.h" +#include "core/io/file_access.h" #include "core/version_generated.gen.h" #include "drivers/apple/os_log_logger.h" #include "main/main.h" diff --git a/platform/web/os_web.cpp b/platform/web/os_web.cpp index 83fe201a8c2..11ecb570822 100644 --- a/platform/web/os_web.cpp +++ b/platform/web/os_web.cpp @@ -38,6 +38,7 @@ #include "core/config/project_settings.h" #include "core/debugger/engine_debugger.h" +#include "core/io/file_access.h" #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" #include "main/main.h" diff --git a/platform/web/web_main.cpp b/platform/web/web_main.cpp index f18a6ab1f98..2378dd32ce8 100644 --- a/platform/web/web_main.cpp +++ b/platform/web/web_main.cpp @@ -33,6 +33,7 @@ #include "os_web.h" #include "core/config/engine.h" +#include "core/io/file_access.h" #include "core/io/resource_loader.h" #include "main/main.h" #include "scene/main/scene_tree.h" diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index f6615ba036a..475fd942b76 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -36,6 +36,7 @@ #include "wgl_detect_version.h" #include "core/config/project_settings.h" +#include "core/io/file_access.h" #include "core/io/marshalls.h" #include "core/io/xml_parser.h" #include "core/version.h" diff --git a/platform/windows/windows_terminal_logger.cpp b/platform/windows/windows_terminal_logger.cpp index a28c9c4610c..e9ed9104ff7 100644 --- a/platform/windows/windows_terminal_logger.cpp +++ b/platform/windows/windows_terminal_logger.cpp @@ -30,6 +30,7 @@ #include "windows_terminal_logger.h" +#include "core/object/script_backtrace.h" #include "core/os/os.h" #ifdef WINDOWS_ENABLED diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 7ad21a67c85..2a4ea9a47a0 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" #include "core/os/keyboard.h" #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index f3d3ae01b67..68c9c3541ac 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -30,6 +30,7 @@ #include "http_request.h" +#include "core/io/file_access.h" #include "scene/main/timer.h" Error HTTPRequest::_request() { diff --git a/scene/resources/compressed_texture.cpp b/scene/resources/compressed_texture.cpp index b28c92a17bc..e4d9c24326b 100644 --- a/scene/resources/compressed_texture.cpp +++ b/scene/resources/compressed_texture.cpp @@ -30,6 +30,7 @@ #include "compressed_texture.h" +#include "core/io/file_access.h" #include "scene/resources/bit_map.h" Error CompressedTexture2D::_load_data(const String &p_path, int &r_width, int &r_height, Ref &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit) { diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index b72500d58ba..685a029ee6e 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -31,6 +31,7 @@ #include "packed_scene.h" #include "core/config/engine.h" +#include "core/io/file_access.h" #include "core/io/missing_resource.h" #include "core/io/resource_loader.h" #include "core/templates/local_vector.h" diff --git a/scene/resources/shader_include.cpp b/scene/resources/shader_include.cpp index f134ca4223a..b03396bd6fe 100644 --- a/scene/resources/shader_include.cpp +++ b/scene/resources/shader_include.cpp @@ -30,6 +30,7 @@ #include "shader_include.h" +#include "core/io/file_access.h" #include "servers/rendering/shader_preprocessor.h" void ShaderInclude::_dependency_changed() { diff --git a/scene/resources/text_file.cpp b/scene/resources/text_file.cpp index b30f0a41970..690e8df6c53 100644 --- a/scene/resources/text_file.cpp +++ b/scene/resources/text_file.cpp @@ -30,6 +30,7 @@ #include "text_file.h" +#include "core/io/file_access.h" #include "core/io/resource_loader.h" bool TextFile::has_text() const { diff --git a/servers/movie_writer/movie_writer_pngwav.cpp b/servers/movie_writer/movie_writer_pngwav.cpp index ea02ee8b714..6f5e7401252 100644 --- a/servers/movie_writer/movie_writer_pngwav.cpp +++ b/servers/movie_writer/movie_writer_pngwav.cpp @@ -31,6 +31,7 @@ #include "movie_writer_pngwav.h" #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" uint32_t MovieWriterPNGWAV::get_audio_mix_rate() const { return mix_rate; diff --git a/servers/rendering/rendering_device.cpp b/servers/rendering/rendering_device.cpp index 0cda4c6cde8..2e4fafff0a2 100644 --- a/servers/rendering/rendering_device.cpp +++ b/servers/rendering/rendering_device.cpp @@ -36,6 +36,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" #include "modules/modules_enabled.gen.h" #include "servers/rendering/rendering_shader_container.h"