diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2021-06-11 14:51:48 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2021-06-11 14:52:39 +0200 |
| commit | 9e328bb5b7bfb30b832e9ef733e535de93e1c60b (patch) | |
| tree | f575edc2e7649a28cf62c02a9acc89fbbfa6a5e0 /servers | |
| parent | 74b3b0db0e8e9dbe337faed7ce7c142327617a93 (diff) | |
| download | redot-engine-9e328bb5b7bfb30b832e9ef733e535de93e1c60b.tar.gz | |
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.
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/audio/effects/audio_effect_record.h | 2 | ||||
| -rw-r--r-- | servers/audio_server.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_compositor_rd.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/shader_rd.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h index b97ec43946..8f56e227e0 100644 --- a/servers/audio/effects/audio_effect_record.h +++ b/servers/audio/effects/audio_effect_record.h @@ -31,8 +31,8 @@ #ifndef AUDIOEFFECTRECORD_H #define AUDIOEFFECTRECORD_H +#include "core/io/file_access.h" #include "core/io/marshalls.h" -#include "core/os/file_access.h" #include "core/os/os.h" #include "core/os/thread.h" #include "editor/import/resource_importer_wav.h" diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 0e816fd4f8..acfdfa783a 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -32,8 +32,8 @@ #include "core/config/project_settings.h" #include "core/debugger/engine_debugger.h" +#include "core/io/file_access.h" #include "core/io/resource_loader.h" -#include "core/os/file_access.h" #include "core/os/os.h" #include "scene/resources/audio_stream_sample.h" #include "servers/audio/audio_driver_dummy.h" diff --git a/servers/rendering/renderer_rd/renderer_compositor_rd.cpp b/servers/rendering/renderer_rd/renderer_compositor_rd.cpp index 1337d36762..f9ac7c8fa3 100644 --- a/servers/rendering/renderer_rd/renderer_compositor_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_compositor_rd.cpp @@ -31,7 +31,7 @@ #include "renderer_compositor_rd.h" #include "core/config/project_settings.h" -#include "core/os/dir_access.h" +#include "core/io/dir_access.h" void RendererCompositorRD::prepare_for_blitting_render_targets() { RD::get_singleton()->prepare_screen_for_drawing(); diff --git a/servers/rendering/renderer_rd/shader_rd.cpp b/servers/rendering/renderer_rd/shader_rd.cpp index 6f29ff42bc..27305cc938 100644 --- a/servers/rendering/renderer_rd/shader_rd.cpp +++ b/servers/rendering/renderer_rd/shader_rd.cpp @@ -31,8 +31,8 @@ #include "shader_rd.h" #include "core/io/compression.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 "renderer_compositor_rd.h" #include "servers/rendering/rendering_device.h" #include "thirdparty/misc/smolv.h" |