Merge pull request #111254 from Ivorforce/object-no-rb-rw

Remove `rw_lock.h` and `rb_map.h` includes from `object.h`.

core/config/project_settings.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/object/class_db.h"
+#include "core/templates/rb_map.h"
 
 template <typename T>
 class TypedArray;

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"
 

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;

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.

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"

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;

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

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"
 

modules/vorbis/audio_stream_ogg_vorbis.cpp

@@ -30,6 +30,8 @@
 
 #include "audio_stream_ogg_vorbis.h"
 
+#include "core/templates/rb_map.h"
+
 #include <ogg/ogg.h>
 
 int AudioStreamPlaybackOggVorbis::_mix_internal(AudioFrame *p_buffer, int p_frames) {

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 <android/log.h>
 #include <jni.h>
 #endif

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 {

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 {

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;