rm class_db.h from resource.h

Author: StarryWorm

core/core_bind.h

@@ -33,6 +33,7 @@
 #include "core/debugger/engine_profiler.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "core/object/script_backtrace.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"

core/io/http_client_tcp.cpp

@@ -33,6 +33,7 @@
 #include "http_client_tcp.h"
 
 #include "core/io/stream_peer_tls.h"
+#include "core/object/class_db.h"
 #include "core/version.h"
 
 HTTPClient *HTTPClientTCP::_create_func(bool p_notify_postinitialize) {

core/io/image_loader.h

@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/core_bind.h"
 #include "core/io/file_access.h"
 #include "core/io/image.h"
 #include "core/io/resource_loader.h"

core/io/resource.cpp

@@ -38,6 +38,14 @@
 #include "core/variant/container_type_validate.h"
 #include "scene/main/node.h" //only so casting works
 
+void Resource::register_custom_data_to_otdb() {
+	ClassDB::add_resource_base_extension("res", get_class_static());
+}
+
+void Resource::_add_resource_base_extension_to_classdb(const String &p_extension, const String &p_class) {
+	ClassDB::add_resource_base_extension(p_extension, p_class);
+}
+
 void Resource::emit_changed() {
 	if (emit_changed_state != EMIT_CHANGED_UNBLOCKED) {
 		emit_changed_state = EMIT_CHANGED_BLOCKED_PENDING_EMIT;

core/io/resource.h

@@ -31,18 +31,18 @@
 #pragma once
 
 #include "core/io/resource_uid.h"
-#include "core/object/class_db.h"
 #include "core/object/gdvirtual.gen.h"
 #include "core/object/ref_counted.h"
 #include "core/templates/safe_refcount.h"
 #include "core/templates/self_list.h"
 
 class Node;
+class RWLock;
 
 #define RES_BASE_EXTENSION(m_ext) \
 public: \
 	static void register_custom_data_to_otdb() { \
-		ClassDB::add_resource_base_extension(m_ext, get_class_static()); \
+		Resource::_add_resource_base_extension_to_classdb(m_ext, get_class_static()); \
 	} \
 	virtual String get_base_extension() const override { \
 		return m_ext; \
@@ -56,10 +56,11 @@ class Resource : public RefCounted {
 public:
 	static constexpr AncestralClass static_ancestral_class = AncestralClass::RESOURCE;
 
-	static void register_custom_data_to_otdb() { ClassDB::add_resource_base_extension("res", get_class_static()); }
+	static void register_custom_data_to_otdb();
 	virtual String get_base_extension() const { return "res"; }
 
 protected:
+	static void _add_resource_base_extension_to_classdb(const String &p_extension, const String &p_class);
 	struct DuplicateParams {
 		bool deep = false;
 		ResourceDeepDuplicateMode subres_mode = RESOURCE_DEEP_DUPLICATE_MAX;

core/io/resource_format_binary.cpp

@@ -34,6 +34,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access_compressed.h"
 #include "core/io/missing_resource.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/version.h"
 #include "scene/property_utils.h"

core/io/stream_peer_gzip.h

@@ -32,7 +32,6 @@
 
 #include "core/io/stream_peer.h"
 
-#include "core/core_bind.h"
 #include "core/io/compression.h"
 #include "core/templates/ring_buffer.h"
 

core/variant/container_type_validate.h

@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/variant/variant.h"
 

core/variant/variant_parser.cpp

@@ -33,6 +33,7 @@
 #include "core/crypto/crypto_core.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_uid.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/string/string_buffer.h"
 

drivers/metal/metal_objects_shared.cpp

@@ -34,6 +34,7 @@
 
 #include <os/signpost.h>
 #include <simd/simd.h>
+#include <shared_mutex>
 #include <string>
 
 #pragma mark - Resource Factory