Merge pull request #100634 from YYF233333/iwyu2

Remove unused headers in servers
godotengine · Dec 20, 2024 · fd5548a · fd5548a
2 parents 024b6bc + e88e30c
commit fd5548a
Show file tree

Hide file tree

Showing 109 changed files with 32 additions and 199 deletions.
diff --git a/drivers/gles3/environment/fog.h b/drivers/gles3/environment/fog.h
@@ -33,9 +33,6 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/local_vector.h"
-#include "core/templates/rid_owner.h"
-#include "core/templates/self_list.h"
 #include "servers/rendering/environment/renderer_fog.h"
 
 namespace GLES3 {

diff --git a/drivers/gles3/environment/gi.h b/drivers/gles3/environment/gi.h
@@ -33,13 +33,8 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/local_vector.h"
-#include "core/templates/rid_owner.h"
-#include "core/templates/self_list.h"
 #include "servers/rendering/environment/renderer_gi.h"
 
-#include "platform_gl.h"
-
 namespace GLES3 {
 
 class GI : public RendererGI {

diff --git a/drivers/gles3/storage/light_storage.cpp b/drivers/gles3/storage/light_storage.cpp
@@ -33,7 +33,6 @@
 #include "light_storage.h"
 #include "../rasterizer_gles3.h"
 #include "../rasterizer_scene_gles3.h"
-#include "config.h"
 #include "core/config/project_settings.h"
 #include "texture_storage.h"
 

diff --git a/drivers/gles3/storage/light_storage.h b/drivers/gles3/storage/light_storage.h
@@ -38,9 +38,7 @@
 
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
-#include "core/templates/self_list.h"
 #include "drivers/gles3/storage/texture_storage.h"
-#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/storage/light_storage.h"
 #include "servers/rendering/storage/utilities.h"
 

diff --git a/drivers/gles3/storage/material_storage.h b/drivers/gles3/storage/material_storage.h
@@ -33,10 +33,8 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
-#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/shader_compiler.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/storage/material_storage.h"

diff --git a/drivers/gles3/storage/particles_storage.h b/drivers/gles3/storage/particles_storage.h
@@ -33,7 +33,6 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
 #include "drivers/gles3/shaders/particles_copy.glsl.gen.h"

diff --git a/main/main.cpp b/main/main.cpp
@@ -66,6 +66,7 @@
 #include "scene/register_scene_types.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
+#include "servers/audio/audio_driver_dummy.h"
 #include "servers/audio_server.h"
 #include "servers/camera_server.h"
 #include "servers/display_server.h"

diff --git a/modules/camera/camera_feed_linux.cpp b/modules/camera/camera_feed_linux.cpp
@@ -30,6 +30,8 @@
 
 #include "camera_feed_linux.h"
 
+#include "servers/rendering_server.h"
+
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>

diff --git a/platform/ios/keyboard_input_view.mm b/platform/ios/keyboard_input_view.mm
@@ -184,7 +184,7 @@ - (void)observeTextChange:(NSNotification *)notification {
 
 	NSInteger skip = 0;
 	if (substringToDelete != nil) {
-		for (NSInteger i = 0; i < MIN([substringToDelete length], [substringToEnter length]); i++) {
+		for (NSUInteger i = 0; i < MIN([substringToDelete length], [substringToEnter length]); i++) {
 			if ([substringToDelete characterAtIndex:i] == [substringToEnter characterAtIndex:i]) {
 				skip++;
 			} else {

diff --git a/scene/resources/sky.cpp b/scene/resources/sky.cpp
@@ -30,8 +30,6 @@
 
 #include "sky.h"
 
-#include "core/io/image_loader.h"
-
 void Sky::set_radiance_size(RadianceSize p_size) {
 	ERR_FAIL_INDEX(p_size, RADIANCE_SIZE_MAX);
 

diff --git a/scene/resources/sky.h b/scene/resources/sky.h
@@ -33,7 +33,6 @@
 
 #include "core/os/thread.h"
 #include "scene/resources/material.h"
-#include "scene/resources/texture.h"
 
 class Sky : public Resource {
 	GDCLASS(Sky, Resource);

diff --git a/servers/audio/audio_driver_dummy.cpp b/servers/audio/audio_driver_dummy.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_driver_dummy.h"
 
-#include "core/config/project_settings.h"
 #include "core/os/os.h"
 
 AudioDriverDummy *AudioDriverDummy::singleton = nullptr;

diff --git a/servers/audio/audio_filter_sw.cpp b/servers/audio/audio_filter_sw.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_filter_sw.h"
 
+#include "core/math/math_funcs.h"
+
 void AudioFilterSW::set_mode(Mode p_mode) {
 	mode = p_mode;
 }

diff --git a/servers/audio/audio_filter_sw.h b/servers/audio/audio_filter_sw.h
@@ -31,7 +31,7 @@
 #ifndef AUDIO_FILTER_SW_H
 #define AUDIO_FILTER_SW_H
 
-#include "core/math/math_funcs.h"
+#include "core/typedefs.h"
 
 class AudioFilterSW {
 public:

diff --git a/servers/audio/audio_rb_resampler.cpp b/servers/audio/audio_rb_resampler.cpp
@@ -29,9 +29,9 @@
 /**************************************************************************/
 
 #include "audio_rb_resampler.h"
-#include "core/math/math_funcs.h"
-#include "core/os/os.h"
-#include "servers/audio_server.h"
+
+#include "core/math/audio_frame.h"
+#include "core/os/memory.h"
 
 int AudioRBResampler::get_channel_count() const {
 	if (!rb) {

diff --git a/servers/audio/audio_rb_resampler.h b/servers/audio/audio_rb_resampler.h
@@ -31,10 +31,9 @@
 #ifndef AUDIO_RB_RESAMPLER_H
 #define AUDIO_RB_RESAMPLER_H
 
-#include "core/os/memory.h"
+#include "core/math/audio_frame.h"
 #include "core/templates/safe_refcount.h"
 #include "core/typedefs.h"
-#include "servers/audio_server.h"
 
 struct AudioRBResampler {
 	uint32_t rb_bits;

diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
@@ -31,7 +31,6 @@
 #include "audio_stream.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/os.h"
 
 void AudioStreamPlayback::start(double p_from_pos) {
 	if (GDVIRTUAL_CALL(_start, p_from_pos)) {

diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h
@@ -31,10 +31,8 @@
 #ifndef AUDIO_STREAM_H
 #define AUDIO_STREAM_H
 
-#include "core/io/image.h"
 #include "core/io/resource.h"
 #include "scene/property_list_helper.h"
-#include "servers/audio/audio_filter_sw.h"
 #include "servers/audio_server.h"
 
 #include "core/object/gdvirtual.gen.inc"

diff --git a/servers/audio/effects/audio_effect_capture.cpp b/servers/audio/effects/audio_effect_capture.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_effect_capture.h"
 
+#include "servers/audio_server.h"
+
 bool AudioEffectCapture::can_get_buffer(int p_frames) const {
 	return buffer.data_left() >= p_frames;
 }

diff --git a/servers/audio/effects/audio_effect_capture.h b/servers/audio/effects/audio_effect_capture.h
@@ -31,13 +31,10 @@
 #ifndef AUDIO_EFFECT_CAPTURE_H
 #define AUDIO_EFFECT_CAPTURE_H
 
-#include "core/config/engine.h"
 #include "core/math/audio_frame.h"
 #include "core/object/ref_counted.h"
 #include "core/templates/ring_buffer.h"
-#include "core/templates/vector.h"
 #include "servers/audio/audio_effect.h"
-#include "servers/audio_server.h"
 
 class AudioEffectCapture;
 

diff --git a/servers/audio/effects/audio_effect_phaser.cpp b/servers/audio/effects/audio_effect_phaser.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "audio_effect_phaser.h"
-#include "core/math/math_funcs.h"
 #include "servers/audio_server.h"
 
 void AudioEffectPhaserInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {

diff --git a/servers/audio/effects/audio_effect_record.cpp b/servers/audio/effects/audio_effect_record.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_effect_record.h"
 
+#include "core/io/marshalls.h"
+
 void AudioEffectRecordInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	if (!is_recording) {
 		for (int i = 0; i < p_frame_count; i++) {

diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h
@@ -31,9 +31,6 @@
 #ifndef AUDIO_EFFECT_RECORD_H
 #define AUDIO_EFFECT_RECORD_H
 
-#include "core/io/file_access.h"
-#include "core/io/marshalls.h"
-#include "core/os/os.h"
 #include "core/os/thread.h"
 #include "scene/resources/audio_stream_wav.h"
 #include "servers/audio/audio_effect.h"

diff --git a/servers/audio/effects/eq_filter.cpp b/servers/audio/effects/eq_filter.cpp
@@ -31,7 +31,7 @@
 #include "eq_filter.h"
 
 #include "core/error/error_macros.h"
-#include "core/math/math_funcs.h"
+#include "core/math/math_defs.h"
 
 #include <math.h>
 

diff --git a/servers/audio/effects/eq_filter.h b/servers/audio/effects/eq_filter.h
@@ -32,7 +32,6 @@
 #define EQ_FILTER_H
 
 #include "core/templates/vector.h"
-#include "core/typedefs.h"
 
 class EQ {
 public:

diff --git a/servers/audio/effects/reverb_filter.cpp b/servers/audio/effects/reverb_filter.cpp
@@ -30,7 +30,8 @@
 
 #include "reverb_filter.h"
 
-#include "core/math/math_funcs.h"
+#include "core/math/audio_frame.h"
+#include "core/os/memory.h"
 
 #include <math.h>
 

diff --git a/servers/audio/effects/reverb_filter.h b/servers/audio/effects/reverb_filter.h
@@ -31,10 +31,6 @@
 #ifndef REVERB_FILTER_H
 #define REVERB_FILTER_H
 
-#include "core/math/audio_frame.h"
-#include "core/os/memory.h"
-#include "core/typedefs.h"
-
 class Reverb {
 public:
 	enum {

diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
@@ -33,15 +33,14 @@
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/error/error_macros.h"
-#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/math/audio_frame.h"
 #include "core/os/os.h"
 #include "core/string/string_name.h"
 #include "core/templates/pair.h"
-#include "scene/resources/audio_stream_wav.h"
 #include "scene/scene_string_names.h"
 #include "servers/audio/audio_driver_dummy.h"
+#include "servers/audio/audio_stream.h"
 #include "servers/audio/effects/audio_effect_compressor.h"
 
 #include <cstring>

diff --git a/servers/camera/camera_feed.h b/servers/camera/camera_feed.h
@@ -34,7 +34,6 @@
 #include "core/io/image.h"
 #include "core/math/transform_2d.h"
 #include "servers/camera_server.h"
-#include "servers/rendering_server.h"
 
 /**
 	The camera server is a singleton object that gives access to the various

diff --git a/servers/debugger/servers_debugger.cpp b/servers/debugger/servers_debugger.cpp
@@ -33,7 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/engine_profiler.h"
-#include "core/io/marshalls.h"
+#include "core/object/script_language.h"
 #include "servers/display_server.h"
 
 #define CHECK_SIZE(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() < (uint32_t)(expected), false, String("Malformed ") + what + " message from script debugger, message too short. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))

diff --git a/servers/debugger/servers_debugger.h b/servers/debugger/servers_debugger.h
@@ -31,8 +31,6 @@
 #ifndef SERVERS_DEBUGGER_H
 #define SERVERS_DEBUGGER_H
 
-#include "core/debugger/debugger_marshalls.h"
-
 #include "servers/rendering_server.h"
 
 class ServersDebugger {

diff --git a/servers/display/native_menu.h b/servers/display/native_menu.h
@@ -32,8 +32,6 @@
 #define NATIVE_MENU_H
 
 #include "core/input/input.h"
-#include "core/io/resource.h"
-#include "core/os/os.h"
 #include "core/variant/callable.h"
 
 class Texture2D;

diff --git a/servers/extensions/physics_server_2d_extension.h b/servers/extensions/physics_server_2d_extension.h
@@ -34,7 +34,6 @@
 #include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
-#include "core/variant/type_info.h"
 #include "core/variant/typed_array.h"
 #include "servers/physics_server_2d.h"
 

diff --git a/servers/extensions/physics_server_3d_extension.h b/servers/extensions/physics_server_3d_extension.h
@@ -34,7 +34,6 @@
 #include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/script_language.h"
 #include "core/variant/native_ptr.h"
-#include "core/variant/type_info.h"
 #include "core/variant/typed_array.h"
 #include "servers/physics_server_3d.h"
 

diff --git a/servers/movie_writer/movie_writer.cpp b/servers/movie_writer/movie_writer.cpp
@@ -32,6 +32,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/os/time.h"
+#include "servers/audio/audio_driver_dummy.h"
 #include "servers/display_server.h"
 #include "servers/rendering_server.h"
 

diff --git a/servers/movie_writer/movie_writer.h b/servers/movie_writer/movie_writer.h
@@ -33,7 +33,6 @@
 
 #include "core/io/image.h"
 #include "core/templates/local_vector.h"
-#include "servers/audio/audio_driver_dummy.h"
 #include "servers/audio_server.h"
 
 class MovieWriter : public Object {

diff --git a/servers/physics_server_2d.cpp b/servers/physics_server_2d.cpp
@@ -31,7 +31,6 @@
 #include "physics_server_2d.h"
 
 #include "core/config/project_settings.h"
-#include "core/string/print_string.h"
 #include "core/variant/typed_array.h"
 
 PhysicsServer2D *PhysicsServer2D::singleton = nullptr;

diff --git a/servers/physics_server_2d_wrap_mt.cpp b/servers/physics_server_2d_wrap_mt.cpp
@@ -30,8 +30,6 @@
 
 #include "physics_server_2d_wrap_mt.h"
 
-#include "core/os/os.h"
-
 void PhysicsServer2DWrapMT::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) {
 	server_thread = Thread::get_caller_id();
 	server_task_id = p_pump_task_id;

diff --git a/servers/physics_server_2d_wrap_mt.h b/servers/physics_server_2d_wrap_mt.h
@@ -31,11 +31,9 @@
 #ifndef PHYSICS_SERVER_2D_WRAP_MT_H
 #define PHYSICS_SERVER_2D_WRAP_MT_H
 
-#include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
 #include "core/templates/command_queue_mt.h"
-#include "core/templates/safe_refcount.h"
 #include "servers/physics_server_2d.h"
 
 #ifdef DEBUG_SYNC

diff --git a/servers/physics_server_3d.cpp b/servers/physics_server_3d.cpp
@@ -33,7 +33,6 @@
 #include "physics_server_3d.h"
 
 #include "core/config/project_settings.h"
-#include "core/string/print_string.h"
 #include "core/variant/typed_array.h"
 
 void PhysicsServer3DRenderingServerHandler::set_vertex(int p_vertex_id, const Vector3 &p_vertex) {

diff --git a/servers/physics_server_3d.h b/servers/physics_server_3d.h
@@ -34,9 +34,7 @@
 #ifndef _3D_DISABLED
 
 #include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "core/object/gdvirtual.gen.inc"
-#include "core/variant/native_ptr.h"
 
 class PhysicsDirectSpaceState3D;
 template <typename T>