Merge pull request #111297 from Repiteo/core/header-cleanup-config

Core: Clean up headers in `core/config`, forward-declare `MainLoop` in `OS`

Author: Repiteo

core/config/engine.h

@@ -30,10 +30,13 @@
 
 #pragma once
 
-#include "core/os/main_loop.h"
-#include "core/string/ustring.h"
+#include "core/string/string_name.h"
+#include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 
+class Object;
+class Dictionary;
+
 template <typename T>
 class TypedArray;
 

core/config/project_settings.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
 #include "core/templates/rb_map.h"
 
 template <typename T>

core/core_bind.cpp

@@ -40,6 +40,7 @@
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
 #include "core/os/keyboard.h"
+#include "core/os/main_loop.h"
 #include "core/os/thread_safe.h"
 #include "core/variant/typed_array.h"
 

core/debugger/local_debugger.cpp

@@ -31,6 +31,7 @@
 #include "local_debugger.h"
 
 #include "core/debugger/script_debugger.h"
+#include "core/os/main_loop.h"
 #include "core/os/os.h"
 
 struct LocalDebugger::ScriptsProfiler {

core/io/file_access.cpp

@@ -37,6 +37,7 @@
 #include "core/io/file_access_encrypted.h"
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
+#include "core/io/resource_uid.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
 

core/object/object.h

@@ -566,6 +566,7 @@ public:                                              \
                                                      \
 private:
 
+class ClassDB;
 class ScriptInstance;
 
 class Object {
@@ -781,7 +782,7 @@ class Object {
 
 	void _clear_internal_resource_paths(const Variant &p_var);
 
-	friend class ClassDB;
+	friend class ::ClassDB;
 	friend class PlaceholderExtensionInstance;
 
 	static void _add_class_to_classdb(const StringName &p_class, const StringName &p_inherits);

core/object/worker_thread_pool.h

@@ -39,6 +39,7 @@
 #include "core/templates/paged_allocator.h"
 #include "core/templates/rid.h"
 #include "core/templates/safe_refcount.h"
+#include "core/templates/self_list.h"
 
 class WorkerThreadPool : public Object {
 	GDCLASS(WorkerThreadPool, Object)

core/os/main_loop.h

@@ -30,9 +30,8 @@
 
 #pragma once
 
-#include "core/input/input_event.h"
 #include "core/object/gdvirtual.gen.inc"
-#include "core/object/ref_counted.h"
+#include "core/object/object.h"
 
 class MainLoop : public Object {
 	GDCLASS(MainLoop, Object);

core/os/os.h

@@ -40,6 +40,8 @@
 
 #include <cstdlib>
 
+class MainLoop;
+
 class OS {
 	static OS *singleton;
 	static uint64_t target_ticks;
@@ -223,6 +225,7 @@ class OS {
 
 	void ensure_user_data_dir();
 
+	// NOTE: MainLoop is forward-declared in OS and should be included to use this.
 	virtual MainLoop *get_main_loop() const = 0;
 
 	virtual void yield();

core/string/translation_server.cpp

@@ -33,6 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
+#include "core/os/main_loop.h"
 #include "core/os/os.h"
 #include "core/string/locales.h"