From 9d44b68867b2b62fb80c489c3b77469f38d73f96 Mon Sep 17 00:00:00 2001 From: Lukas Tenbrink Date: Sat, 4 Oct 2025 16:58:31 +0200 Subject: [PATCH] Remove `rw_lock.h` and `rb_map.h` includes from `object.h`. --- core/config/project_settings.h | 1 + core/input/input.h | 1 + core/io/resource_format_binary.h | 1 + core/object/class_db.h | 1 + core/object/object.h | 2 -- modules/gdscript/gdscript_byte_codegen.h | 2 ++ modules/mono/csharp_script.h | 1 + modules/mono/managed_callable.h | 1 + modules/vorbis/audio_stream_ogg_vorbis.cpp | 2 ++ platform/android/api/java_class_wrapper.h | 2 ++ platform/android/api/jni_singleton.h | 1 + scene/resources/curve.h | 1 + scene/resources/syntax_highlighter.h | 1 + 13 files changed, 15 insertions(+), 2 deletions(-) diff --git a/core/config/project_settings.h b/core/config/project_settings.h index 01228a914b1..149a73eb637 100644 --- a/core/config/project_settings.h +++ b/core/config/project_settings.h @@ -31,6 +31,7 @@ #pragma once #include "core/object/class_db.h" +#include "core/templates/rb_map.h" template class TypedArray; diff --git a/core/input/input.h b/core/input/input.h index 66867b19582..8e8e0098e5d 100644 --- a/core/input/input.h +++ b/core/input/input.h @@ -34,6 +34,7 @@ #include "core/object/object.h" #include "core/os/keyboard.h" #include "core/os/thread_safe.h" +#include "core/templates/rb_map.h" #include "core/templates/rb_set.h" #include "core/variant/typed_array.h" diff --git a/core/io/resource_format_binary.h b/core/io/resource_format_binary.h index 9e86310cf72..b244775a401 100644 --- a/core/io/resource_format_binary.h +++ b/core/io/resource_format_binary.h @@ -33,6 +33,7 @@ #include "core/io/file_access.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" +#include "core/templates/rb_map.h" class ResourceLoaderBinary { bool translation_remapped = false; diff --git a/core/object/class_db.h b/core/object/class_db.h index 02d07ea0af6..0216832eee5 100644 --- a/core/object/class_db.h +++ b/core/object/class_db.h @@ -32,6 +32,7 @@ #include "core/object/method_bind.h" #include "core/object/object.h" +#include "core/os/rw_lock.h" #include "core/string/print_string.h" // Makes callable_mp readily available in all classes connecting signals. diff --git a/core/object/object.h b/core/object/object.h index c2cbad425ac..53807901e85 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -33,12 +33,10 @@ #include "core/extension/gdextension_interface.h" #include "core/object/message_queue.h" #include "core/object/object_id.h" -#include "core/os/rw_lock.h" #include "core/os/spin_lock.h" #include "core/templates/hash_map.h" #include "core/templates/hash_set.h" #include "core/templates/list.h" -#include "core/templates/rb_map.h" #include "core/templates/safe_refcount.h" #include "core/variant/callable_bind.h" #include "core/variant/variant.h" diff --git a/modules/gdscript/gdscript_byte_codegen.h b/modules/gdscript/gdscript_byte_codegen.h index 592e2f993ae..11456683b9e 100644 --- a/modules/gdscript/gdscript_byte_codegen.h +++ b/modules/gdscript/gdscript_byte_codegen.h @@ -35,6 +35,8 @@ #include "gdscript_function.h" #include "gdscript_utility_functions.h" +#include "core/templates/rb_map.h" + class GDScriptByteCodeGenerator : public GDScriptCodeGenerator { struct StackSlot { Variant::Type type = Variant::NIL; diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h index 5686e9150c0..88e7a177982 100644 --- a/modules/mono/csharp_script.h +++ b/modules/mono/csharp_script.h @@ -37,6 +37,7 @@ #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/object/script_language.h" +#include "core/templates/rb_map.h" #include "core/templates/self_list.h" #ifdef TOOLS_ENABLED diff --git a/modules/mono/managed_callable.h b/modules/mono/managed_callable.h index 3e5944e3f99..380c26bd1da 100644 --- a/modules/mono/managed_callable.h +++ b/modules/mono/managed_callable.h @@ -33,6 +33,7 @@ #include "mono_gc_handle.h" #include "core/os/mutex.h" +#include "core/templates/rb_map.h" #include "core/templates/self_list.h" #include "core/variant/callable.h" diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp index e8191d33cf0..5560930a15e 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp @@ -30,6 +30,8 @@ #include "audio_stream_ogg_vorbis.h" +#include "core/templates/rb_map.h" + #include int AudioStreamPlaybackOggVorbis::_mix_internal(AudioFrame *p_buffer, int p_frames) { diff --git a/platform/android/api/java_class_wrapper.h b/platform/android/api/java_class_wrapper.h index e0f59df2248..b09684ff749 100644 --- a/platform/android/api/java_class_wrapper.h +++ b/platform/android/api/java_class_wrapper.h @@ -34,6 +34,8 @@ #include "core/variant/typed_array.h" #ifdef ANDROID_ENABLED +#include "core/templates/rb_map.h" + #include #include #endif diff --git a/platform/android/api/jni_singleton.h b/platform/android/api/jni_singleton.h index 64c1e8bf6ad..253f1dded8f 100644 --- a/platform/android/api/jni_singleton.h +++ b/platform/android/api/jni_singleton.h @@ -33,6 +33,7 @@ #include "java_class_wrapper.h" #include "core/config/engine.h" +#include "core/templates/rb_map.h" #include "core/variant/variant.h" class JNISingleton : public Object { diff --git a/scene/resources/curve.h b/scene/resources/curve.h index f8574a2c758..02e2e9168db 100644 --- a/scene/resources/curve.h +++ b/scene/resources/curve.h @@ -31,6 +31,7 @@ #pragma once #include "core/io/resource.h" +#include "core/templates/rb_map.h" // y(x) curve class Curve : public Resource { diff --git a/scene/resources/syntax_highlighter.h b/scene/resources/syntax_highlighter.h index b3db164b01e..52ad2a2237c 100644 --- a/scene/resources/syntax_highlighter.h +++ b/scene/resources/syntax_highlighter.h @@ -32,6 +32,7 @@ #include "core/io/resource.h" #include "core/object/gdvirtual.gen.inc" +#include "core/templates/rb_map.h" class TextEdit;