Merge pull request #111274 from chocola-mint/include-optimization-logger

Remove `file_access.h` and `script_backtrace.h` includes from `logger.h`.

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"

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"
 

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"
 

core/io/logger.h

@@ -30,14 +30,15 @@
 
 #pragma once
 
-#include "core/io/file_access.h"
+#include "core/object/ref_counted.h"
-#include "core/object/script_backtrace.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 
 #include <cstdarg>
 
+class FileAccess;
 class RegEx;
+class ScriptBacktrace;
 
 class Logger {
 protected:

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"

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 <cstdlib> // For malloc/free

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

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"
 

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"
 

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;

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"
 

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) {

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"
 

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"

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"

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"
 

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) {

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"
 

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

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"

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"

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"

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"

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"

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"

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"

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

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"

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() {

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> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit) {

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"

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() {

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 {

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;

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"