From 1e0b41ab278dbc2ce70de43408a11af9c9282ffe Mon Sep 17 00:00:00 2001 From: Lukas Tenbrink Date: Mon, 13 Oct 2025 23:12:45 +0200 Subject: [PATCH] Remove `display_server.h` transitive include from `node.h`. --- editor/inspector/editor_preview_plugins.h | 1 + modules/multiplayer/multiplayer_debugger.cpp | 1 + modules/multiplayer/scene_multiplayer.cpp | 3 --- modules/multiplayer/scene_replication_interface.cpp | 1 + modules/multiplayer/scene_replication_interface.h | 1 + scene/audio/audio_stream_player.cpp | 1 + scene/main/node.cpp | 3 +++ scene/main/node.h | 2 ++ scene/main/scene_tree.h | 4 ++-- scene/main/timer.cpp | 2 ++ scene/main/viewport.h | 1 + scene/resources/resource_format_text.h | 1 + 12 files changed, 16 insertions(+), 5 deletions(-) diff --git a/editor/inspector/editor_preview_plugins.h b/editor/inspector/editor_preview_plugins.h index 42d8ed85665..a6ea6fb734e 100644 --- a/editor/inspector/editor_preview_plugins.h +++ b/editor/inspector/editor_preview_plugins.h @@ -30,6 +30,7 @@ #pragma once +#include "core/io/image.h" #include "editor/inspector/editor_resource_preview.h" class ScriptLanguage; diff --git a/modules/multiplayer/multiplayer_debugger.cpp b/modules/multiplayer/multiplayer_debugger.cpp index 142a14099a6..95dad543168 100644 --- a/modules/multiplayer/multiplayer_debugger.cpp +++ b/modules/multiplayer/multiplayer_debugger.cpp @@ -34,6 +34,7 @@ #include "scene_replication_config.h" #include "core/debugger/engine_debugger.h" +#include "core/os/os.h" #include "scene/main/node.h" List> multiplayer_profilers; diff --git a/modules/multiplayer/scene_multiplayer.cpp b/modules/multiplayer/scene_multiplayer.cpp index cf54c2efab1..24b3ad47179 100644 --- a/modules/multiplayer/scene_multiplayer.cpp +++ b/modules/multiplayer/scene_multiplayer.cpp @@ -32,10 +32,7 @@ #include "core/debugger/engine_debugger.h" #include "core/io/marshalls.h" - -#ifdef DEBUG_ENABLED #include "core/os/os.h" -#endif #ifdef DEBUG_ENABLED _FORCE_INLINE_ void SceneMultiplayer::_profile_bandwidth(const String &p_what, int p_value) { diff --git a/modules/multiplayer/scene_replication_interface.cpp b/modules/multiplayer/scene_replication_interface.cpp index 2e84349a6df..175aba92921 100644 --- a/modules/multiplayer/scene_replication_interface.cpp +++ b/modules/multiplayer/scene_replication_interface.cpp @@ -34,6 +34,7 @@ #include "core/debugger/engine_debugger.h" #include "core/io/marshalls.h" +#include "core/os/os.h" #include "scene/main/node.h" #define MAKE_ROOM(m_amount) \ diff --git a/modules/multiplayer/scene_replication_interface.h b/modules/multiplayer/scene_replication_interface.h index c40b7d4e8cf..fbcdc0767d6 100644 --- a/modules/multiplayer/scene_replication_interface.h +++ b/modules/multiplayer/scene_replication_interface.h @@ -34,6 +34,7 @@ #include "multiplayer_synchronizer.h" #include "core/object/ref_counted.h" +#include "core/templates/rb_set.h" class SceneMultiplayer; class SceneCacheInterface; diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index 6fbfd25451b..531b3c0d50a 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -33,6 +33,7 @@ #include "scene/audio/audio_stream_player_internal.h" #include "servers/audio/audio_stream.h" +#include "servers/display/display_server.h" void AudioStreamPlayer::_notification(int p_what) { if (p_what == NOTIFICATION_ACCESSIBILITY_UPDATE) { diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 3c7e63e36f9..42cc50174aa 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -33,7 +33,10 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Mesh); STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer); +STATIC_ASSERT_INCOMPLETE_TYPE(class, DisplayServer); STATIC_ASSERT_INCOMPLETE_TYPE(class, Shader); +STATIC_ASSERT_INCOMPLETE_TYPE(class, OS); +STATIC_ASSERT_INCOMPLETE_TYPE(class, Engine); #include "core/config/project_settings.h" #include "core/io/resource_loader.h" diff --git a/scene/main/node.h b/scene/main/node.h index df85d090a21..eff56ee4c0f 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -30,6 +30,8 @@ #pragma once +#include "core/input/input_event.h" +#include "core/io/resource.h" #include "core/string/node_path.h" #include "core/templates/iterable.h" #include "core/variant/typed_array.h" diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h index 63c22f26aec..7383a1996d9 100644 --- a/scene/main/scene_tree.h +++ b/scene/main/scene_tree.h @@ -35,12 +35,12 @@ #include "core/templates/paged_allocator.h" #include "core/templates/self_list.h" #include "scene/main/scene_tree_fti.h" -#include "servers/display/display_server.h" #undef Window class ArrayMesh; class PackedScene; +class InputEvent; class Node; #ifndef _3D_DISABLED class Node3D; @@ -337,7 +337,7 @@ public: void _accessibility_force_update(); void _accessibility_notify_change(const Node *p_node, bool p_remove = false); void _flush_accessibility_changes(); - void _process_accessibility_changes(DisplayServer::WindowID p_window_id); + void _process_accessibility_changes(int p_window_id); // Effectively DisplayServer::WindowID virtual void initialize() override; diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index 997320b25d1..a6a11dbbd62 100644 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -30,6 +30,8 @@ #include "timer.h" +#include "core/config/engine.h" + void Timer::_notification(int p_what) { switch (p_what) { case NOTIFICATION_READY: { diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 326c9d7b1d1..0d7af4ac003 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -32,6 +32,7 @@ #include "scene/main/node.h" #include "scene/resources/texture.h" +#include "servers/display/display_server.h" #ifndef _3D_DISABLED class Camera3D; diff --git a/scene/resources/resource_format_text.h b/scene/resources/resource_format_text.h index fb3d00fa2c5..c786f54f279 100644 --- a/scene/resources/resource_format_text.h +++ b/scene/resources/resource_format_text.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" #include "core/variant/variant_parser.h" #include "scene/resources/packed_scene.h"