From f241c1fda0a73df3117a21546ec811b8e84920aa Mon Sep 17 00:00:00 2001 From: Yufeng Ying Date: Sat, 21 Dec 2024 01:11:43 +0800 Subject: [PATCH] Remove unused header in editor. Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> --- editor/add_metadata_dialog.cpp | 2 ++ editor/add_metadata_dialog.h | 7 ------- editor/animation_track_editor_plugins.cpp | 1 - editor/create_dialog.cpp | 1 - editor/debugger/debug_adapter/debug_adapter_server.cpp | 1 - editor/debugger/editor_debugger_server.cpp | 2 -- editor/debugger/editor_file_server.cpp | 1 - editor/debugger/editor_file_server.h | 2 -- editor/debugger/editor_performance_profiler.h | 1 - editor/debugger/editor_profiler.cpp | 2 -- editor/debugger/editor_visual_profiler.cpp | 1 - editor/debugger/script_editor_debugger.cpp | 3 --- editor/dependency_editor.h | 1 - editor/directory_create_dialog.cpp | 1 - editor/doc_tools.cpp | 3 +-- editor/editor_about.cpp | 3 +++ editor/editor_about.h | 3 --- editor/editor_atlas_packer.cpp | 1 + editor/editor_atlas_packer.h | 6 ++---- editor/editor_autoload_settings.cpp | 1 - editor/editor_build_profile.cpp | 3 +-- editor/editor_build_profile.h | 4 ---- editor/editor_command_palette.h | 1 - editor/editor_data.cpp | 5 ----- editor/editor_feature_profile.cpp | 1 + editor/editor_feature_profile.h | 2 -- editor/editor_help.h | 5 +---- editor/editor_help_search.cpp | 1 - editor/editor_help_search.h | 4 +--- editor/editor_inspector.cpp | 1 + editor/editor_interface.cpp | 1 - editor/editor_log.cpp | 1 - editor/editor_log.h | 4 ---- editor/editor_native_shader_source_visualizer.cpp | 2 +- editor/editor_node.cpp | 1 - editor/editor_properties.cpp | 2 -- editor/editor_properties_array_dict.cpp | 3 +-- editor/editor_properties_array_dict.h | 1 - editor/editor_resource_preview.cpp | 2 +- editor/editor_settings.h | 1 - editor/editor_settings_dialog.cpp | 1 + editor/editor_translation.h | 1 - editor/editor_undo_redo_manager.cpp | 1 - editor/editor_undo_redo_manager.h | 1 - editor/editor_vcs_interface.h | 2 -- editor/engine_update_label.cpp | 4 ---- editor/export/codesign.cpp | 6 ++++-- editor/export/codesign.h | 6 ------ editor/export/editor_export_plugin.cpp | 5 ----- editor/export/editor_export_plugin.h | 1 - editor/export/export_template_manager.cpp | 2 +- editor/export/lipo.cpp | 2 ++ editor/export/lipo.h | 2 -- editor/export/macho.cpp | 2 ++ editor/export/macho.h | 2 -- editor/export/project_export.cpp | 1 - editor/file_info.h | 3 ++- editor/import/3d/collada.cpp | 2 +- editor/import/3d/collada.h | 3 --- editor/import/3d/editor_import_collada.cpp | 5 +---- editor/import/3d/post_import_plugin_skeleton_renamer.cpp | 1 - .../import/3d/post_import_plugin_skeleton_rest_fixer.cpp | 1 - .../3d/post_import_plugin_skeleton_track_organizer.cpp | 1 - editor/import/3d/resource_importer_obj.cpp | 1 - editor/import/3d/resource_importer_scene.cpp | 2 -- editor/import/3d/resource_importer_scene.h | 1 - editor/import/3d/scene_import_settings.cpp | 1 + editor/import/3d/scene_import_settings.h | 2 -- editor/import/dynamic_font_import_settings.cpp | 5 ++--- editor/import/dynamic_font_import_settings.h | 8 +------- editor/import/resource_importer_image.cpp | 2 -- editor/import/resource_importer_layered_texture.cpp | 3 --- editor/import/resource_importer_shader_file.cpp | 1 - editor/import/resource_importer_texture.cpp | 1 - editor/import/resource_importer_texture.h | 1 - editor/import/resource_importer_texture_atlas.cpp | 2 +- editor/import/resource_importer_wav.cpp | 2 -- editor/localization_editor.cpp | 1 + editor/multi_node_edit.h | 2 +- editor/node_dock.cpp | 1 - editor/plugins/abstract_polygon_2d_editor.cpp | 1 - editor/plugins/abstract_polygon_2d_editor.h | 2 +- editor/plugins/animation_blend_space_1d_editor.h | 1 - editor/plugins/animation_blend_space_2d_editor.cpp | 2 -- editor/plugins/animation_blend_space_2d_editor.h | 1 - editor/plugins/animation_blend_tree_editor_plugin.cpp | 5 ----- editor/plugins/animation_blend_tree_editor_plugin.h | 1 - editor/plugins/animation_library_editor.h | 1 - editor/plugins/animation_player_editor_plugin.cpp | 2 -- editor/plugins/animation_state_machine_editor.cpp | 5 ----- editor/plugins/asset_library_editor_plugin.cpp | 2 +- editor/plugins/asset_library_editor_plugin.h | 5 +---- editor/plugins/audio_stream_randomizer_editor_plugin.cpp | 1 + editor/plugins/audio_stream_randomizer_editor_plugin.h | 1 - editor/plugins/debugger_editor_plugin.cpp | 2 -- editor/plugins/dedicated_server_export_plugin.h | 2 +- editor/plugins/editor_context_menu_plugin.cpp | 1 - editor/plugins/editor_plugin.cpp | 2 -- editor/plugins/editor_plugin_settings.cpp | 2 -- editor/plugins/editor_plugin_settings.h | 1 - editor/plugins/editor_preview_plugins.cpp | 2 -- editor/plugins/editor_preview_plugins.h | 1 - editor/plugins/font_config_plugin.h | 1 - editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.cpp | 1 - .../gizmos/audio_stream_player_3d_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp | 1 - .../plugins/gizmos/collision_object_3d_gizmo_plugin.cpp | 2 -- .../plugins/gizmos/collision_polygon_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/decal_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/fog_volume_gizmo_plugin.cpp | 2 -- .../plugins/gizmos/geometry_instance_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/label_3d_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/light_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/lightmap_gi_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/lightmap_probe_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/marker_3d_gizmo_plugin.cpp | 1 - .../plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/soft_body_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.cpp | 3 --- editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.cpp | 1 - editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.cpp | 2 -- editor/plugins/gizmos/voxel_gi_gizmo_plugin.cpp | 2 -- editor/plugins/gradient_texture_2d_editor_plugin.cpp | 2 -- editor/plugins/light_occluder_2d_editor_plugin.cpp | 1 - editor/plugins/line_2d_editor_plugin.cpp | 1 - editor/plugins/mesh_editor_plugin.h | 1 - editor/plugins/mesh_instance_3d_editor_plugin.cpp | 1 - editor/plugins/mesh_library_editor_plugin.cpp | 2 -- editor/plugins/navigation_link_2d_editor_plugin.cpp | 1 - editor/plugins/navigation_obstacle_2d_editor_plugin.cpp | 1 - editor/plugins/navigation_obstacle_3d_editor_plugin.cpp | 1 - editor/plugins/node_3d_editor_gizmos.h | 1 - .../plugins/particle_process_material_editor_plugin.cpp | 2 -- editor/plugins/particles_editor_plugin.cpp | 1 - editor/plugins/path_2d_editor_plugin.cpp | 1 - editor/plugins/physical_bone_3d_editor_plugin.cpp | 1 - editor/plugins/plugin_config_dialog.h | 2 -- editor/plugins/polygon_2d_editor_plugin.cpp | 1 - editor/plugins/polygon_2d_editor_plugin.h | 1 + editor/plugins/polygon_3d_editor_plugin.cpp | 2 -- editor/plugins/resource_preloader_editor_plugin.cpp | 1 - editor/plugins/root_motion_editor_plugin.cpp | 1 - editor/plugins/script_editor_plugin.cpp | 1 + editor/plugins/shader_editor_plugin.cpp | 1 + editor/plugins/shader_file_editor_plugin.cpp | 5 ----- editor/plugins/shader_file_editor_plugin.h | 6 +----- editor/plugins/skeleton_2d_editor_plugin.cpp | 1 - editor/plugins/skeleton_3d_editor_plugin.cpp | 3 --- editor/plugins/sprite_frames_editor_plugin.cpp | 3 ++- editor/plugins/sprite_frames_editor_plugin.h | 4 +--- editor/plugins/sub_viewport_preview_editor_plugin.h | 1 - editor/plugins/text_editor.cpp | 1 - editor/plugins/text_shader_editor.h | 1 - editor/plugins/theme_editor_plugin.cpp | 1 - editor/plugins/theme_editor_preview.cpp | 2 -- editor/plugins/tiles/atlas_merging_dialog.cpp | 1 - editor/plugins/tiles/tile_atlas_view.cpp | 2 -- editor/plugins/tiles/tile_data_editors.h | 1 - editor/plugins/tiles/tile_map_layer_editor.cpp | 2 -- editor/plugins/tiles/tile_map_layer_editor.h | 1 - editor/plugins/tiles/tile_proxies_manager_dialog.cpp | 2 -- editor/plugins/tiles/tile_proxies_manager_dialog.h | 2 +- editor/plugins/tiles/tile_set_atlas_source_editor.cpp | 5 ----- editor/plugins/tiles/tile_set_editor.cpp | 1 - editor/plugins/tiles/tiles_editor_plugin.cpp | 2 -- editor/plugins/tiles/tiles_editor_plugin.h | 2 -- editor/plugins/version_control_editor_plugin.h | 2 -- editor/plugins/voxel_gi_editor_plugin.h | 1 - editor/project_converter_3_to_4.cpp | 1 - editor/project_manager/quick_settings_dialog.cpp | 1 - editor/project_settings_editor.h | 2 ++ editor/register_editor_types.cpp | 3 +-- editor/rename_dialog.cpp | 3 --- editor/reparent_dialog.cpp | 1 - editor/run_instances_dialog.cpp | 1 - editor/script_create_dialog.cpp | 1 - editor/shader_globals_editor.h | 7 +++---- editor/themes/editor_icons.cpp | 2 -- 185 files changed, 57 insertions(+), 308 deletions(-) diff --git a/editor/add_metadata_dialog.cpp b/editor/add_metadata_dialog.cpp index 66a7b820f5e..b9136d2f00b 100644 --- a/editor/add_metadata_dialog.cpp +++ b/editor/add_metadata_dialog.cpp @@ -30,6 +30,8 @@ #include "add_metadata_dialog.h" +#include "editor/themes/editor_scale.h" + AddMetadataDialog::AddMetadataDialog() { VBoxContainer *vbc = memnew(VBoxContainer); add_child(vbc); diff --git a/editor/add_metadata_dialog.h b/editor/add_metadata_dialog.h index b1a244ddc6c..30c198e480f 100644 --- a/editor/add_metadata_dialog.h +++ b/editor/add_metadata_dialog.h @@ -31,17 +31,10 @@ #ifndef ADD_METADATA_DIALOG_H #define ADD_METADATA_DIALOG_H -#include "core/object/callable_method_pointer.h" -#include "editor/editor_help.h" -#include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_validation_panel.h" -#include "editor/themes/editor_scale.h" -#include "scene/gui/button.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" -#include "scene/gui/tree.h" class AddMetadataDialog : public ConfirmationDialog { GDCLASS(AddMetadataDialog, ConfirmationDialog); diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index d36e152ed9e..da3112fc79c 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -39,7 +39,6 @@ #include "scene/2d/sprite_2d.h" #include "scene/3d/sprite_3d.h" #include "scene/animation/animation_player.h" -#include "scene/resources/text_line.h" #include "servers/audio/audio_stream.h" /// BOOL /// diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 8a4f8f75033..a383ebbc3c2 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -31,7 +31,6 @@ #include "create_dialog.h" #include "core/object/class_db.h" -#include "core/os/keyboard.h" #include "editor/editor_feature_profile.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" diff --git a/editor/debugger/debug_adapter/debug_adapter_server.cpp b/editor/debugger/debug_adapter/debug_adapter_server.cpp index 0f4be147cfd..a3bd4ae2c72 100644 --- a/editor/debugger/debug_adapter/debug_adapter_server.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_server.cpp @@ -30,7 +30,6 @@ #include "debug_adapter_server.h" -#include "core/os/os.h" #include "editor/editor_log.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" diff --git a/editor/debugger/editor_debugger_server.cpp b/editor/debugger/editor_debugger_server.cpp index 9ec60581324..f87fcc1eb00 100644 --- a/editor/debugger/editor_debugger_server.cpp +++ b/editor/debugger/editor_debugger_server.cpp @@ -30,9 +30,7 @@ #include "editor_debugger_server.h" -#include "core/io/marshalls.h" #include "core/io/tcp_server.h" -#include "core/os/mutex.h" #include "core/os/thread.h" #include "editor/editor_log.h" #include "editor/editor_node.h" diff --git a/editor/debugger/editor_file_server.cpp b/editor/debugger/editor_file_server.cpp index 116e6681ae7..35b570ca0c7 100644 --- a/editor/debugger/editor_file_server.cpp +++ b/editor/debugger/editor_file_server.cpp @@ -31,7 +31,6 @@ #include "editor_file_server.h" #include "../editor_settings.h" -#include "core/io/marshalls.h" #include "editor/editor_node.h" #include "editor/export/editor_export_platform.h" diff --git a/editor/debugger/editor_file_server.h b/editor/debugger/editor_file_server.h index 4374f508ee3..2e3046b8e0c 100644 --- a/editor/debugger/editor_file_server.h +++ b/editor/debugger/editor_file_server.h @@ -31,9 +31,7 @@ #ifndef EDITOR_FILE_SERVER_H #define EDITOR_FILE_SERVER_H -#include "core/io/packet_peer.h" #include "core/io/tcp_server.h" -#include "core/object/class_db.h" #include "core/os/thread.h" #include "editor/editor_file_system.h" diff --git a/editor/debugger/editor_performance_profiler.h b/editor/debugger/editor_performance_profiler.h index 4afe82b4bda..635110e897d 100644 --- a/editor/debugger/editor_performance_profiler.h +++ b/editor/debugger/editor_performance_profiler.h @@ -32,7 +32,6 @@ #define EDITOR_PERFORMANCE_PROFILER_H #include "core/templates/hash_map.h" -#include "core/templates/rb_map.h" #include "main/performance.h" #include "scene/gui/control.h" #include "scene/gui/label.h" diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index 768a57d8fcc..0e75257406d 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -31,12 +31,10 @@ #include "editor_profiler.h" #include "core/io/image.h" -#include "core/os/os.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_run_bar.h" #include "editor/themes/editor_scale.h" -#include "editor/themes/editor_theme_manager.h" #include "scene/gui/check_box.h" #include "scene/resources/image_texture.h" diff --git a/editor/debugger/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp index 237e7d26af4..5a8a74295e8 100644 --- a/editor/debugger/editor_visual_profiler.cpp +++ b/editor/debugger/editor_visual_profiler.cpp @@ -31,7 +31,6 @@ #include "editor_visual_profiler.h" #include "core/io/image.h" -#include "core/os/os.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_run_bar.h" diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 56b75b0b2f0..5b89cc8e13e 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -61,13 +61,10 @@ #include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" -#include "scene/gui/rich_text_label.h" #include "scene/gui/separator.h" #include "scene/gui/split_container.h" #include "scene/gui/tab_container.h" -#include "scene/gui/texture_button.h" #include "scene/gui/tree.h" -#include "scene/resources/packed_scene.h" #include "servers/debugger/servers_debugger.h" #include "servers/display_server.h" diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h index 93954cbd97c..e7c5a060560 100644 --- a/editor/dependency_editor.h +++ b/editor/dependency_editor.h @@ -34,7 +34,6 @@ #include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" -#include "scene/gui/tab_container.h" #include "scene/gui/tree.h" class EditorFileDialog; diff --git a/editor/directory_create_dialog.cpp b/editor/directory_create_dialog.cpp index 3c176782f27..43c85134be9 100644 --- a/editor/directory_create_dialog.cpp +++ b/editor/directory_create_dialog.cpp @@ -31,7 +31,6 @@ #include "directory_create_dialog.h" #include "core/io/dir_access.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/gui/editor_validation_panel.h" #include "editor/themes/editor_scale.h" diff --git a/editor/doc_tools.cpp b/editor/doc_tools.cpp index 18c75b48c35..bf9b531605b 100644 --- a/editor/doc_tools.cpp +++ b/editor/doc_tools.cpp @@ -35,12 +35,11 @@ #include "core/core_constants.h" #include "core/io/compression.h" #include "core/io/dir_access.h" -#include "core/io/marshalls.h" #include "core/io/resource_importer.h" #include "core/object/script_language.h" #include "core/string/translation_server.h" #include "editor/editor_settings.h" -#include "editor/export/editor_export.h" +#include "editor/export/editor_export_platform.h" #include "scene/resources/theme.h" #include "scene/theme/theme_db.h" diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 34f432aa7e7..6b592ba7a8a 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -37,6 +37,9 @@ #include "editor/gui/editor_version_button.h" #include "editor/themes/editor_scale.h" #include "scene/gui/item_list.h" +#include "scene/gui/separator.h" +#include "scene/gui/split_container.h" +#include "scene/gui/tab_container.h" #include "scene/resources/style_box.h" void EditorAbout::_notification(int p_what) { diff --git a/editor/editor_about.h b/editor/editor_about.h index 6f33d502d7e..0a3fb6264e1 100644 --- a/editor/editor_about.h +++ b/editor/editor_about.h @@ -35,9 +35,6 @@ #include "scene/gui/item_list.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/scroll_container.h" -#include "scene/gui/separator.h" -#include "scene/gui/split_container.h" -#include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" diff --git a/editor/editor_atlas_packer.cpp b/editor/editor_atlas_packer.cpp index a0f5f1bf118..94de4d1d237 100644 --- a/editor/editor_atlas_packer.cpp +++ b/editor/editor_atlas_packer.cpp @@ -33,6 +33,7 @@ #include "core/math/geometry_2d.h" #include "core/math/vector2.h" #include "core/math/vector2i.h" +#include "scene/resources/bit_map.h" void EditorAtlasPacker::chart_pack(Vector &charts, int &r_width, int &r_height, int p_atlas_max_size, int p_cell_resolution) { int divide_by = MIN(64, p_cell_resolution); diff --git a/editor/editor_atlas_packer.h b/editor/editor_atlas_packer.h index 0611677aae5..aa6238010e6 100644 --- a/editor/editor_atlas_packer.h +++ b/editor/editor_atlas_packer.h @@ -31,11 +31,9 @@ #ifndef EDITOR_ATLAS_PACKER_H #define EDITOR_ATLAS_PACKER_H +#include "core/math/vector2.h" +#include "core/math/vector2i.h" #include "core/templates/vector.h" -#include "scene/resources/bit_map.h" - -struct Vector2; -struct Vector2i; class EditorAtlasPacker { public: diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index ee8acaf2cd9..fff09bcab26 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -38,7 +38,6 @@ #include "editor/filesystem_dock.h" #include "editor/gui/editor_file_dialog.h" #include "editor/project_settings_editor.h" -#include "editor/themes/editor_scale.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/editor/editor_build_profile.cpp b/editor/editor_build_profile.cpp index 9c38d55337e..849340dce79 100644 --- a/editor/editor_build_profile.cpp +++ b/editor/editor_build_profile.cpp @@ -30,16 +30,15 @@ #include "editor_build_profile.h" -#include "core/io/dir_access.h" #include "core/io/json.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" -#include "editor/editor_property_name_processor.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/separator.h" const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = { // This maps to SCons build options. diff --git a/editor/editor_build_profile.h b/editor/editor_build_profile.h index f34ab040d45..945f7ba3d4d 100644 --- a/editor/editor_build_profile.h +++ b/editor/editor_build_profile.h @@ -31,13 +31,9 @@ #ifndef EDITOR_BUILD_PROFILE_H #define EDITOR_BUILD_PROFILE_H -#include "core/io/file_access.h" #include "core/object/ref_counted.h" #include "editor/editor_help.h" #include "scene/gui/dialogs.h" -#include "scene/gui/option_button.h" -#include "scene/gui/separator.h" -#include "scene/gui/split_container.h" #include "scene/gui/tree.h" class EditorBuildProfile : public RefCounted { diff --git a/editor/editor_command_palette.h b/editor/editor_command_palette.h index f7a5d495c4b..0b79d3e8c84 100644 --- a/editor/editor_command_palette.h +++ b/editor/editor_command_palette.h @@ -32,7 +32,6 @@ #define EDITOR_COMMAND_PALETTE_H #include "core/input/shortcut.h" -#include "core/os/thread_safe.h" #include "scene/gui/dialogs.h" #include "scene/gui/tree.h" diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index 4767194e3d8..0317a030497 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -33,17 +33,12 @@ #include "core/config/project_settings.h" #include "core/extension/gdextension_manager.h" #include "core/io/file_access.h" -#include "core/io/image_loader.h" #include "core/io/resource_loader.h" #include "editor/editor_node.h" -#include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/multi_node_edit.h" #include "editor/plugins/editor_context_menu_plugin.h" #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/themes/editor_scale.h" -#include "scene/gui/popup_menu.h" #include "scene/resources/packed_scene.h" void EditorSelectionHistory::cleanup_history() { diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index 86a1c161f48..bca49df5b8d 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -39,6 +39,7 @@ #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/separator.h" const char *EditorFeatureProfile::feature_names[FEATURE_MAX] = { TTRC("3D Editor"), diff --git a/editor/editor_feature_profile.h b/editor/editor_feature_profile.h index e84936dd348..7a2f132506f 100644 --- a/editor/editor_feature_profile.h +++ b/editor/editor_feature_profile.h @@ -31,12 +31,10 @@ #ifndef EDITOR_FEATURE_PROFILE_H #define EDITOR_FEATURE_PROFILE_H -#include "core/io/file_access.h" #include "core/object/ref_counted.h" #include "editor/editor_help.h" #include "scene/gui/dialogs.h" #include "scene/gui/option_button.h" -#include "scene/gui/separator.h" #include "scene/gui/split_container.h" #include "scene/gui/tree.h" diff --git a/editor/editor_help.h b/editor/editor_help.h index 392bb9eb658..eb687e9c568 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -32,15 +32,12 @@ #define EDITOR_HELP_H #include "core/os/thread.h" -#include "editor/code_editor.h" #include "editor/doc_tools.h" #include "editor/plugins/editor_plugin.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/panel_container.h" +#include "scene/gui/dialogs.h" #include "scene/gui/popup.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/split_container.h" -#include "scene/gui/tab_container.h" #include "scene/gui/text_edit.h" #include "scene/main/timer.h" diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index d8a2af5577c..3845d4b8afc 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -30,7 +30,6 @@ #include "editor_help_search.h" -#include "core/os/keyboard.h" #include "editor/editor_feature_profile.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h index f4d0c6c89e5..c4492c4b974 100644 --- a/editor/editor_help_search.h +++ b/editor/editor_help_search.h @@ -31,10 +31,8 @@ #ifndef EDITOR_HELP_SEARCH_H #define EDITOR_HELP_SEARCH_H -#include "core/templates/rb_map.h" -#include "editor/code_editor.h" -#include "editor/editor_help.h" #include "editor/plugins/editor_plugin.h" +#include "scene/gui/dialogs.h" #include "scene/gui/option_button.h" #include "scene/gui/tree.h" diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index d693a496659..4e2e4457405 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -48,6 +48,7 @@ #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/margin_container.h" +#include "scene/gui/separator.h" #include "scene/gui/spin_box.h" #include "scene/gui/texture_rect.h" #include "scene/property_utils.h" diff --git a/editor/editor_interface.cpp b/editor/editor_interface.cpp index 1a51e8dbf93..66933f8e72e 100644 --- a/editor/editor_interface.cpp +++ b/editor/editor_interface.cpp @@ -55,7 +55,6 @@ #include "plugins/editor_preview_plugins.h" #include "scene/3d/light_3d.h" #include "scene/3d/mesh_instance_3d.h" -#include "scene/3d/world_environment.h" #include "scene/gui/box_container.h" #include "scene/gui/control.h" #include "scene/main/window.h" diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 9f54da53822..5e1d3e4611a 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -38,7 +38,6 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/center_container.h" #include "scene/gui/separator.h" #include "scene/resources/font.h" diff --git a/editor/editor_log.h b/editor/editor_log.h index 4f97416d0d3..d5c2babd849 100644 --- a/editor/editor_log.h +++ b/editor/editor_log.h @@ -34,12 +34,8 @@ #include "core/os/thread.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/gui/label.h" #include "scene/gui/line_edit.h" -#include "scene/gui/panel_container.h" #include "scene/gui/rich_text_label.h" -#include "scene/gui/texture_button.h" -#include "scene/gui/texture_rect.h" class UndoRedo; diff --git a/editor/editor_native_shader_source_visualizer.cpp b/editor/editor_native_shader_source_visualizer.cpp index 9ebf7d680e8..44f2385baee 100644 --- a/editor/editor_native_shader_source_visualizer.cpp +++ b/editor/editor_native_shader_source_visualizer.cpp @@ -30,10 +30,10 @@ #include "editor_native_shader_source_visualizer.h" -#include "editor/code_editor.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/code_edit.h" #include "scene/gui/text_edit.h" #include "servers/rendering/shader_language.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index f904f939b98..4ab5e55742b 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -164,7 +164,6 @@ #include "editor/themes/editor_theme_manager.h" #include "editor/window_wrapper.h" -#include #include #include "modules/modules_enabled.gen.h" // For gdscript, mono. diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index df40b083d22..cf4209e4763 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -47,7 +47,6 @@ #include "editor/property_selector.h" #include "editor/scene_tree_dock.h" #include "editor/themes/editor_scale.h" -#include "editor/themes/editor_theme_manager.h" #include "scene/2d/gpu_particles_2d.h" #include "scene/3d/fog_volume.h" #include "scene/3d/gpu_particles_3d.h" @@ -56,7 +55,6 @@ #include "scene/main/window.h" #include "scene/resources/font.h" #include "scene/resources/mesh.h" -#include "scene/resources/packed_scene.h" #include "scene/resources/visual_shader_nodes.h" ///////////////////// Nil ///////////////////////// diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp index 3cc3a0f7c2a..6d56a3f2541 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/editor_properties_array_dict.cpp @@ -32,6 +32,7 @@ #include "core/input/input.h" #include "core/io/marshalls.h" +#include "editor/editor_file_system.h" #include "editor/editor_properties.h" #include "editor/editor_properties_vector.h" #include "editor/editor_settings.h" @@ -39,10 +40,8 @@ #include "editor/gui/editor_spin_slider.h" #include "editor/inspector_dock.h" #include "editor/themes/editor_scale.h" -#include "editor/themes/editor_theme_manager.h" #include "scene/gui/button.h" #include "scene/gui/margin_container.h" -#include "scene/resources/packed_scene.h" bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) { String name = p_name; diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h index 84c3f975be9..53a8bcddb63 100644 --- a/editor/editor_properties_array_dict.h +++ b/editor/editor_properties_array_dict.h @@ -33,7 +33,6 @@ #include "editor/editor_inspector.h" #include "editor/editor_locale_dialog.h" -#include "editor/filesystem_dock.h" class Button; class EditorSpinSlider; diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 47034104ee9..6e523a7619e 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -42,7 +42,7 @@ #include "editor/themes/editor_scale.h" #include "scene/main/window.h" #include "scene/resources/image_texture.h" -#include "servers/rendering/rendering_server_default.h" +#include "servers/rendering/rendering_server_globals.h" bool EditorResourcePreviewGenerator::handles(const String &p_type) const { bool success = false; diff --git a/editor/editor_settings.h b/editor/editor_settings.h index 3c8a4de8667..5bdd504d365 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -35,7 +35,6 @@ #include "core/io/config_file.h" #include "core/io/resource.h" #include "core/os/thread_safe.h" -#include "core/templates/rb_set.h" class EditorPlugin; diff --git a/editor/editor_settings_dialog.cpp b/editor/editor_settings_dialog.cpp index f8f7ea906c3..d737377012f 100644 --- a/editor/editor_settings_dialog.cpp +++ b/editor/editor_settings_dialog.cpp @@ -50,6 +50,7 @@ #include "scene/gui/panel_container.h" #include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" void EditorSettingsDialog::ok_pressed() { if (!EditorSettings::get_singleton()) { diff --git a/editor/editor_translation.h b/editor/editor_translation.h index eee9e533c48..396d7de1f72 100644 --- a/editor/editor_translation.h +++ b/editor/editor_translation.h @@ -32,7 +32,6 @@ #define EDITOR_TRANSLATION_H #include "core/string/ustring.h" -#include "core/templates/list.h" #include "core/templates/vector.h" Vector get_editor_locales(); diff --git a/editor/editor_undo_redo_manager.cpp b/editor/editor_undo_redo_manager.cpp index 57e55e7bacb..c0b6a4976bb 100644 --- a/editor/editor_undo_redo_manager.cpp +++ b/editor/editor_undo_redo_manager.cpp @@ -32,7 +32,6 @@ #include "core/io/resource.h" #include "core/os/os.h" -#include "core/templates/local_vector.h" #include "editor/debugger/editor_debugger_inspector.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/editor_log.h" diff --git a/editor/editor_undo_redo_manager.h b/editor/editor_undo_redo_manager.h index 54475c3c6cd..74524477da7 100644 --- a/editor/editor_undo_redo_manager.h +++ b/editor/editor_undo_redo_manager.h @@ -31,7 +31,6 @@ #ifndef EDITOR_UNDO_REDO_MANAGER_H #define EDITOR_UNDO_REDO_MANAGER_H -#include "core/object/class_db.h" #include "core/object/object.h" #include "core/object/undo_redo.h" diff --git a/editor/editor_vcs_interface.h b/editor/editor_vcs_interface.h index a425682bed2..718354f7619 100644 --- a/editor/editor_vcs_interface.h +++ b/editor/editor_vcs_interface.h @@ -31,10 +31,8 @@ #ifndef EDITOR_VCS_INTERFACE_H #define EDITOR_VCS_INTERFACE_H -#include "core/object/class_db.h" #include "core/object/gdvirtual.gen.inc" #include "core/string/ustring.h" -#include "core/variant/type_info.h" #include "core/variant/typed_array.h" class EditorVCSInterface : public Object { diff --git a/editor/engine_update_label.cpp b/editor/engine_update_label.cpp index 0d401812572..33f856f5256 100644 --- a/editor/engine_update_label.cpp +++ b/editor/engine_update_label.cpp @@ -31,12 +31,8 @@ #include "engine_update_label.h" #include "core/io/json.h" -#include "core/os/time.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/themes/editor_scale.h" -#include "scene/gui/box_container.h" -#include "scene/gui/button.h" #include "scene/main/http_request.h" bool EngineUpdateLabel::_can_check_updates() const { diff --git a/editor/export/codesign.cpp b/editor/export/codesign.cpp index f02895fadf1..93f1f5b09e2 100644 --- a/editor/export/codesign.cpp +++ b/editor/export/codesign.cpp @@ -30,13 +30,13 @@ #include "codesign.h" +#include "core/crypto/crypto_core.h" +#include "core/io/dir_access.h" #include "lipo.h" #include "macho.h" #include "core/io/plist.h" -#include "core/os/os.h" #include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "modules/modules_enabled.gen.h" // For regex. @@ -44,6 +44,8 @@ #ifdef MODULE_REGEX_ENABLED +#include "modules/regex/regex.h" + /*************************************************************************/ /* CodeSignCodeResources */ /*************************************************************************/ diff --git a/editor/export/codesign.h b/editor/export/codesign.h index 92366da0f69..831bd5ec836 100644 --- a/editor/export/codesign.h +++ b/editor/export/codesign.h @@ -41,16 +41,10 @@ // - Requirements code generator is not implemented (only hard-coded requirements for the ad-hoc signing is supported). // - RFC5652/CMS blob generation is not implemented, supports ad-hoc signing only. -#include "core/crypto/crypto_core.h" -#include "core/io/dir_access.h" #include "core/io/file_access.h" -#include "core/io/plist.h" #include "core/object/ref_counted.h" #include "modules/modules_enabled.gen.h" // For regex. -#ifdef MODULE_REGEX_ENABLED -#include "modules/regex/regex.h" -#endif #ifdef MODULE_REGEX_ENABLED diff --git a/editor/export/editor_export_plugin.cpp b/editor/export/editor_export_plugin.cpp index bd9c3503f77..ddc340ee77f 100644 --- a/editor/export/editor_export_plugin.cpp +++ b/editor/export/editor_export_plugin.cpp @@ -31,12 +31,7 @@ #include "editor_export_plugin.h" #include "core/config/project_settings.h" -#include "core/io/dir_access.h" -#include "core/io/file_access.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export_platform.h" -#include "scene/resources/resource_format_text.h" void EditorExportPlugin::set_export_preset(const Ref &p_preset) { if (p_preset.is_valid()) { diff --git a/editor/export/editor_export_plugin.h b/editor/export/editor_export_plugin.h index 79d3d0954d3..e991a9a5e87 100644 --- a/editor/export/editor_export_plugin.h +++ b/editor/export/editor_export_plugin.h @@ -31,7 +31,6 @@ #ifndef EDITOR_EXPORT_PLUGIN_H #define EDITOR_EXPORT_PLUGIN_H -#include "core/extension/gdextension.h" #include "core/os/shared_object.h" #include "editor_export_platform.h" #include "editor_export_preset.h" diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index 1e1999ddb70..4b86431678e 100644 --- a/editor/export/export_template_manager.cpp +++ b/editor/export/export_template_manager.cpp @@ -39,7 +39,7 @@ #include "editor/editor_paths.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/export/editor_export.h" +#include "editor/export/editor_export_preset.h" #include "editor/progress_dialog.h" #include "editor/themes/editor_scale.h" #include "scene/gui/file_dialog.h" diff --git a/editor/export/lipo.cpp b/editor/export/lipo.cpp index 9038994b06e..079a912b518 100644 --- a/editor/export/lipo.cpp +++ b/editor/export/lipo.cpp @@ -30,6 +30,8 @@ #include "lipo.h" +#include "macho.h" + bool LipO::is_lipo(const String &p_path) { Ref fb = FileAccess::open(p_path, FileAccess::READ); ERR_FAIL_COND_V_MSG(fb.is_null(), false, vformat("LipO: Can't open file: \"%s\".", p_path)); diff --git a/editor/export/lipo.h b/editor/export/lipo.h index 0b65959bc53..0f8044d8333 100644 --- a/editor/export/lipo.h +++ b/editor/export/lipo.h @@ -33,8 +33,6 @@ // Universal / Universal 2 fat binary file creator and extractor. -#include "macho.h" - #include "core/io/file_access.h" #include "core/object/ref_counted.h" diff --git a/editor/export/macho.cpp b/editor/export/macho.cpp index a829774a88e..1981d8f8cfc 100644 --- a/editor/export/macho.cpp +++ b/editor/export/macho.cpp @@ -30,6 +30,8 @@ #include "macho.h" +#include "core/crypto/crypto_core.h" + uint32_t MachO::seg_align(uint64_t p_vmaddr, uint32_t p_min, uint32_t p_max) { uint32_t salign = p_max; if (p_vmaddr != 0) { diff --git a/editor/export/macho.h b/editor/export/macho.h index e7393a2feed..b23aad00fcb 100644 --- a/editor/export/macho.h +++ b/editor/export/macho.h @@ -33,8 +33,6 @@ // Mach-O binary object file format parser and editor. -#include "core/crypto/crypto.h" -#include "core/crypto/crypto_core.h" #include "core/io/file_access.h" #include "core/object/ref_counted.h" diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index b741cfe8f6b..0af9656545f 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -41,7 +41,6 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/import/resource_importer_texture_settings.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/item_list.h" #include "scene/gui/link_button.h" diff --git a/editor/file_info.h b/editor/file_info.h index 2ce521992c5..1e2b6e87c92 100644 --- a/editor/file_info.h +++ b/editor/file_info.h @@ -31,7 +31,8 @@ #ifndef FILE_INFO_H #define FILE_INFO_H -#include "core/variant/variant.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" enum class FileSortOption { FILE_SORT_NAME = 0, diff --git a/editor/import/3d/collada.cpp b/editor/import/3d/collada.cpp index f9c3197c1c1..edf8669b4eb 100644 --- a/editor/import/3d/collada.cpp +++ b/editor/import/3d/collada.cpp @@ -30,7 +30,7 @@ #include "collada.h" -#include +#include "core/config/project_settings.h" //#define DEBUG_DEFAULT_ANIMATION //#define DEBUG_COLLADA diff --git a/editor/import/3d/collada.h b/editor/import/3d/collada.h index f9c26e090c3..948a2bbf813 100644 --- a/editor/import/3d/collada.h +++ b/editor/import/3d/collada.h @@ -31,10 +31,7 @@ #ifndef COLLADA_H #define COLLADA_H -#include "core/config/project_settings.h" #include "core/io/xml_parser.h" -#include "core/templates/rb_map.h" -#include "scene/resources/material.h" class Collada { public: diff --git a/editor/import/3d/editor_import_collada.cpp b/editor/import/3d/editor_import_collada.cpp index c04278fc55c..00fca6c0971 100644 --- a/editor/import/3d/editor_import_collada.cpp +++ b/editor/import/3d/editor_import_collada.cpp @@ -30,20 +30,17 @@ #include "editor_import_collada.h" -#include "core/os/os.h" -#include "editor/editor_node.h" +#include "core/config/project_settings.h" #include "editor/import/3d/collada.h" #include "scene/3d/camera_3d.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/light_3d.h" -#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/node_3d.h" #include "scene/3d/path_3d.h" #include "scene/3d/skeleton_3d.h" #include "scene/animation/animation_player.h" #include "scene/resources/3d/importer_mesh.h" #include "scene/resources/animation.h" -#include "scene/resources/packed_scene.h" #include "scene/resources/surface_tool.h" struct ColladaImport { diff --git a/editor/import/3d/post_import_plugin_skeleton_renamer.cpp b/editor/import/3d/post_import_plugin_skeleton_renamer.cpp index 700b2bc7199..a29655758ff 100644 --- a/editor/import/3d/post_import_plugin_skeleton_renamer.cpp +++ b/editor/import/3d/post_import_plugin_skeleton_renamer.cpp @@ -30,7 +30,6 @@ #include "post_import_plugin_skeleton_renamer.h" -#include "editor/import/3d/scene_import_settings.h" #include "scene/3d/bone_attachment_3d.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/skeleton_3d.h" diff --git a/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp b/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp index b7cdad7ee62..d5236bb6ace 100644 --- a/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp +++ b/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp @@ -30,7 +30,6 @@ #include "post_import_plugin_skeleton_rest_fixer.h" -#include "editor/import/3d/scene_import_settings.h" #include "scene/3d/bone_attachment_3d.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/retarget_modifier_3d.h" diff --git a/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp b/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp index 98312d35210..70b1d3e3f9a 100644 --- a/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp +++ b/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp @@ -30,7 +30,6 @@ #include "post_import_plugin_skeleton_track_organizer.h" -#include "editor/import/3d/scene_import_settings.h" #include "scene/3d/skeleton_3d.h" #include "scene/animation/animation_player.h" #include "scene/resources/bone_map.h" diff --git a/editor/import/3d/resource_importer_obj.cpp b/editor/import/3d/resource_importer_obj.cpp index 59d39152e9a..750584b3cfe 100644 --- a/editor/import/3d/resource_importer_obj.cpp +++ b/editor/import/3d/resource_importer_obj.cpp @@ -33,7 +33,6 @@ #include "core/io/file_access.h" #include "core/io/resource_saver.h" #include "scene/3d/importer_mesh_instance_3d.h" -#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/node_3d.h" #include "scene/resources/3d/importer_mesh.h" #include "scene/resources/mesh.h" diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index 9ab97abd56c..695c12150df 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/editor/import/3d/resource_importer_scene.cpp @@ -44,7 +44,6 @@ #include "scene/3d/occluder_instance_3d.h" #include "scene/3d/physics/area_3d.h" #include "scene/3d/physics/collision_shape_3d.h" -#include "scene/3d/physics/physics_body_3d.h" #include "scene/3d/physics/static_body_3d.h" #include "scene/3d/physics/vehicle_body_3d.h" #include "scene/animation/animation_player.h" @@ -57,7 +56,6 @@ #include "scene/resources/bone_map.h" #include "scene/resources/packed_scene.h" #include "scene/resources/resource_format_text.h" -#include "scene/resources/surface_tool.h" uint32_t EditorSceneFormatImporter::get_import_flags() const { uint32_t ret; diff --git a/editor/import/3d/resource_importer_scene.h b/editor/import/3d/resource_importer_scene.h index 6868baf023b..03102f9a311 100644 --- a/editor/import/3d/resource_importer_scene.h +++ b/editor/import/3d/resource_importer_scene.h @@ -39,7 +39,6 @@ #include "scene/resources/3d/capsule_shape_3d.h" #include "scene/resources/3d/cylinder_shape_3d.h" #include "scene/resources/3d/importer_mesh.h" -#include "scene/resources/3d/skin.h" #include "scene/resources/3d/sphere_shape_3d.h" #include "scene/resources/animation.h" #include "scene/resources/mesh.h" diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index 3e6d56e69a2..0be5855a26a 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/editor/import/3d/scene_import_settings.cpp @@ -41,6 +41,7 @@ #include "editor/themes/editor_scale.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/animation/animation_player.h" +#include "scene/gui/subviewport_container.h" #include "scene/resources/3d/importer_mesh.h" #include "scene/resources/surface_tool.h" diff --git a/editor/import/3d/scene_import_settings.h b/editor/import/3d/scene_import_settings.h index 1088acf7721..73cdb130505 100644 --- a/editor/import/3d/scene_import_settings.h +++ b/editor/import/3d/scene_import_settings.h @@ -37,13 +37,11 @@ #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/skeleton_3d.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/panel_container.h" #include "scene/gui/slider.h" #include "scene/gui/split_container.h" -#include "scene/gui/subviewport_container.h" #include "scene/gui/tab_container.h" #include "scene/gui/tree.h" #include "scene/resources/3d/primitive_meshes.h" diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 19dafb7c42c..8dcb91e2b0b 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -31,16 +31,15 @@ #include "dynamic_font_import_settings.h" #include "core/config/project_settings.h" -#include "core/string/translation_server.h" +#include "core/string/translation.h" #include "editor/editor_file_system.h" #include "editor/editor_inspector.h" #include "editor/editor_locale_dialog.h" #include "editor/editor_node.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/split_container.h" /*************************************************************************/ /* Settings data */ diff --git a/editor/import/dynamic_font_import_settings.h b/editor/import/dynamic_font_import_settings.h index 61d52b737af..c97f4389e73 100644 --- a/editor/import/dynamic_font_import_settings.h +++ b/editor/import/dynamic_font_import_settings.h @@ -31,19 +31,13 @@ #ifndef DYNAMIC_FONT_IMPORT_SETTINGS_H #define DYNAMIC_FONT_IMPORT_SETTINGS_H -#include "editor/import/resource_importer_dynamic_font.h" +#include "core/io/resource_importer.h" -#include "core/templates/rb_set.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/option_button.h" -#include "scene/gui/split_container.h" -#include "scene/gui/subviewport_container.h" #include "scene/gui/tab_container.h" #include "scene/gui/text_edit.h" #include "scene/gui/tree.h" #include "scene/resources/font.h" -#include "servers/text_server.h" class DynamicFontImportSettingsDialog; diff --git a/editor/import/resource_importer_image.cpp b/editor/import/resource_importer_image.cpp index 5a4f64d2458..2807909e6ab 100644 --- a/editor/import/resource_importer_image.cpp +++ b/editor/import/resource_importer_image.cpp @@ -32,8 +32,6 @@ #include "core/io/file_access.h" #include "core/io/image_loader.h" -#include "core/io/resource_saver.h" -#include "scene/resources/texture.h" String ResourceImporterImage::get_importer_name() const { return "image"; diff --git a/editor/import/resource_importer_layered_texture.cpp b/editor/import/resource_importer_layered_texture.cpp index 0d0c89425d0..b10c681816b 100644 --- a/editor/import/resource_importer_layered_texture.cpp +++ b/editor/import/resource_importer_layered_texture.cpp @@ -32,15 +32,12 @@ #include "core/config/project_settings.h" #include "core/error/error_macros.h" -#include "core/io/config_file.h" #include "core/io/image_loader.h" #include "core/object/ref_counted.h" #include "editor/editor_file_system.h" -#include "editor/editor_node.h" #include "editor/import/resource_importer_texture.h" #include "editor/import/resource_importer_texture_settings.h" #include "scene/resources/compressed_texture.h" -#include "scene/resources/texture.h" String ResourceImporterLayeredTexture::get_importer_name() const { switch (mode) { diff --git a/editor/import/resource_importer_shader_file.cpp b/editor/import/resource_importer_shader_file.cpp index 2e26b7e4d2b..84ba46e0043 100644 --- a/editor/import/resource_importer_shader_file.cpp +++ b/editor/import/resource_importer_shader_file.cpp @@ -31,7 +31,6 @@ #include "resource_importer_shader_file.h" #include "core/io/file_access.h" -#include "core/io/marshalls.h" #include "core/io/resource_saver.h" #include "editor/editor_node.h" #include "editor/plugins/shader_file_editor_plugin.h" diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index 4dd0173cbfb..594d7d9321a 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/editor/import/resource_importer_texture.cpp @@ -35,7 +35,6 @@ #include "core/io/image_loader.h" #include "core/version.h" #include "editor/editor_file_system.h" -#include "editor/editor_node.h" #include "editor/gui/editor_toaster.h" #include "editor/import/resource_importer_texture_settings.h" #include "editor/themes/editor_scale.h" diff --git a/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h index 7fd55d9e2bd..b181b2fe38d 100644 --- a/editor/import/resource_importer_texture.h +++ b/editor/import/resource_importer_texture.h @@ -34,7 +34,6 @@ #include "core/io/file_access.h" #include "core/io/image.h" #include "core/io/resource_importer.h" -#include "scene/resources/texture.h" #include "servers/rendering_server.h" class CompressedTexture2D; diff --git a/editor/import/resource_importer_texture_atlas.cpp b/editor/import/resource_importer_texture_atlas.cpp index 7e645cc0d07..a41febff336 100644 --- a/editor/import/resource_importer_texture_atlas.cpp +++ b/editor/import/resource_importer_texture_atlas.cpp @@ -32,12 +32,12 @@ #include "atlas_import_failed.xpm" #include "core/config/project_settings.h" -#include "core/io/file_access.h" #include "core/io/image_loader.h" #include "core/io/resource_saver.h" #include "core/math/geometry_2d.h" #include "editor/editor_atlas_packer.h" #include "scene/resources/atlas_texture.h" +#include "scene/resources/bit_map.h" #include "scene/resources/image_texture.h" #include "scene/resources/mesh.h" #include "scene/resources/mesh_texture.h" diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index a61549130b0..a6016ba7a51 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -30,8 +30,6 @@ #include "resource_importer_wav.h" -#include "core/io/file_access.h" -#include "core/io/marshalls.h" #include "core/io/resource_saver.h" String ResourceImporterWAV::get_importer_name() const { diff --git a/editor/localization_editor.cpp b/editor/localization_editor.cpp index 7b2e6e81ee2..5b75c767bfd 100644 --- a/editor/localization_editor.cpp +++ b/editor/localization_editor.cpp @@ -38,6 +38,7 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/pot_generator.h" #include "scene/gui/control.h" +#include "scene/gui/tab_container.h" void LocalizationEditor::_notification(int p_what) { switch (p_what) { diff --git a/editor/multi_node_edit.h b/editor/multi_node_edit.h index 32fe7402fd7..07bdaa84d16 100644 --- a/editor/multi_node_edit.h +++ b/editor/multi_node_edit.h @@ -31,7 +31,7 @@ #ifndef MULTI_NODE_EDIT_H #define MULTI_NODE_EDIT_H -#include "scene/main/node.h" +#include "core/object/ref_counted.h" class MultiNodeEdit : public RefCounted { GDCLASS(MultiNodeEdit, RefCounted); diff --git a/editor/node_dock.cpp b/editor/node_dock.cpp index 6b711349da0..d068fa30d63 100644 --- a/editor/node_dock.cpp +++ b/editor/node_dock.cpp @@ -31,7 +31,6 @@ #include "node_dock.h" #include "editor/connections_dialog.h" -#include "editor/editor_node.h" #include "editor/themes/editor_scale.h" void NodeDock::show_groups() { diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index 80ef4ce100a..b8463088a01 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -40,7 +40,6 @@ #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" -#include "scene/gui/separator.h" bool AbstractPolygon2DEditor::Vertex::operator==(const AbstractPolygon2DEditor::Vertex &p_vertex) const { return polygon == p_vertex.polygon && vertex == p_vertex.vertex; diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h index 6f13209a844..b6dd014296e 100644 --- a/editor/plugins/abstract_polygon_2d_editor.h +++ b/editor/plugins/abstract_polygon_2d_editor.h @@ -32,7 +32,7 @@ #define ABSTRACT_POLYGON_2D_EDITOR_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/polygon_2d.h" +#include "scene/2d/node_2d.h" #include "scene/gui/box_container.h" class Button; diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h index 00bd3c767d4..9409fb611d2 100644 --- a/editor/plugins/animation_blend_space_1d_editor.h +++ b/editor/plugins/animation_blend_space_1d_editor.h @@ -35,7 +35,6 @@ #include "editor/plugins/editor_plugin.h" #include "scene/animation/animation_blend_space_1d.h" #include "scene/gui/graph_edit.h" -#include "scene/gui/popup.h" class Button; class CheckBox; diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index a43fc494d8c..1257a872530 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -30,8 +30,6 @@ #include "animation_blend_space_2d_editor.h" -#include "core/config/project_settings.h" -#include "core/input/input.h" #include "core/io/resource_loader.h" #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/plugins/animation_blend_space_2d_editor.h index 15d81c07075..acc718d1de5 100644 --- a/editor/plugins/animation_blend_space_2d_editor.h +++ b/editor/plugins/animation_blend_space_2d_editor.h @@ -35,7 +35,6 @@ #include "editor/plugins/editor_plugin.h" #include "scene/animation/animation_blend_space_2d.h" #include "scene/gui/graph_edit.h" -#include "scene/gui/popup.h" class Button; class CheckBox; diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index b4581afdc46..c8fc3b4fc28 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -31,9 +31,7 @@ #include "animation_blend_tree_editor_plugin.h" #include "core/config/project_settings.h" -#include "core/input/input.h" #include "core/io/resource_loader.h" -#include "core/os/keyboard.h" #include "editor/editor_inspector.h" #include "editor/editor_node.h" #include "editor/editor_properties.h" @@ -43,17 +41,14 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" #include "scene/3d/skeleton_3d.h" -#include "scene/animation/animation_player.h" #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" -#include "scene/gui/panel.h" #include "scene/gui/progress_bar.h" #include "scene/gui/separator.h" #include "scene/gui/view_panner.h" #include "scene/main/window.h" -#include "scene/resources/style_box_flat.h" void AnimationNodeBlendTreeEditor::add_custom_type(const String &p_name, const Ref