From ee5a7ab6a2aed0e4ad85c39e3d0b7845f59c8cc0 Mon Sep 17 00:00:00 2001 From: Mounir Tohami <53877170+WhalesState@users.noreply.github.com> Date: Fri, 29 Nov 2024 06:50:27 +0200 Subject: [PATCH] Headers forward declarations. --- editor/action_map_editor.cpp | 2 ++ editor/animation_bezier_editor.cpp | 2 ++ editor/animation_track_editor.cpp | 7 ++++ editor/animation_track_editor.h | 13 ++++--- editor/code_editor.cpp | 8 +++++ editor/code_editor.h | 14 ++++---- editor/connections_dialog.cpp | 1 + editor/connections_dialog.h | 3 +- editor/create_dialog.cpp | 5 +++ editor/create_dialog.h | 9 ++--- editor/debugger/editor_debugger_node.cpp | 1 + editor/debugger/editor_debugger_tree.cpp | 2 ++ editor/debugger/editor_profiler.cpp | 1 + editor/debugger/editor_visual_profiler.cpp | 1 + editor/debugger/script_editor_debugger.cpp | 1 + editor/dependency_editor.cpp | 6 ++++ editor/dependency_editor.h | 8 +++-- editor/editor_about.cpp | 10 ++++++ editor/editor_about.h | 16 ++++----- editor/editor_asset_installer.cpp | 1 + editor/editor_asset_installer.h | 4 ++- editor/editor_audio_buses.cpp | 15 ++++++++ editor/editor_audio_buses.h | 23 ++++++------ editor/editor_autoload_settings.cpp | 3 ++ editor/editor_autoload_settings.h | 5 +-- editor/editor_build_profile.cpp | 4 +++ editor/editor_build_profile.h | 7 ++-- editor/editor_command_palette.cpp | 3 +- editor/editor_command_palette.h | 3 +- editor/editor_dock_manager.cpp | 13 ++++--- editor/editor_feature_profile.cpp | 7 ++++ editor/editor_feature_profile.h | 8 ++--- editor/editor_help.cpp | 10 ++++++ editor/editor_help.h | 14 ++++---- editor/editor_help_search.cpp | 3 ++ editor/editor_help_search.h | 6 ++-- editor/editor_inspector.cpp | 6 ++++ editor/editor_inspector.h | 1 + editor/editor_layouts_dialog.cpp | 2 ++ editor/editor_layouts_dialog.h | 1 + editor/editor_locale_dialog.cpp | 2 ++ editor/editor_log.cpp | 3 ++ editor/editor_log.h | 8 ++--- ...editor_native_shader_source_visualizer.cpp | 4 ++- .../editor_native_shader_source_visualizer.h | 5 +-- editor/editor_node.cpp | 7 +++- editor/editor_node.h | 2 +- editor/editor_properties.cpp | 9 +++++ editor/editor_properties_array_dict.cpp | 2 ++ editor/editor_property_name_processor.cpp | 2 +- editor/editor_quick_open.cpp | 4 +++ editor/editor_quick_open.h | 3 +- editor/editor_resource_picker.cpp | 3 ++ editor/editor_run_native.cpp | 4 +++ editor/editor_run_native.h | 8 +++-- editor/editor_sectioned_inspector.cpp | 2 ++ editor/editor_sectioned_inspector.h | 3 +- editor/editor_settings_dialog.cpp | 3 ++ editor/editor_settings_dialog.h | 1 + editor/export/editor_export.cpp | 1 + editor/export/editor_export.h | 2 ++ editor/export/export_template_manager.cpp | 5 +++ editor/export/export_template_manager.h | 2 ++ editor/export/project_export.cpp | 2 ++ editor/export/project_export.h | 1 + editor/fbx_importer_manager.cpp | 4 +++ editor/fbx_importer_manager.h | 3 +- editor/filesystem_dock.cpp | 3 ++ editor/filesystem_dock.h | 11 +++--- editor/find_in_files.h | 20 +++++------ editor/group_settings_editor.cpp | 3 ++ editor/group_settings_editor.h | 1 + editor/groups_editor.cpp | 5 ++- editor/groups_editor.h | 1 + editor/gui/editor_bottom_panel.cpp | 2 ++ editor/gui/editor_dir_dialog.cpp | 2 ++ editor/gui/editor_file_dialog.cpp | 3 ++ editor/gui/editor_file_dialog.h | 1 + editor/gui/editor_object_selector.cpp | 4 +++ editor/gui/editor_object_selector.h | 7 ++-- editor/gui/editor_spin_slider.cpp | 2 ++ editor/gui/editor_spin_slider.h | 5 +-- editor/gui/editor_title_bar.cpp | 2 ++ editor/gui/editor_title_bar.h | 1 - editor/gui/editor_zoom_widget.cpp | 1 + editor/gui/editor_zoom_widget.h | 3 +- editor/gui/scene_tree_editor.cpp | 5 +++ editor/gui/scene_tree_editor.h | 7 ++-- editor/history_dock.h | 2 +- editor/import/3d/resource_importer_scene.cpp | 1 + editor/import/3d/scene_import_settings.cpp | 16 +++++++++ editor/import/3d/scene_import_settings.h | 35 +++++++++++-------- .../import/audio_stream_import_settings.cpp | 7 ++++ editor/import/audio_stream_import_settings.h | 11 +++--- .../import/dynamic_font_import_settings.cpp | 8 +++++ editor/import/dynamic_font_import_settings.h | 14 +++----- editor/import_defaults_editor.cpp | 3 ++ editor/import_defaults_editor.h | 6 ++-- editor/import_dock.cpp | 5 +++ editor/import_dock.h | 10 +++--- editor/input_event_configuration_dialog.cpp | 2 ++ editor/input_event_configuration_dialog.h | 6 ++-- editor/inspector_dock.cpp | 4 +++ editor/inspector_dock.h | 12 ++++--- editor/localization_editor.cpp | 5 ++- editor/localization_editor.h | 5 +-- editor/node_dock.cpp | 2 ++ editor/node_dock.h | 1 + editor/plugins/abstract_polygon_2d_editor.cpp | 1 + editor/plugins/abstract_polygon_2d_editor.h | 2 +- .../animation_blend_space_1d_editor.cpp | 3 ++ .../plugins/animation_blend_space_1d_editor.h | 5 ++- .../animation_blend_space_2d_editor.cpp | 6 ++-- .../plugins/animation_blend_space_2d_editor.h | 5 ++- .../animation_blend_tree_editor_plugin.cpp | 11 ++++-- .../animation_blend_tree_editor_plugin.h | 13 ++++--- editor/plugins/animation_library_editor.cpp | 5 +++ editor/plugins/animation_library_editor.h | 3 +- .../animation_player_editor_plugin.cpp | 18 ++++++++++ .../plugins/animation_player_editor_plugin.h | 20 +++++------ .../animation_state_machine_editor.cpp | 5 +++ .../plugins/animation_state_machine_editor.h | 9 +++-- .../plugins/animation_tree_editor_plugin.cpp | 2 ++ editor/plugins/animation_tree_editor_plugin.h | 5 +-- .../plugins/asset_library_editor_plugin.cpp | 15 ++++++++ editor/plugins/asset_library_editor_plugin.h | 26 +++++++------- editor/plugins/audio_stream_editor_plugin.cpp | 3 ++ editor/plugins/audio_stream_editor_plugin.h | 8 +++-- .../audio_stream_randomizer_editor_plugin.cpp | 1 + .../audio_stream_randomizer_editor_plugin.h | 1 - editor/plugins/bit_map_editor_plugin.cpp | 1 + editor/plugins/bit_map_editor_plugin.h | 2 +- editor/plugins/bone_map_editor_plugin.cpp | 4 +++ editor/plugins/bone_map_editor_plugin.h | 7 ++-- editor/plugins/camera_3d_editor_plugin.cpp | 4 ++- editor/plugins/camera_3d_editor_plugin.h | 1 - editor/plugins/canvas_item_editor_plugin.cpp | 7 ++++ editor/plugins/cast_2d_editor_plugin.cpp | 1 + editor/plugins/cast_2d_editor_plugin.h | 2 +- .../collision_polygon_2d_editor_plugin.cpp | 2 ++ .../collision_polygon_2d_editor_plugin.h | 3 +- .../collision_shape_2d_editor_plugin.cpp | 1 + .../collision_shape_2d_editor_plugin.h | 3 +- editor/plugins/control_editor_plugin.cpp | 6 ++++ editor/plugins/control_editor_plugin.h | 15 ++++---- .../cpu_particles_2d_editor_plugin.cpp | 2 ++ .../plugins/cpu_particles_2d_editor_plugin.h | 7 ++-- .../cpu_particles_3d_editor_plugin.cpp | 4 +++ .../plugins/cpu_particles_3d_editor_plugin.h | 3 +- editor/plugins/curve_editor_plugin.cpp | 1 + editor/plugins/curve_editor_plugin.h | 2 +- editor/plugins/debugger_editor_plugin.cpp | 1 + editor/plugins/editor_plugin.cpp | 1 + editor/plugins/editor_plugin_settings.cpp | 2 ++ editor/plugins/editor_plugin_settings.h | 1 + editor/plugins/font_config_plugin.cpp | 2 ++ .../plugins/gizmos/camera_3d_gizmo_plugin.cpp | 1 + .../plugins/gizmos/joint_3d_gizmo_plugin.cpp | 1 + .../gpu_particles_2d_editor_plugin.cpp | 6 ++++ .../plugins/gpu_particles_2d_editor_plugin.h | 7 ++-- .../gpu_particles_3d_editor_plugin.cpp | 4 +++ .../plugins/gpu_particles_3d_editor_plugin.h | 4 +-- ..._particles_collision_sdf_editor_plugin.cpp | 3 ++ ...pu_particles_collision_sdf_editor_plugin.h | 3 +- .../gradient_texture_2d_editor_plugin.cpp | 1 + editor/plugins/input_event_editor_plugin.cpp | 2 ++ .../light_occluder_2d_editor_plugin.cpp | 1 + .../plugins/light_occluder_2d_editor_plugin.h | 4 ++- editor/plugins/lightmap_gi_editor_plugin.cpp | 2 ++ editor/plugins/lightmap_gi_editor_plugin.h | 3 +- editor/plugins/line_2d_editor_plugin.cpp | 1 + editor/plugins/line_2d_editor_plugin.h | 3 +- editor/plugins/material_editor_plugin.cpp | 1 + editor/plugins/material_editor_plugin.h | 7 ++-- editor/plugins/mesh_editor_plugin.cpp | 4 +++ editor/plugins/mesh_editor_plugin.h | 11 +++--- .../mesh_instance_3d_editor_plugin.cpp | 4 +++ .../plugins/mesh_instance_3d_editor_plugin.h | 4 +-- editor/plugins/mesh_library_editor_plugin.cpp | 1 + editor/plugins/multimesh_editor_plugin.cpp | 5 +++ editor/plugins/multimesh_editor_plugin.h | 7 ++-- .../navigation_link_2d_editor_plugin.cpp | 1 + .../navigation_link_2d_editor_plugin.h | 2 +- .../navigation_obstacle_2d_editor_plugin.cpp | 1 + .../navigation_obstacle_2d_editor_plugin.h | 3 +- .../navigation_obstacle_3d_editor_plugin.cpp | 6 +++- .../navigation_obstacle_3d_editor_plugin.h | 8 ++--- .../navigation_polygon_editor_plugin.cpp | 3 ++ .../navigation_polygon_editor_plugin.h | 2 +- editor/plugins/node_3d_editor_gizmos.cpp | 1 + editor/plugins/node_3d_editor_plugin.cpp | 30 +++++++++++++++- editor/plugins/node_3d_editor_plugin.h | 15 ++++---- .../occluder_instance_3d_editor_plugin.cpp | 2 ++ .../occluder_instance_3d_editor_plugin.h | 4 +-- .../parallax_background_editor_plugin.cpp | 1 + editor/plugins/path_2d_editor_plugin.cpp | 2 ++ editor/plugins/path_2d_editor_plugin.h | 2 +- editor/plugins/path_3d_editor_plugin.cpp | 5 ++- editor/plugins/path_3d_editor_plugin.h | 6 ++-- .../physical_bone_3d_editor_plugin.cpp | 3 +- .../plugins/physical_bone_3d_editor_plugin.h | 4 +-- editor/plugins/plugin_config_dialog.cpp | 5 +++ editor/plugins/plugin_config_dialog.h | 10 +++--- editor/plugins/polygon_2d_editor_plugin.cpp | 3 ++ editor/plugins/polygon_2d_editor_plugin.h | 1 + editor/plugins/polygon_3d_editor_plugin.cpp | 3 ++ editor/plugins/polygon_3d_editor_plugin.h | 5 ++- .../resource_preloader_editor_plugin.cpp | 5 +++ .../resource_preloader_editor_plugin.h | 6 ++-- editor/plugins/script_editor_plugin.cpp | 9 +++++ editor/plugins/script_editor_plugin.h | 2 ++ editor/plugins/script_text_editor.cpp | 6 ++++ editor/plugins/script_text_editor.h | 5 +-- editor/plugins/shader_editor_plugin.cpp | 5 +++ editor/plugins/shader_file_editor_plugin.cpp | 2 ++ editor/plugins/shader_file_editor_plugin.h | 6 +--- editor/plugins/skeleton_2d_editor_plugin.cpp | 2 ++ editor/plugins/skeleton_2d_editor_plugin.h | 2 +- editor/plugins/skeleton_3d_editor_plugin.cpp | 7 ++++ editor/plugins/skeleton_3d_editor_plugin.h | 9 ++--- editor/plugins/sprite_2d_editor_plugin.cpp | 6 ++++ editor/plugins/sprite_2d_editor_plugin.h | 6 ++-- .../plugins/sprite_frames_editor_plugin.cpp | 14 ++++++++ editor/plugins/sprite_frames_editor_plugin.h | 28 +++++++-------- .../sub_viewport_preview_editor_plugin.cpp | 2 ++ .../sub_viewport_preview_editor_plugin.h | 1 - editor/plugins/text_editor.cpp | 2 ++ editor/plugins/text_shader_editor.cpp | 5 +++ editor/plugins/text_shader_editor.h | 7 ++-- editor/plugins/texture_3d_editor_plugin.cpp | 2 ++ editor/plugins/texture_3d_editor_plugin.h | 7 ++-- editor/plugins/texture_editor_plugin.h | 2 +- .../plugins/texture_layered_editor_plugin.cpp | 3 ++ .../plugins/texture_layered_editor_plugin.h | 7 ++-- .../plugins/texture_region_editor_plugin.cpp | 3 ++ editor/plugins/theme_editor_plugin.cpp | 4 +++ editor/plugins/theme_editor_plugin.h | 2 +- editor/plugins/theme_editor_preview.cpp | 10 ++++++ editor/plugins/tiles/atlas_merging_dialog.cpp | 5 ++- editor/plugins/tiles/atlas_merging_dialog.h | 4 +-- editor/plugins/tiles/tile_atlas_view.cpp | 5 ++- editor/plugins/tiles/tile_atlas_view.h | 13 +++---- editor/plugins/tiles/tile_data_editors.cpp | 7 ++-- editor/plugins/tiles/tile_data_editors.h | 2 +- .../plugins/tiles/tile_map_layer_editor.cpp | 21 +++++++---- editor/plugins/tiles/tile_map_layer_editor.h | 22 ++++++------ .../tiles/tile_proxies_manager_dialog.cpp | 4 ++- .../tiles/tile_proxies_manager_dialog.h | 2 +- .../tiles/tile_set_atlas_source_editor.cpp | 15 ++++---- .../tiles/tile_set_atlas_source_editor.h | 1 + editor/plugins/tiles/tile_set_editor.cpp | 9 +++-- editor/plugins/tiles/tile_set_editor.h | 8 ++--- ...le_set_scenes_collection_source_editor.cpp | 1 - editor/plugins/tiles/tiles_editor_plugin.cpp | 7 ++-- editor/plugins/tiles/tiles_editor_plugin.h | 6 ++-- .../plugins/version_control_editor_plugin.cpp | 9 +++++ .../plugins/version_control_editor_plugin.h | 21 ++++++----- .../plugins/visual_shader_editor_plugin.cpp | 5 +++ editor/plugins/visual_shader_editor_plugin.h | 1 + editor/plugins/voxel_gi_editor_plugin.cpp | 2 ++ editor/progress_dialog.cpp | 3 ++ editor/progress_dialog.h | 7 ++-- editor/project_manager.cpp | 4 +++ editor/project_manager.h | 8 +++-- editor/project_manager/project_dialog.cpp | 2 ++ editor/project_manager/project_dialog.h | 2 ++ .../project_manager/quick_settings_dialog.cpp | 1 + editor/project_settings_editor.cpp | 7 ++++ editor/project_settings_editor.h | 2 +- editor/property_selector.cpp | 1 + editor/rename_dialog.cpp | 1 + editor/rename_dialog.h | 2 +- editor/reparent_dialog.cpp | 1 + editor/run_instances_dialog.cpp | 1 + editor/scene_create_dialog.cpp | 1 + editor/scene_tree_dock.cpp | 7 ++++ editor/scene_tree_dock.h | 1 + editor/script_create_dialog.cpp | 3 ++ editor/script_create_dialog.h | 6 ++-- editor/shader_create_dialog.cpp | 6 ++++ editor/shader_create_dialog.h | 10 +++--- editor/shader_globals_editor.cpp | 4 +++ editor/shader_globals_editor.h | 10 +++--- editor/surface_upgrade_tool.cpp | 1 + editor/window_wrapper.h | 6 ++-- .../editor_scene_exporter_gltf_plugin.cpp | 1 + .../editor/editor_scene_importer_blend.cpp | 3 ++ .../gridmap/editor/grid_map_editor_plugin.cpp | 2 ++ .../editor/editor_network_profiler.cpp | 6 ++++ .../editor/editor_network_profiler.h | 10 +++--- .../editor/multiplayer_editor_plugin.cpp | 1 + .../editor/multiplayer_editor_plugin.h | 2 ++ .../multiplayer/editor/replication_editor.cpp | 3 ++ platform/android/platform_config.h | 2 ++ platform/ios/platform_config.h | 2 ++ platform/macos/platform_config.h | 2 ++ platform/web/platform_config.h | 2 ++ scene/2d/audio_stream_player_2d.cpp | 1 - scene/2d/audio_stream_player_2d.h | 3 +- scene/3d/audio_stream_player_3d.cpp | 1 - scene/3d/audio_stream_player_3d.h | 3 +- scene/gui/base_button.cpp | 2 ++ scene/gui/base_button.h | 3 +- scene/gui/code_edit.cpp | 1 + scene/gui/color_picker.cpp | 16 ++++++--- scene/gui/color_picker.h | 25 +++++++------ scene/gui/control.cpp | 4 --- scene/gui/control.h | 3 -- scene/gui/dialogs.compat.inc | 3 ++ scene/gui/dialogs.cpp | 4 +++ scene/gui/dialogs.h | 11 +++--- scene/gui/file_dialog.cpp | 5 +++ scene/gui/file_dialog.h | 11 +++--- scene/gui/foldable_container.cpp | 1 + scene/gui/foldable_container.h | 3 +- scene/gui/graph_edit.cpp | 2 ++ scene/gui/graph_edit.h | 8 +++-- scene/gui/graph_edit_arranger.cpp | 1 + scene/gui/item_list.cpp | 1 + scene/gui/item_list.h | 3 +- scene/gui/label.cpp | 1 + scene/gui/label.h | 3 +- scene/gui/line_edit.cpp | 1 + scene/gui/line_edit.h | 3 +- scene/gui/menu_bar.h | 2 +- scene/gui/menu_button.cpp | 1 + scene/gui/menu_button.h | 3 +- scene/gui/option_button.cpp | 1 + scene/gui/option_button.h | 3 +- scene/gui/popup_menu.cpp | 5 +-- scene/gui/popup_menu.h | 5 ++- scene/gui/rich_text_label.cpp | 2 ++ scene/gui/rich_text_label.h | 6 ++-- scene/gui/scroll_container.cpp | 1 + scene/gui/scroll_container.h | 5 +-- scene/gui/separator.h | 1 + scene/gui/spin_box.cpp | 3 ++ scene/gui/spin_box.h | 5 +-- scene/gui/tab_container.cpp | 1 + scene/gui/tab_container.h | 3 +- scene/gui/text_edit.cpp | 5 ++- scene/gui/text_edit.h | 8 +++-- scene/gui/texture_button.h | 1 + scene/gui/tree.cpp | 6 +++- scene/gui/tree.h | 11 +++--- scene/gui/video_stream_player.cpp | 2 +- scene/gui/video_stream_player.h | 5 +-- scene/gui/view_panner.cpp | 1 - scene/gui/view_panner.h | 2 +- tests/scene/test_text_edit.h | 1 + 350 files changed, 1243 insertions(+), 507 deletions(-) diff --git a/editor/action_map_editor.cpp b/editor/action_map_editor.cpp index 6b237366fd0d..c511b299470b 100644 --- a/editor/action_map_editor.cpp +++ b/editor/action_map_editor.cpp @@ -35,7 +35,9 @@ #include "editor/event_listener_line_edit.h" #include "editor/input_event_configuration_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" #include "scene/gui/check_button.h" +#include "scene/gui/label.h" #include "scene/gui/separator.h" #include "scene/gui/tree.h" diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index 7d9af1df044f..3dd27dbac55b 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -37,6 +37,8 @@ #include "editor/gui/editor_spin_slider.h" #include "editor/plugins/animation_player_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/view_panner.h" #include "scene/resources/text_line.h" diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index f14b81c1ea39..987eb698adda 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -44,16 +44,23 @@ #include "editor/plugins/animation_player_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/node_3d.h" #include "scene/animation/animation_player.h" #include "scene/animation/tween.h" #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/panel_container.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/separator.h" #include "scene/gui/slider.h" #include "scene/gui/spin_box.h" #include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" #include "scene/gui/view_panner.h" #include "scene/main/window.h" #include "servers/audio/audio_stream.h" diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index 4c7c1a58f83a..cfaf8773147f 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -34,11 +34,8 @@ #include "editor/editor_data.h" #include "editor/editor_properties.h" #include "editor/property_selector.h" -#include "scene/3d/node_3d.h" -#include "scene/gui/control.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/scroll_bar.h" -#include "scene/gui/tree.h" +#include "scene/gui/box_container.h" +#include "scene/gui/range.h" #include "scene/resources/animation.h" class AnimationTrackEditor; @@ -46,11 +43,17 @@ class AnimationTrackEdit; class CheckBox; class EditorSpinSlider; class HSlider; +class HScrollBar; +class MenuButton; +class Node3D; class OptionButton; class PanelContainer; +class Popup; class SceneTreeDialog; class SpinBox; class TextureRect; +class Tree; +class TreeItem; class ViewPanner; class AnimationTrackKeyEdit : public Object { diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 8664c167b584..52b316a5431e 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -39,8 +39,16 @@ #include "editor/plugins/script_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/gui/check_box.h" +#include "scene/gui/code_edit.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_container.h" #include "scene/gui/separator.h" +#include "scene/gui/texture_button.h" +#include "scene/main/timer.h" #include "scene/resources/font.h" void GotoLineDialog::popup_find_line(CodeEdit *p_edit) { diff --git a/editor/code_editor.h b/editor/code_editor.h index 28f6944b6699..cfd691c347ee 100644 --- a/editor/code_editor.h +++ b/editor/code_editor.h @@ -31,16 +31,18 @@ #ifndef CODE_EDITOR_H #define CODE_EDITOR_H +#include "core/object/script_language.h" #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/check_box.h" -#include "scene/gui/code_edit.h" #include "scene/gui/dialogs.h" -#include "scene/gui/label.h" -#include "scene/gui/line_edit.h" -#include "scene/main/timer.h" +class Button; +class CheckBox; +class CodeEdit; +class Label; +class LineEdit; class MenuButton; +class TextureButton; +class Timer; class GotoLineDialog : public ConfirmationDialog { GDCLASS(GotoLineDialog, ConfirmationDialog); diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index eb0ab1174b32..31387d4d6fb7 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -45,6 +45,7 @@ #include "plugins/script_editor_plugin.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" +#include "scene/gui/check_button.h" #include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h index 78f1b76e2353..3d06ef1fd7a5 100644 --- a/editor/connections_dialog.h +++ b/editor/connections_dialog.h @@ -31,12 +31,13 @@ #ifndef CONNECTIONS_DIALOG_H #define CONNECTIONS_DIALOG_H -#include "scene/gui/check_button.h" +#include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" #include "scene/gui/tree.h" class Button; class CheckBox; +class CheckButton; class ConnectDialogBinds; class EditorInspector; class Label; diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 204636e128cd..67a83609d068 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -38,6 +38,11 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/item_list.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/split_container.h" +#include "scene/gui/tree.h" void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode, const String &p_current_type, const String &p_current_name) { _fill_type_list(); diff --git a/editor/create_dialog.h b/editor/create_dialog.h index d2866e9f041e..9ceab8f1b1c9 100644 --- a/editor/create_dialog.h +++ b/editor/create_dialog.h @@ -32,11 +32,12 @@ #define CREATE_DIALOG_H #include "editor/editor_help.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/tree.h" + +class ItemList; +class LineEdit; +class Tree; +class TreeItem; class CreateDialog : public ConfirmationDialog { GDCLASS(CreateDialog, ConfirmationDialog); diff --git a/editor/debugger/editor_debugger_node.cpp b/editor/debugger/editor_debugger_node.cpp index d3bd18c0e81f..10029aad5d29 100644 --- a/editor/debugger/editor_debugger_node.cpp +++ b/editor/debugger/editor_debugger_node.cpp @@ -46,6 +46,7 @@ #include "editor/scene_tree_dock.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/tab_container.h" #include "scene/resources/packed_scene.h" diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp index f8ffce0c839d..67c2ec529156 100644 --- a/editor/debugger/editor_debugger_tree.cpp +++ b/editor/debugger/editor_debugger_tree.cpp @@ -35,6 +35,8 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/scene_tree_dock.h" #include "scene/debugger/scene_debugger.h" +#include "scene/gui/label.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/texture_rect.h" #include "scene/resources/packed_scene.h" #include "servers/display_server.h" diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index 24bb6948608d..0336e9429e60 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -35,6 +35,7 @@ #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/main/timer.h" #include "scene/resources/image_texture.h" void EditorProfiler::_make_metric_ptrs(Metric &m) { diff --git a/editor/debugger/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp index 17977fcb29ba..c913117bbe32 100644 --- a/editor/debugger/editor_visual_profiler.cpp +++ b/editor/debugger/editor_visual_profiler.cpp @@ -34,6 +34,7 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/main/timer.h" #include "scene/resources/image_texture.h" void EditorVisualProfiler::add_frame_metric(const Metric &p_metric) { diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 782a866bfa42..970bdab41705 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -60,6 +60,7 @@ #include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/separator.h" #include "scene/gui/split_container.h" diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 8eaeedd92fc5..47d8f8998ce7 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -38,7 +38,13 @@ #include "editor/editor_settings.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/item_list.h" +#include "scene/gui/label.h" #include "scene/gui/margin_container.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/tree.h" void DependencyEditor::_searched(const String &p_path) { HashMap dep_rename; diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h index d43b12f1d251..464c2d263a66 100644 --- a/editor/dependency_editor.h +++ b/editor/dependency_editor.h @@ -32,9 +32,11 @@ #define DEPENDENCY_EDITOR_H #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/tree.h" + +class ItemList; +class PopupMenu; +class Tree; +class TreeItem; class EditorFileDialog; class EditorFileSystemDirectory; diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 687a932c58b1..f88fbfd6bd14 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -37,7 +37,17 @@ #include "core/version.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" #include "scene/gui/item_list.h" +#include "scene/gui/label.h" +#include "scene/gui/link_button.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" #include "scene/resources/style_box.h" // The metadata key used to store and retrieve the version text to copy to the clipboard. diff --git a/editor/editor_about.h b/editor/editor_about.h index fc3d6cedce59..cba471498e94 100644 --- a/editor/editor_about.h +++ b/editor/editor_about.h @@ -32,15 +32,13 @@ #define EDITOR_ABOUT_H #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/link_button.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" + +class ItemList; +class LinkButton; +class RichTextLabel; +class ScrollContainer; +class TextureRect; +class Tree; /** * NOTE: Do not assume the EditorNode singleton to be available in this class' methods. diff --git a/editor/editor_asset_installer.cpp b/editor/editor_asset_installer.cpp index 33049b6bc237..402928fb0cbd 100644 --- a/editor/editor_asset_installer.cpp +++ b/editor/editor_asset_installer.cpp @@ -45,6 +45,7 @@ #include "scene/gui/link_button.h" #include "scene/gui/separator.h" #include "scene/gui/split_container.h" +#include "scene/gui/tree.h" void EditorAssetInstaller::_item_checked_cbk() { if (updating_source || !source_tree->get_edited()) { diff --git a/editor/editor_asset_installer.h b/editor/editor_asset_installer.h index bc63bc991629..13afa7a2376f 100644 --- a/editor/editor_asset_installer.h +++ b/editor/editor_asset_installer.h @@ -32,12 +32,14 @@ #define EDITOR_ASSET_INSTALLER_H #include "scene/gui/dialogs.h" -#include "scene/gui/tree.h" class CheckBox; class EditorFileDialog; class Label; class LinkButton; +class Tree; +class TreeItem; +class VBoxContainer; class EditorAssetInstaller : public ConfirmationDialog { GDCLASS(EditorAssetInstaller, ConfirmationDialog); diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 3b337997e066..2d349cf68b80 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -44,7 +44,18 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_container.h" #include "scene/gui/separator.h" +#include "scene/gui/slider.h" +#include "scene/gui/texture_progress_bar.h" +#include "scene/main/timer.h" #include "scene/resources/font.h" #include "servers/audio_server.h" @@ -328,6 +339,10 @@ void EditorAudioBus::_name_changed(const String &p_new_name) { updating_bus = false; } +void EditorAudioBus::_name_focus_exit() { + _name_changed(track_name->get_text()); +} + void EditorAudioBus::_volume_changed(float p_normalized) { if (updating_bus) { return; diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h index b1f811fbf6c5..d4c3b2566055 100644 --- a/editor/editor_audio_buses.h +++ b/editor/editor_audio_buses.h @@ -33,21 +33,20 @@ #include "editor/plugins/editor_plugin.h" #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/control.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/option_button.h" -#include "scene/gui/panel.h" #include "scene/gui/panel_container.h" -#include "scene/gui/scroll_container.h" -#include "scene/gui/slider.h" -#include "scene/gui/texture_progress_bar.h" -#include "scene/gui/texture_rect.h" -#include "scene/gui/tree.h" +class Button; class EditorAudioBuses; class EditorFileDialog; +class LineEdit; +class MenuButton; +class OptionButton; +class Panel; +class ScrollContainer; +class TextureProgressBar; +class Tree; +class Timer; +class VSlider; class EditorAudioBus : public PanelContainer { GDCLASS(EditorAudioBus, PanelContainer); @@ -95,7 +94,7 @@ class EditorAudioBus : public PanelContainer { void _bus_popup_pressed(int p_option); void _name_changed(const String &p_new_name); - void _name_focus_exit() { _name_changed(track_name->get_text()); } + void _name_focus_exit(); void _volume_changed(float p_normalized); float _normalized_volume_to_scaled_db(float normalized); float _scaled_db_to_normalized_volume(float db); diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index 32b2133f234b..8821696435fe 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -39,6 +39,9 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/project_settings_editor.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h index 2ab969eb5957..d75ff7e79366 100644 --- a/editor/editor_autoload_settings.h +++ b/editor/editor_autoload_settings.h @@ -32,10 +32,11 @@ #define EDITOR_AUTOLOAD_SETTINGS_H #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/tree.h" +class Button; class EditorFileDialog; +class LineEdit; +class Tree; class EditorAutoloadSettings : public VBoxContainer { GDCLASS(EditorAutoloadSettings, VBoxContainer); diff --git a/editor/editor_build_profile.cpp b/editor/editor_build_profile.cpp index f55fbe03d89f..93095c19f054 100644 --- a/editor/editor_build_profile.cpp +++ b/editor/editor_build_profile.cpp @@ -40,6 +40,10 @@ #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/separator.h" +#include "scene/gui/tree.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 a947365c7fe4..95ed31141001 100644 --- a/editor/editor_build_profile.h +++ b/editor/editor_build_profile.h @@ -35,10 +35,9 @@ #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 Tree; +class TreeItem; class EditorBuildProfile : public RefCounted { GDCLASS(EditorBuildProfile, RefCounted); diff --git a/editor/editor_command_palette.cpp b/editor/editor_command_palette.cpp index a4a08d5b5e5f..f70d0d9d1bec 100644 --- a/editor/editor_command_palette.cpp +++ b/editor/editor_command_palette.cpp @@ -35,7 +35,8 @@ #include "editor/editor_string_names.h" #include "editor/gui/editor_toaster.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/control.h" +#include "scene/gui/button.h" +#include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" #include "scene/gui/tree.h" diff --git a/editor/editor_command_palette.h b/editor/editor_command_palette.h index cc0f726b3a3c..6c72246df8e3 100644 --- a/editor/editor_command_palette.h +++ b/editor/editor_command_palette.h @@ -34,7 +34,8 @@ #include "core/input/shortcut.h" #include "core/os/thread_safe.h" #include "scene/gui/dialogs.h" -#include "scene/gui/tree.h" + +class Tree; class EditorCommandPalette : public ConfirmationDialog { GDCLASS(EditorCommandPalette, ConfirmationDialog); diff --git a/editor/editor_dock_manager.cpp b/editor/editor_dock_manager.cpp index 753d9ba2b8ef..d975d5283734 100644 --- a/editor/editor_dock_manager.cpp +++ b/editor/editor_dock_manager.cpp @@ -30,13 +30,6 @@ #include "editor_dock_manager.h" -#include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/label.h" -#include "scene/gui/split_container.h" -#include "scene/gui/tab_container.h" -#include "scene/main/window.h" - #include "editor/editor_node.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" @@ -44,6 +37,12 @@ #include "editor/gui/editor_bottom_panel.h" #include "editor/themes/editor_scale.h" #include "editor/window_wrapper.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/tab_container.h" +#include "scene/main/window.h" enum class TabStyle { TEXT_ONLY, diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index 37cd74d2acb5..e79d5a34b7b4 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -39,6 +39,13 @@ #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" +#include "scene/gui/separator.h" +#include "scene/gui/split_container.h" +#include "scene/gui/tree.h" +#include "scene/main/timer.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 7458a04e195e..5a87bb1370c0 100644 --- a/editor/editor_feature_profile.h +++ b/editor/editor_feature_profile.h @@ -35,12 +35,12 @@ #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 EditorFileDialog; +class HSplitContainer; +class OptionButton; +class Tree; +class TreeItem; class EditorFeatureProfile : public RefCounted { GDCLASS(EditorFeatureProfile, RefCounted); diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 683e4e5cdaac..95c7fd304ecf 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -46,7 +46,13 @@ #include "editor/editor_string_names.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" +#include "scene/gui/rich_text_label.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/texture_button.h" +#include "scene/main/timer.h" #include "modules/modules_enabled.gen.h" // For gdscript, mono. @@ -3056,6 +3062,10 @@ String EditorHelp::get_class() { return edited_class; } +void EditorHelp::set_focused() { + class_desc->grab_focus(); +} + void EditorHelp::search_again(bool p_search_previous) { _search(p_search_previous); } diff --git a/editor/editor_help.h b/editor/editor_help.h index 93f74cb2c123..4c9eb41210c6 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -35,17 +35,15 @@ #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/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" #include "modules/modules_enabled.gen.h" // For gdscript, mono. +class HSplitContainer; +class RichTextLabel; +class TextEdit; +class Timer; + class FindBar : public HBoxContainer { GDCLASS(FindBar, HBoxContainer); @@ -238,7 +236,7 @@ class EditorHelp : public VBoxContainer { String get_class(); - void set_focused() { class_desc->grab_focus(); } + void set_focused(); int get_scroll() const; void set_scroll(int p_scroll); diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index ff5bc6ba8778..059acfd35780 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -37,6 +37,9 @@ #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" +#include "scene/gui/tree.h" bool EditorHelpSearch::_all_terms_in_name(const Vector &p_terms, const String &p_name) const { for (int i = 0; i < p_terms.size(); i++) { diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h index 58061dae4c2d..7f2e88ff1a22 100644 --- a/editor/editor_help_search.h +++ b/editor/editor_help_search.h @@ -35,8 +35,10 @@ #include "editor/code_editor.h" #include "editor/editor_help.h" #include "editor/plugins/editor_plugin.h" -#include "scene/gui/option_button.h" -#include "scene/gui/tree.h" + +class OptionButton; +class Tree; +class TreeItem; class EditorHelpSearch : public ConfirmationDialog { GDCLASS(EditorHelpSearch, ConfirmationDialog); diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 199383c3918b..d9875fa4ad21 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -45,9 +45,15 @@ #include "editor/plugins/script_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/spin_box.h" #include "scene/gui/texture_rect.h" +#include "scene/main/timer.h" #include "scene/property_utils.h" #include "scene/resources/packed_scene.h" #include "scene/resources/style_box_flat.h" diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 29ee23488326..32b8c611580d 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -48,6 +48,7 @@ class PopupMenu; class SpinBox; class StyleBoxFlat; class TextureRect; +class Timer; class EditorPropertyRevert { public: diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp index 60326056842c..eaeac8833f10 100644 --- a/editor/editor_layouts_dialog.cpp +++ b/editor/editor_layouts_dialog.cpp @@ -33,6 +33,8 @@ #include "core/io/config_file.h" #include "editor/editor_settings.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" #include "scene/gui/item_list.h" #include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" diff --git a/editor/editor_layouts_dialog.h b/editor/editor_layouts_dialog.h index e3557fbe71ae..e3784f5f1f50 100644 --- a/editor/editor_layouts_dialog.h +++ b/editor/editor_layouts_dialog.h @@ -35,6 +35,7 @@ class LineEdit; class ItemList; +class VBoxContainer; class EditorLayoutsDialog : public ConfirmationDialog { GDCLASS(EditorLayoutsDialog, ConfirmationDialog); diff --git a/editor/editor_locale_dialog.cpp b/editor/editor_locale_dialog.cpp index f8fd05bf1e32..602bef53709a 100644 --- a/editor/editor_locale_dialog.cpp +++ b/editor/editor_locale_dialog.cpp @@ -33,7 +33,9 @@ #include "core/config/project_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" #include "scene/gui/check_button.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/gui/tree.h" diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index fab379b5241c..86afab70a22a 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -39,7 +39,10 @@ #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" #include "scene/gui/center_container.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/rich_text_label.h" #include "scene/gui/separator.h" +#include "scene/main/timer.h" #include "scene/resources/font.h" void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) { diff --git a/editor/editor_log.h b/editor/editor_log.h index 9c652e912a39..0c56b89815e4 100644 --- a/editor/editor_log.h +++ b/editor/editor_log.h @@ -34,14 +34,10 @@ #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; +class LineEdit; +class RichTextLabel; class EditorLog : public HBoxContainer { GDCLASS(EditorLog, HBoxContainer); diff --git a/editor/editor_native_shader_source_visualizer.cpp b/editor/editor_native_shader_source_visualizer.cpp index 3d7d37c94e99..d5120792eddd 100644 --- a/editor/editor_native_shader_source_visualizer.cpp +++ b/editor/editor_native_shader_source_visualizer.cpp @@ -34,7 +34,9 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/text_edit.h" +#include "scene/gui/code_edit.h" +#include "scene/gui/tab_container.h" +#include "scene/resources/syntax_highlighter.h" #include "servers/rendering/shader_language.h" void EditorNativeShaderSourceVisualizer::_load_theme_settings() { diff --git a/editor/editor_native_shader_source_visualizer.h b/editor/editor_native_shader_source_visualizer.h index 8ae942da7c9e..8ac53e2e2afd 100644 --- a/editor/editor_native_shader_source_visualizer.h +++ b/editor/editor_native_shader_source_visualizer.h @@ -32,8 +32,9 @@ #define EDITOR_NATIVE_SHADER_SOURCE_VISUALIZER_H #include "scene/gui/dialogs.h" -#include "scene/gui/tab_container.h" -#include "scene/resources/syntax_highlighter.h" + +class TabContainer; +class CodeHighlighter; class EditorNativeShaderSourceVisualizer : public AcceptDialog { GDCLASS(EditorNativeShaderSourceVisualizer, AcceptDialog) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 37025cb35d2a..fa7f409ce2cf 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -47,19 +47,25 @@ #include "editor/editor_string_names.h" #include "main/main.h" #include "scene/3d/bone_attachment_3d.h" +#include "scene/animation/animation_player.h" #include "scene/animation/animation_tree.h" #include "scene/gui/color_picker.h" #include "scene/gui/dialogs.h" #include "scene/gui/file_dialog.h" +#include "scene/gui/label.h" #include "scene/gui/link_button.h" #include "scene/gui/menu_bar.h" #include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" #include "scene/gui/panel.h" #include "scene/gui/panel_container.h" #include "scene/gui/popup.h" #include "scene/gui/rich_text_label.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/split_container.h" #include "scene/gui/tab_container.h" +#include "scene/gui/texture_rect.h" +#include "scene/main/timer.h" #include "scene/main/window.h" #include "scene/property_utils.h" #include "scene/resources/image_texture.h" @@ -82,7 +88,6 @@ #include "editor/editor_data.h" #include "editor/editor_dock_manager.h" #include "editor/editor_feature_profile.h" -#include "editor/editor_folding.h" #include "editor/editor_help.h" #include "editor/editor_inspector.h" #include "editor/editor_interface.h" diff --git a/editor/editor_node.h b/editor/editor_node.h index 52ac6ee34861..7cb55fc43cbf 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -64,6 +64,7 @@ class TabBar; class TabContainer; class TextureRect; class TextureProgressBar; +class Timer; class Tree; class VBoxContainer; class VSplitContainer; @@ -86,7 +87,6 @@ class EditorExportPreset; class EditorExtensionManager; class EditorFeatureProfileManager; class EditorFileDialog; -class EditorFolding; class EditorInspector; class EditorLayoutsDialog; class EditorLog; diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index c90222a09f36..d425e38b5e65 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -51,7 +51,16 @@ #include "scene/2d/gpu_particles_2d.h" #include "scene/3d/fog_volume.h" #include "scene/3d/gpu_particles_3d.h" +#include "scene/gui/check_box.h" #include "scene/gui/color_picker.h" +#include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/text_edit.h" +#include "scene/gui/texture_button.h" #include "scene/main/window.h" #include "scene/resources/font.h" #include "scene/resources/mesh.h" diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp index 9aa2390230fe..47a3acfb4487 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/editor_properties_array_dict.cpp @@ -41,7 +41,9 @@ #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/button.h" +#include "scene/gui/label.h" #include "scene/gui/margin_container.h" +#include "scene/gui/popup_menu.h" #include "scene/resources/packed_scene.h" bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) { diff --git a/editor/editor_property_name_processor.cpp b/editor/editor_property_name_processor.cpp index f23cab676ccc..ea75edbeeabc 100644 --- a/editor/editor_property_name_processor.cpp +++ b/editor/editor_property_name_processor.cpp @@ -31,7 +31,7 @@ #include "editor_property_name_processor.h" #include "core/string/translation.h" -#include "editor_settings.h" +#include "editor/editor_settings.h" EditorPropertyNameProcessor *EditorPropertyNameProcessor::singleton = nullptr; diff --git a/editor/editor_quick_open.cpp b/editor/editor_quick_open.cpp index dfb87f43da53..a3ab270f2ccf 100644 --- a/editor/editor_quick_open.cpp +++ b/editor/editor_quick_open.cpp @@ -34,6 +34,10 @@ #include "editor/editor_node.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/gui/line_edit.h" +#include "scene/gui/tree.h" Rect2i EditorQuickOpen::prev_rect = Rect2i(); bool EditorQuickOpen::was_showed = false; diff --git a/editor/editor_quick_open.h b/editor/editor_quick_open.h index bbc689040a61..31c308695909 100644 --- a/editor/editor_quick_open.h +++ b/editor/editor_quick_open.h @@ -34,7 +34,8 @@ #include "core/templates/oa_hash_map.h" #include "editor/editor_file_system.h" #include "scene/gui/dialogs.h" -#include "scene/gui/tree.h" + +class Tree; class EditorQuickOpen : public ConfirmationDialog { GDCLASS(EditorQuickOpen, ConfirmationDialog); diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 06efb5ab64de..ce55f65c09ee 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -44,9 +44,12 @@ #include "editor/scene_tree_dock.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" +#include "scene/gui/label.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/texture_rect.h" #include "scene/resources/gradient_texture.h" #include "scene/resources/image_texture.h" +#include "servers/audio/audio_stream.h" void EditorResourcePicker::_update_resource() { String resource_path; diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index 5d378820ae28..cfd745179cbc 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -35,6 +35,10 @@ #include "editor/export/editor_export.h" #include "editor/export/editor_export_platform.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/rich_text_label.h" void EditorRunNative::_notification(int p_what) { switch (p_what) { diff --git a/editor/editor_run_native.h b/editor/editor_run_native.h index b7638f235ed2..9a80fda27d94 100644 --- a/editor/editor_run_native.h +++ b/editor/editor_run_native.h @@ -32,9 +32,11 @@ #define EDITOR_RUN_NATIVE_H #include "scene/gui/box_container.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/rich_text_label.h" + +class AcceptDialog; +class ConfirmationDialog; +class MenuButton; +class RichTextLabel; class EditorRunNative : public HBoxContainer { GDCLASS(EditorRunNative, HBoxContainer); diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp index bc7bfcfa58d8..d1d8bc885962 100644 --- a/editor/editor_sectioned_inspector.cpp +++ b/editor/editor_sectioned_inspector.cpp @@ -34,6 +34,8 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/tree.h" static bool _property_path_matches(const String &p_property_path, const String &p_filter, EditorPropertyNameProcessor::Style p_style) { if (p_property_path.containsn(p_filter)) { diff --git a/editor/editor_sectioned_inspector.h b/editor/editor_sectioned_inspector.h index 3c9eb7857118..ce4468db4c0a 100644 --- a/editor/editor_sectioned_inspector.h +++ b/editor/editor_sectioned_inspector.h @@ -33,9 +33,10 @@ #include "editor/editor_inspector.h" #include "scene/gui/split_container.h" -#include "scene/gui/tree.h" class SectionedInspectorFilter; +class Tree; +class TreeItem; class SectionedInspector : public HSplitContainer { GDCLASS(SectionedInspector, HSplitContainer); diff --git a/editor/editor_settings_dialog.cpp b/editor/editor_settings_dialog.cpp index a71d43ad51a6..acac25b2aea6 100644 --- a/editor/editor_settings_dialog.cpp +++ b/editor/editor_settings_dialog.cpp @@ -44,9 +44,12 @@ #include "editor/input_event_configuration_dialog.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/gui/label.h" #include "scene/gui/panel_container.h" #include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" +#include "scene/main/timer.h" void EditorSettingsDialog::ok_pressed() { if (!EditorSettings::get_singleton()) { diff --git a/editor/editor_settings_dialog.h b/editor/editor_settings_dialog.h index cab8fe9da145..0a1bfd888e1a 100644 --- a/editor/editor_settings_dialog.h +++ b/editor/editor_settings_dialog.h @@ -38,6 +38,7 @@ class PanelContainer; class SectionedInspector; class TabContainer; class TextureRect; +class Timer; class Tree; class TreeItem; diff --git a/editor/export/editor_export.cpp b/editor/export/editor_export.cpp index 72ab186036db..edf208eb7719 100644 --- a/editor/export/editor_export.cpp +++ b/editor/export/editor_export.cpp @@ -33,6 +33,7 @@ #include "core/config/project_settings.h" #include "core/io/config_file.h" #include "editor/editor_settings.h" +#include "scene/main/timer.h" EditorExport *EditorExport::singleton = nullptr; diff --git a/editor/export/editor_export.h b/editor/export/editor_export.h index f8cb90dc39ec..b72002f27f81 100644 --- a/editor/export/editor_export.h +++ b/editor/export/editor_export.h @@ -34,6 +34,8 @@ #include "editor_export_platform.h" #include "editor_export_plugin.h" +class Timer; + class EditorExport : public Node { GDCLASS(EditorExport, Node); diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index 32346620ffaf..dc1357747a86 100644 --- a/editor/export/export_template_manager.cpp +++ b/editor/export/export_template_manager.cpp @@ -42,7 +42,12 @@ #include "editor/progress_dialog.h" #include "editor/themes/editor_scale.h" #include "scene/gui/file_dialog.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/progress_bar.h" #include "scene/gui/separator.h" #include "scene/gui/tree.h" #include "scene/main/http_request.h" diff --git a/editor/export/export_template_manager.h b/editor/export/export_template_manager.h index 86a7cf24e822..8b59712aaf6e 100644 --- a/editor/export/export_template_manager.h +++ b/editor/export/export_template_manager.h @@ -36,11 +36,13 @@ class EditorExportPreset; class ExportTemplateVersion; class FileDialog; +class HBoxContainer; class HTTPRequest; class MenuButton; class OptionButton; class ProgressBar; class Tree; +class VBoxContainer; class ExportTemplateManager : public AcceptDialog { GDCLASS(ExportTemplateManager, AcceptDialog); diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index cb0b2a0c303d..623d2c3c9fef 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -44,6 +44,8 @@ #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/item_list.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/link_button.h" #include "scene/gui/margin_container.h" #include "scene/gui/menu_button.h" diff --git a/editor/export/project_export.h b/editor/export/project_export.h index c3499177f31f..4ef33aa02088 100644 --- a/editor/export/project_export.h +++ b/editor/export/project_export.h @@ -32,6 +32,7 @@ #define PROJECT_EXPORT_H #include "editor/export/editor_export_preset.h" +#include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" class CheckBox; diff --git a/editor/fbx_importer_manager.cpp b/editor/fbx_importer_manager.cpp index 2650b642fa66..ee8316ec34df 100644 --- a/editor/fbx_importer_manager.cpp +++ b/editor/fbx_importer_manager.cpp @@ -35,6 +35,10 @@ #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/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/link_button.h" void FBXImporterManager::_notification(int p_what) { diff --git a/editor/fbx_importer_manager.h b/editor/fbx_importer_manager.h index 55061c041aa8..b7b54e67cfe5 100644 --- a/editor/fbx_importer_manager.h +++ b/editor/fbx_importer_manager.h @@ -33,7 +33,8 @@ #include "editor/gui/editor_file_dialog.h" #include "scene/gui/dialogs.h" -#include "scene/gui/line_edit.h" + +class LineEdit; class FBXImporterManager : public ConfirmationDialog { GDCLASS(FBXImporterManager, ConfirmationDialog) diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 0256863aab2d..fd675d33a614 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -58,7 +58,10 @@ #include "scene/gui/item_list.h" #include "scene/gui/label.h" #include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/progress_bar.h" +#include "scene/gui/scroll_bar.h" #include "scene/resources/packed_scene.h" #include "servers/display_server.h" diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 907f843523e6..b61cc4141d07 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -36,19 +36,22 @@ #include "editor/plugins/script_editor_plugin.h" #include "editor/script_create_dialog.h" #include "scene/gui/box_container.h" -#include "scene/gui/control.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/split_container.h" +#include "scene/gui/item_list.h" #include "scene/gui/tree.h" +class ConfirmationDialog; class CreateDialog; class EditorDirDialog; class ItemList; class LineEdit; +class MenuButton; +class Popup; +class PopupMenu; class ProgressBar; class SceneCreateDialog; +class ScrollContainer; class ShaderCreateDialog; +class SplitContainer; class DirectoryCreateDialog; class EditorResourceTooltipPlugin; diff --git a/editor/find_in_files.h b/editor/find_in_files.h index ac336b4e358f..5a72b4e9b315 100644 --- a/editor/find_in_files.h +++ b/editor/find_in_files.h @@ -32,8 +32,18 @@ #define FIND_IN_FILES_H #include "core/templates/hash_map.h" +#include "scene/gui/control.h" #include "scene/gui/dialogs.h" +class Button; +class CheckBox; +class FileDialog; +class HBoxContainer; +class LineEdit; +class ProgressBar; +class Tree; +class TreeItem; + // Performs the actual search class FindInFiles : public Node { GDCLASS(FindInFiles, Node); @@ -85,11 +95,6 @@ class FindInFiles : public Node { int _initial_files_count = 0; }; -class LineEdit; -class CheckBox; -class FileDialog; -class HBoxContainer; - // Prompts search parameters class FindInFilesDialog : public AcceptDialog { GDCLASS(FindInFilesDialog, AcceptDialog); @@ -147,11 +152,6 @@ class FindInFilesDialog : public AcceptDialog { HashMap _filters_preferences; }; -class Button; -class Tree; -class TreeItem; -class ProgressBar; - // Display search results class FindInFilesPanel : public Control { GDCLASS(FindInFilesPanel, Control); diff --git a/editor/group_settings_editor.cpp b/editor/group_settings_editor.cpp index bb899af58292..4c3a01daa176 100644 --- a/editor/group_settings_editor.cpp +++ b/editor/group_settings_editor.cpp @@ -37,6 +37,9 @@ #include "editor/gui/editor_validation_panel.h" #include "editor/scene_tree_dock.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/check_box.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/resources/packed_scene.h" void GroupSettingsEditor::_notification(int p_what) { diff --git a/editor/group_settings_editor.h b/editor/group_settings_editor.h index 5be0013e96e2..3a348a1e74fe 100644 --- a/editor/group_settings_editor.h +++ b/editor/group_settings_editor.h @@ -31,6 +31,7 @@ #ifndef GROUP_SETTINGS_EDITOR_H #define GROUP_SETTINGS_EDITOR_H +#include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" class CheckBox; diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index a5f7e8556cad..d8ed6991a2b0 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -38,10 +38,13 @@ #include "editor/project_settings_editor.h" #include "editor/scene_tree_dock.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/box_container.h" +#include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/tree.h" #include "scene/resources/packed_scene.h" static bool can_edit(Node *p_node, const String &p_group) { diff --git a/editor/groups_editor.h b/editor/groups_editor.h index 8a0ca067de3c..f8514de17b3a 100644 --- a/editor/groups_editor.h +++ b/editor/groups_editor.h @@ -31,6 +31,7 @@ #ifndef GROUPS_EDITOR_H #define GROUPS_EDITOR_H +#include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" class Button; diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp index b2c1e4ebcc21..52e4493a4051 100644 --- a/editor/gui/editor_bottom_panel.cpp +++ b/editor/gui/editor_bottom_panel.cpp @@ -43,7 +43,9 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/link_button.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/scroll_container.h" +#include "scene/gui/split_container.h" // The metadata key used to store and retrieve the version text to copy to the clipboard. static const String META_TEXT_TO_COPY = "text_to_copy"; diff --git a/editor/gui/editor_dir_dialog.cpp b/editor/gui/editor_dir_dialog.cpp index 90ea0decc746..50ff6c3d71e2 100644 --- a/editor/gui/editor_dir_dialog.cpp +++ b/editor/gui/editor_dir_dialog.cpp @@ -35,6 +35,8 @@ #include "editor/filesystem_dock.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" #include "scene/gui/tree.h" #include "servers/display_server.h" diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp index 29f11174aff7..912a7ccc8587 100644 --- a/editor/gui/editor_file_dialog.cpp +++ b/editor/gui/editor_file_dialog.cpp @@ -45,8 +45,11 @@ #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" #include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/separator.h" #include "scene/gui/split_container.h" #include "scene/gui/texture_rect.h" diff --git a/editor/gui/editor_file_dialog.h b/editor/gui/editor_file_dialog.h index 6272e27f8260..6d04ea01920f 100644 --- a/editor/gui/editor_file_dialog.h +++ b/editor/gui/editor_file_dialog.h @@ -42,6 +42,7 @@ class ItemList; class OptionButton; class PopupMenu; class TextureRect; +class VBoxContainer; class EditorFileDialog : public ConfirmationDialog { GDCLASS(EditorFileDialog, ConfirmationDialog); diff --git a/editor/gui/editor_object_selector.cpp b/editor/gui/editor_object_selector.cpp index 5b303760b02f..0e387c083a95 100644 --- a/editor/gui/editor_object_selector.cpp +++ b/editor/gui/editor_object_selector.cpp @@ -35,7 +35,11 @@ #include "editor/editor_string_names.h" #include "editor/multi_node_edit.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" +#include "scene/gui/label.h" #include "scene/gui/margin_container.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/texture_rect.h" Size2 EditorObjectSelector::get_minimum_size() const { Ref font = get_theme_font(SceneStringName(font)); diff --git a/editor/gui/editor_object_selector.h b/editor/gui/editor_object_selector.h index 72ff285cf68f..76e6a02a2c1f 100644 --- a/editor/gui/editor_object_selector.h +++ b/editor/gui/editor_object_selector.h @@ -31,13 +31,12 @@ #ifndef EDITOR_OBJECT_SELECTOR_H #define EDITOR_OBJECT_SELECTOR_H -#include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/gui/label.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/texture_rect.h" class EditorSelectionHistory; +class Label; +class PopupMenu; +class TextureRect; class EditorObjectSelector : public Button { GDCLASS(EditorObjectSelector, Button); diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp index d219a0274da5..5788ee1a5f7c 100644 --- a/editor/gui/editor_spin_slider.cpp +++ b/editor/gui/editor_spin_slider.cpp @@ -35,6 +35,8 @@ #include "core/os/keyboard.h" #include "editor/editor_settings.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/texture_rect.h" bool EditorSpinSlider::is_text_field() const { return true; diff --git a/editor/gui/editor_spin_slider.h b/editor/gui/editor_spin_slider.h index a0c068562929..6f35836989c2 100644 --- a/editor/gui/editor_spin_slider.h +++ b/editor/gui/editor_spin_slider.h @@ -31,9 +31,10 @@ #ifndef EDITOR_SPIN_SLIDER_H #define EDITOR_SPIN_SLIDER_H -#include "scene/gui/line_edit.h" #include "scene/gui/range.h" -#include "scene/gui/texture_rect.h" + +class LineEdit; +class TextureRect; class EditorSpinSlider : public Range { GDCLASS(EditorSpinSlider, Range); diff --git a/editor/gui/editor_title_bar.cpp b/editor/gui/editor_title_bar.cpp index c251c70c6de9..ec5df0d34f2f 100644 --- a/editor/gui/editor_title_bar.cpp +++ b/editor/gui/editor_title_bar.cpp @@ -30,6 +30,8 @@ #include "editor_title_bar.h" +#include "scene/main/window.h" + void EditorTitleBar::gui_input(const Ref &p_event) { if (!can_move) { return; diff --git a/editor/gui/editor_title_bar.h b/editor/gui/editor_title_bar.h index 4055476b820b..16f5e06d1f6d 100644 --- a/editor/gui/editor_title_bar.h +++ b/editor/gui/editor_title_bar.h @@ -32,7 +32,6 @@ #define EDITOR_TITLE_BAR_H #include "scene/gui/box_container.h" -#include "scene/main/window.h" class EditorTitleBar : public HBoxContainer { GDCLASS(EditorTitleBar, HBoxContainer); diff --git a/editor/gui/editor_zoom_widget.cpp b/editor/gui/editor_zoom_widget.cpp index 341da7bfaf4a..15a7bd3be784 100644 --- a/editor/gui/editor_zoom_widget.cpp +++ b/editor/gui/editor_zoom_widget.cpp @@ -33,6 +33,7 @@ #include "core/os/keyboard.h" #include "editor/editor_settings.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" void EditorZoomWidget::_update_zoom_label() { String zoom_text; diff --git a/editor/gui/editor_zoom_widget.h b/editor/gui/editor_zoom_widget.h index 6b2fe4d3e980..6b66a4697dc0 100644 --- a/editor/gui/editor_zoom_widget.h +++ b/editor/gui/editor_zoom_widget.h @@ -32,7 +32,8 @@ #define EDITOR_ZOOM_WIDGET_H #include "scene/gui/box_container.h" -#include "scene/gui/button.h" + +class Button; class EditorZoomWidget : public HBoxContainer { GDCLASS(EditorZoomWidget, HBoxContainer); diff --git a/editor/gui/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp index 4a22507e5532..096404de3e85 100644 --- a/editor/gui/scene_tree_editor.cpp +++ b/editor/gui/scene_tree_editor.cpp @@ -43,9 +43,14 @@ #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/animation/animation_mixer.h" +#include "scene/gui/check_button.h" #include "scene/gui/flow_container.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" +#include "scene/main/timer.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/editor/gui/scene_tree_editor.h b/editor/gui/scene_tree_editor.h index b4d9644f167a..c29d53e1103d 100644 --- a/editor/gui/scene_tree_editor.h +++ b/editor/gui/scene_tree_editor.h @@ -31,13 +31,16 @@ #ifndef SCENE_TREE_EDITOR_H #define SCENE_TREE_EDITOR_H -#include "scene/gui/check_button.h" +#include "scene/gui/control.h" #include "scene/gui/dialogs.h" -#include "scene/gui/tree.h" +class CheckButton; class EditorSelection; class TextureRect; class Timer; +class Tree; +class TreeItem; +class VBoxContainer; class SceneTreeEditor : public Control { GDCLASS(SceneTreeEditor, Control); diff --git a/editor/history_dock.h b/editor/history_dock.h index 0a023bdd0592..43f8a8ba25ab 100644 --- a/editor/history_dock.h +++ b/editor/history_dock.h @@ -34,8 +34,8 @@ #include "scene/gui/box_container.h" class CheckBox; -class ItemList; class EditorUndoRedoManager; +class ItemList; class HistoryDock : public VBoxContainer { GDCLASS(HistoryDock, VBoxContainer); diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index 7215f54b3c45..1c9ed05a7ad6 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/editor/import/3d/resource_importer_scene.cpp @@ -46,6 +46,7 @@ #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/3d/skeleton_3d.h" #include "scene/animation/animation_player.h" #include "scene/resources/3d/box_shape_3d.h" #include "scene/resources/3d/importer_mesh.h" diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index 5066feba847f..61b6da2853dc 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/editor/import/3d/scene_import_settings.cpp @@ -39,8 +39,24 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.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/skeleton_3d.h" #include "scene/animation/animation_player.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel_container.h" +#include "scene/gui/popup_menu.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/main/timer.h" #include "scene/resources/3d/importer_mesh.h" +#include "scene/resources/3d/primitive_meshes.h" +#include "scene/resources/3d/sky_material.h" #include "scene/resources/surface_tool.h" class SceneImportSettingsData : public Object { diff --git a/editor/import/3d/scene_import_settings.h b/editor/import/3d/scene_import_settings.h index c2a5151432d8..6fdfda2304ef 100644 --- a/editor/import/3d/scene_import_settings.h +++ b/editor/import/3d/scene_import_settings.h @@ -32,26 +32,31 @@ #define SCENE_IMPORT_SETTINGS_H #include "editor/import/3d/resource_importer_scene.h" -#include "scene/3d/camera_3d.h" -#include "scene/3d/light_3d.h" -#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" -#include "scene/resources/3d/sky_material.h" +class ArrayMesh; +class Camera3D; +class CameraAttributesPractical; +class DirectionalLight3D; class EditorFileDialog; class EditorInspector; +class HSlider; +class HSplitContainer; +class MenuButton; +class Mesh; +class MeshInstance3D; +class OptionButton; +class PanelContainer; +class ProceduralSkyMaterial; class SceneImportSettingsData; +class Skeleton3D; +class sky; +class SphereMesh; +class SubViewport; +class TabContainer; +class Timer; +class Tree; +class TreeItem; class SceneImportSettingsDialog : public ConfirmationDialog { GDCLASS(SceneImportSettingsDialog, ConfirmationDialog) diff --git a/editor/import/audio_stream_import_settings.cpp b/editor/import/audio_stream_import_settings.cpp index a53deefee991..8bab372eb079 100644 --- a/editor/import/audio_stream_import_settings.cpp +++ b/editor/import/audio_stream_import_settings.cpp @@ -29,11 +29,18 @@ /**************************************************************************/ #include "audio_stream_import_settings.h" +#include "core/io/config_file.h" #include "editor/audio_stream_preview.h" #include "editor/editor_file_system.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/audio/audio_stream_player.h" +#include "scene/gui/box_container.h" #include "scene/gui/check_box.h" +#include "scene/gui/color_rect.h" +#include "scene/gui/label.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/spin_box.h" AudioStreamImportSettingsDialog *AudioStreamImportSettingsDialog::singleton = nullptr; diff --git a/editor/import/audio_stream_import_settings.h b/editor/import/audio_stream_import_settings.h index 931faf45aff5..4ea6d9384dad 100644 --- a/editor/import/audio_stream_import_settings.h +++ b/editor/import/audio_stream_import_settings.h @@ -31,14 +31,15 @@ #ifndef AUDIO_STREAM_IMPORT_SETTINGS_H #define AUDIO_STREAM_IMPORT_SETTINGS_H -#include "editor/plugins/editor_plugin.h" -#include "scene/audio/audio_stream_player.h" -#include "scene/gui/color_rect.h" #include "scene/gui/dialogs.h" -#include "scene/gui/spin_box.h" -#include "scene/resources/texture.h" +class AudioStream; +class AudioStreamPlayer; class CheckBox; +class ColorRect; +class HScrollBar; +class Label; +class SpinBox; class AudioStreamImportSettingsDialog : public ConfirmationDialog { GDCLASS(AudioStreamImportSettingsDialog, ConfirmationDialog); diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 00ce3d6a7a5d..b0f7e7cfb438 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -40,6 +40,14 @@ #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" +#include "scene/gui/split_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" /*************************************************************************/ /* Settings data */ diff --git a/editor/import/dynamic_font_import_settings.h b/editor/import/dynamic_font_import_settings.h index 61d52b737aff..7abac3a259cd 100644 --- a/editor/import/dynamic_font_import_settings.h +++ b/editor/import/dynamic_font_import_settings.h @@ -35,17 +35,13 @@ #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; +class FontFile; +class TabContainer; +class TextEdit; +class Tree; +class TreeItem; class DynamicFontImportSettingsData : public RefCounted { GDCLASS(DynamicFontImportSettingsData, RefCounted) diff --git a/editor/import_defaults_editor.cpp b/editor/import_defaults_editor.cpp index 31e3022f6b9d..b2f2b7ceb859 100644 --- a/editor/import_defaults_editor.cpp +++ b/editor/import_defaults_editor.cpp @@ -38,7 +38,10 @@ #include "editor/localization_editor.h" #include "editor/plugins/editor_plugin_settings.h" #include "editor/shader_globals_editor.h" +#include "scene/gui/button.h" #include "scene/gui/center_container.h" +#include "scene/gui/label.h" +#include "scene/gui/option_button.h" class ImportDefaultsEditorSettings : public Object { GDCLASS(ImportDefaultsEditorSettings, Object) diff --git a/editor/import_defaults_editor.h b/editor/import_defaults_editor.h index ccc74f39a5c8..bc26c527ad98 100644 --- a/editor/import_defaults_editor.h +++ b/editor/import_defaults_editor.h @@ -32,11 +32,11 @@ #define IMPORT_DEFAULTS_EDITOR_H #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/option_button.h" -class ImportDefaultsEditorSettings; +class Button; class EditorInspector; +class ImportDefaultsEditorSettings; +class OptionButton; class ImportDefaultsEditor : public VBoxContainer { GDCLASS(ImportDefaultsEditor, VBoxContainer) diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index a8f8e9ef1101..a67d91df5824 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -38,6 +38,11 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" class ImportDockParameters : public Object { GDCLASS(ImportDockParameters, Object); diff --git a/editor/import_dock.h b/editor/import_dock.h index c0a1dee7cab2..874b1efaf600 100644 --- a/editor/import_dock.h +++ b/editor/import_dock.h @@ -36,12 +36,14 @@ #include "editor/editor_file_system.h" #include "editor/editor_inspector.h" #include "scene/gui/box_container.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/option_button.h" -#include "scene/gui/popup_menu.h" +class Button; +class ConfirmationDialog; class ImportDockParameters; +class Label; +class MenuButton; +class OptionButton; + class ImportDock : public VBoxContainer { GDCLASS(ImportDock, VBoxContainer); diff --git a/editor/input_event_configuration_dialog.cpp b/editor/input_event_configuration_dialog.cpp index dc839b02f663..56c152756ffa 100644 --- a/editor/input_event_configuration_dialog.cpp +++ b/editor/input_event_configuration_dialog.cpp @@ -33,7 +33,9 @@ #include "editor/editor_string_names.h" #include "editor/event_listener_line_edit.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" #include "scene/gui/check_box.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/gui/separator.h" diff --git a/editor/input_event_configuration_dialog.h b/editor/input_event_configuration_dialog.h index b27f25a5b785..ea1585113410 100644 --- a/editor/input_event_configuration_dialog.h +++ b/editor/input_event_configuration_dialog.h @@ -33,10 +33,12 @@ #include "scene/gui/dialogs.h" +class CheckBox; +class EventListenerLineEdit; +class HBoxContainer; class OptionButton; class Tree; -class EventListenerLineEdit; -class CheckBox; +class VBoxContainer; // Confirmation Dialog used when configuring an input event. // Separate from ActionMapEditor for code cleanliness and separation of responsibilities. diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index acdbd6d9c4af..34d3c89909b6 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -39,6 +39,10 @@ #include "editor/gui/editor_object_selector.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" InspectorDock *InspectorDock::singleton = nullptr; diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index 60ce8100aa27..5352d65df609 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -35,14 +35,16 @@ #include "editor/editor_data.h" #include "editor/editor_inspector.h" #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/tree.h" +class AcceptDialog; +class Button; +class ConfirmationDialog; +class EditorData; class EditorFileDialog; class EditorObjectSelector; +class LineEdit; +class MenuButton; +class Tree; class InspectorDock : public VBoxContainer { GDCLASS(InspectorDock, VBoxContainer); diff --git a/editor/localization_editor.cpp b/editor/localization_editor.cpp index 11d1b3e0894b..ca95748821b6 100644 --- a/editor/localization_editor.cpp +++ b/editor/localization_editor.cpp @@ -38,7 +38,10 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/pot_generator.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/control.h" +#include "scene/gui/check_box.h" +#include "scene/gui/label.h" +#include "scene/gui/tab_container.h" +#include "scene/gui/tree.h" void LocalizationEditor::_notification(int p_what) { switch (p_what) { diff --git a/editor/localization_editor.h b/editor/localization_editor.h index eb6e5b93c7d0..6b336d5e2b7b 100644 --- a/editor/localization_editor.h +++ b/editor/localization_editor.h @@ -32,11 +32,12 @@ #define LOCALIZATION_EDITOR_H #include "editor/editor_locale_dialog.h" -#include "scene/gui/check_box.h" -#include "scene/gui/tree.h" +#include "scene/gui/box_container.h" +class CheckBox; class EditorFileDialog; class FileSystemDock; +class Tree; class LocalizationEditor : public VBoxContainer { GDCLASS(LocalizationEditor, VBoxContainer); diff --git a/editor/node_dock.cpp b/editor/node_dock.cpp index 0c79e5d747cc..b5f8fb24fded 100644 --- a/editor/node_dock.cpp +++ b/editor/node_dock.cpp @@ -33,6 +33,8 @@ #include "editor/connections_dialog.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" void NodeDock::show_groups() { groups_button->set_pressed(true); diff --git a/editor/node_dock.h b/editor/node_dock.h index e9dcc41d48cb..3930a00d8821 100644 --- a/editor/node_dock.h +++ b/editor/node_dock.h @@ -32,6 +32,7 @@ #define NODE_DOCK_H #include "groups_editor.h" +#include "scene/gui/box_container.h" class ConnectionsDock; diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index 77ae70781dcc..fe4b172d72b0 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -38,6 +38,7 @@ #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/themes/editor_scale.h" +#include "scene/2d/node_2d.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" #include "scene/gui/separator.h" diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h index 42170d9ffd1c..ab9c739417b0 100644 --- a/editor/plugins/abstract_polygon_2d_editor.h +++ b/editor/plugins/abstract_polygon_2d_editor.h @@ -32,9 +32,9 @@ #define ABSTRACT_POLYGON_2D_EDITOR_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/polygon_2d.h" #include "scene/gui/box_container.h" +class Node2D; class Button; class CanvasItemEditor; class ConfirmationDialog; diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp index 7d580e8de95c..bff83a9f9bdc 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/plugins/animation_blend_space_1d_editor.cpp @@ -37,12 +37,15 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/animation/animation_blend_space_1d.h" #include "scene/animation/animation_blend_tree.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/gui/panel_container.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h index 00bd3c767d4d..7103f0adfa40 100644 --- a/editor/plugins/animation_blend_space_1d_editor.h +++ b/editor/plugins/animation_blend_space_1d_editor.h @@ -33,15 +33,14 @@ #include "editor/plugins/animation_tree_editor_plugin.h" #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 AnimationNodeBlendSpace1D; class Button; class CheckBox; class LineEdit; class OptionButton; class PanelContainer; +class PopupMenu; class SpinBox; class VSeparator; diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index 55949df54f73..0a85998a77c6 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -41,16 +41,16 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/animation/animation_blend_space_2d.h" #include "scene/animation/animation_blend_tree.h" -#include "scene/animation/animation_player.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" -#include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" -#include "scene/gui/panel.h" #include "scene/gui/panel_container.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" #include "scene/main/window.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/plugins/animation_blend_space_2d_editor.h index 15d81c070759..1cda8387fad4 100644 --- a/editor/plugins/animation_blend_space_2d_editor.h +++ b/editor/plugins/animation_blend_space_2d_editor.h @@ -33,15 +33,14 @@ #include "editor/plugins/animation_tree_editor_plugin.h" #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 AnimationNodeBlendSpace2D; class Button; class CheckBox; class LineEdit; class OptionButton; class PanelContainer; +class PopupMenu; class SpinBox; class VSeparator; diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index a28fe016667a..f97028810d6a 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -42,12 +42,19 @@ #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/animation/animation_blend_tree.h" +#include "scene/gui/button.h" #include "scene/gui/check_box.h" +#include "scene/gui/graph_edit.h" +#include "scene/gui/graph_node.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" -#include "scene/gui/panel.h" +#include "scene/gui/panel_container.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/progress_bar.h" #include "scene/gui/separator.h" +#include "scene/gui/tree.h" #include "scene/gui/view_panner.h" #include "scene/main/window.h" #include "scene/resources/style_box_flat.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h index ee6f087e0715..6eda60e8f127 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.h +++ b/editor/plugins/animation_blend_tree_editor_plugin.h @@ -33,20 +33,19 @@ #include "core/object/script_language.h" #include "editor/plugins/animation_tree_editor_plugin.h" -#include "scene/animation/animation_blend_tree.h" -#include "scene/gui/button.h" -#include "scene/gui/graph_edit.h" -#include "scene/gui/panel_container.h" -#include "scene/gui/popup.h" -#include "scene/gui/tree.h" class AcceptDialog; +class AnimationNodeBlendTree; +class Button; class CheckBox; -class ProgressBar; class EditorFileDialog; class EditorProperty; +class GraphEdit; class MenuButton; +class ProgressBar; class PanelContainer; +class Tree; +class TreeItem; class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin { GDCLASS(AnimationNodeBlendTreeEditor, AnimationTreeNodeEditorPlugin); diff --git a/editor/plugins/animation_library_editor.cpp b/editor/plugins/animation_library_editor.cpp index 38f8b16b3411..36d15d294888 100644 --- a/editor/plugins/animation_library_editor.cpp +++ b/editor/plugins/animation_library_editor.cpp @@ -37,6 +37,11 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" #include "scene/animation/animation_mixer.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/tree.h" void AnimationLibraryEditor::set_animation_mixer(Object *p_mixer) { mixer = Object::cast_to(p_mixer); diff --git a/editor/plugins/animation_library_editor.h b/editor/plugins/animation_library_editor.h index beb34c6343a8..08415d9e50a9 100644 --- a/editor/plugins/animation_library_editor.h +++ b/editor/plugins/animation_library_editor.h @@ -33,12 +33,11 @@ #include "editor/animation_track_editor.h" #include "editor/plugins/editor_plugin.h" -#include "scene/animation/animation_mixer.h" #include "scene/gui/dialogs.h" -#include "scene/gui/tree.h" class AnimationMixer; class EditorFileDialog; +class Tree; class AnimationLibraryEditor : public AcceptDialog { GDCLASS(AnimationLibraryEditor, AcceptDialog) diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 0161b3670967..a1c0da1c0e51 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -47,8 +47,17 @@ #include "editor/scene_tree_dock.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/animation/animation_player.h" #include "scene/animation/animation_tree.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" +#include "scene/gui/spin_box.h" +#include "scene/gui/tree.h" #include "scene/main/window.h" #include "scene/resources/animation.h" #include "scene/resources/image_texture.h" @@ -772,6 +781,15 @@ void AnimationPlayerEditor::ensure_visibility() { _animation_edit(); } +bool AnimationPlayerEditor::is_pinned() const { + return pin->is_pressed(); +} + +void AnimationPlayerEditor::unpin() { + pin->set_pressed(false); + _pin_pressed(); +} + Dictionary AnimationPlayerEditor::get_state() const { Dictionary d; diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h index 544b6d6747a4..6ed61da7e1a4 100644 --- a/editor/plugins/animation_player_editor_plugin.h +++ b/editor/plugins/animation_player_editor_plugin.h @@ -34,15 +34,15 @@ #include "editor/animation_track_editor.h" #include "editor/plugins/animation_library_editor.h" #include "editor/plugins/editor_plugin.h" -#include "scene/animation/animation_player.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/slider.h" -#include "scene/gui/spin_box.h" -#include "scene/gui/texture_button.h" -#include "scene/gui/tree.h" +class AcceptDialog; +class AnimatedValuesBackup; +class AnimationPlayer; class AnimationPlayerEditorPlugin; +class ConfirmationDialog; class ImageTexture; +class SpinBox; +class Tree; class AnimationPlayerEditor : public VBoxContainer { GDCLASS(AnimationPlayerEditor, VBoxContainer); @@ -256,11 +256,9 @@ class AnimationPlayerEditor : public VBoxContainer { static AnimationPlayerEditor *get_singleton() { return singleton; } - bool is_pinned() const { return pin->is_pressed(); } - void unpin() { - pin->set_pressed(false); - _pin_pressed(); - } + bool is_pinned() const; + void unpin(); + AnimationTrackEditor *get_track_editor() { return track_editor; } Dictionary get_state() const; void set_state(const Dictionary &p_state); diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index e9dd54f73be9..29a3f59329b5 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -42,10 +42,15 @@ #include "editor/themes/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/panel.h" #include "scene/gui/panel_container.h" +#include "scene/gui/popup.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/separator.h" #include "scene/gui/tree.h" #include "scene/main/viewport.h" diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h index 860d0ed35d12..90a87f2130dd 100644 --- a/editor/plugins/animation_state_machine_editor.h +++ b/editor/plugins/animation_state_machine_editor.h @@ -33,14 +33,17 @@ #include "editor/plugins/animation_tree_editor_plugin.h" #include "scene/animation/animation_node_state_machine.h" -#include "scene/gui/graph_edit.h" -#include "scene/gui/popup.h" -#include "scene/gui/tree.h" class ConfirmationDialog; class EditorFileDialog; +class HScrollBar; +class LineEdit; class OptionButton; class PanelContainer; +class Popup; +class PopupMenu; +class Tree; +class VScrollBar; class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin { GDCLASS(AnimationNodeStateMachineEditor, AnimationTreeNodeEditorPlugin); diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index 757d410b788e..2ff27a8f3354 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -39,7 +39,9 @@ #include "editor/gui/editor_bottom_panel.h" #include "editor/themes/editor_scale.h" #include "scene/animation/animation_blend_tree.h" +#include "scene/animation/animation_tree.h" #include "scene/gui/button.h" +#include "scene/gui/label.h" #include "scene/gui/margin_container.h" #include "scene/gui/scroll_container.h" #include "scene/gui/separator.h" diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h index 8dc820695ae9..50abe85c82cb 100644 --- a/editor/plugins/animation_tree_editor_plugin.h +++ b/editor/plugins/animation_tree_editor_plugin.h @@ -32,9 +32,10 @@ #define ANIMATION_TREE_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/animation/animation_tree.h" -#include "scene/gui/graph_edit.h" +#include "scene/gui/box_container.h" +class AnimationTree; +class AnimationNode; class Button; class EditorFileDialog; class ScrollContainer; diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index 56a31fbb0d8a..1a09e200fc1f 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -42,7 +42,22 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/project_settings_editor.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" +#include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/link_button.h" #include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/progress_bar.h" +#include "scene/gui/rich_text_label.h" +#include "scene/gui/scroll_container.h" +#include "scene/gui/separator.h" +#include "scene/gui/texture_button.h" +#include "scene/gui/texture_rect.h" +#include "scene/main/http_request.h" +#include "scene/main/timer.h" #include "scene/resources/image_texture.h" static inline void setup_http_request(HTTPRequest *request) { diff --git a/editor/plugins/asset_library_editor_plugin.h b/editor/plugins/asset_library_editor_plugin.h index a80e7c8f9683..e6608ad163ea 100644 --- a/editor/plugins/asset_library_editor_plugin.h +++ b/editor/plugins/asset_library_editor_plugin.h @@ -34,24 +34,24 @@ #include "editor/editor_asset_installer.h" #include "editor/plugins/editor_plugin.h" #include "editor/plugins/editor_plugin_settings.h" -#include "scene/gui/box_container.h" -#include "scene/gui/check_box.h" -#include "scene/gui/grid_container.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/link_button.h" #include "scene/gui/margin_container.h" -#include "scene/gui/option_button.h" #include "scene/gui/panel_container.h" -#include "scene/gui/progress_bar.h" -#include "scene/gui/rich_text_label.h" -#include "scene/gui/scroll_container.h" -#include "scene/gui/separator.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/texture_button.h" -#include "scene/main/http_request.h" class EditorFileDialog; +class GridContainer; +class HBoxContainer; +class HTTPRequest; +class LineEdit; +class LinkButton; class MenuButton; +class OptionButton; +class ProgressBar; +class RichTextLabel; +class ScrollContainer; +class TextureButton; +class TextureRect; +class Timer; +class VBoxContainer; class EditorAssetLibraryItem : public PanelContainer { GDCLASS(EditorAssetLibraryItem, PanelContainer); diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/plugins/audio_stream_editor_plugin.cpp index f691bad3c316..0c29dbd457c4 100644 --- a/editor/plugins/audio_stream_editor_plugin.cpp +++ b/editor/plugins/audio_stream_editor_plugin.cpp @@ -34,6 +34,9 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/audio/audio_stream_player.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" #include "scene/resources/audio_stream_wav.h" // AudioStreamEditor diff --git a/editor/plugins/audio_stream_editor_plugin.h b/editor/plugins/audio_stream_editor_plugin.h index 0501409c178f..2a36ef3dc6f3 100644 --- a/editor/plugins/audio_stream_editor_plugin.h +++ b/editor/plugins/audio_stream_editor_plugin.h @@ -33,10 +33,12 @@ #include "editor/editor_inspector.h" #include "editor/plugins/editor_plugin.h" -#include "scene/audio/audio_stream_player.h" -#include "scene/gui/button.h" #include "scene/gui/color_rect.h" -#include "scene/gui/label.h" + +class AudioStream; +class AudioStreamPlayer; +class Button; +class Label; class AudioStreamEditor : public ColorRect { GDCLASS(AudioStreamEditor, ColorRect); diff --git a/editor/plugins/audio_stream_randomizer_editor_plugin.cpp b/editor/plugins/audio_stream_randomizer_editor_plugin.cpp index 9c76b86d6a2f..728c4be06a3a 100644 --- a/editor/plugins/audio_stream_randomizer_editor_plugin.cpp +++ b/editor/plugins/audio_stream_randomizer_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "servers/audio/audio_stream.h" void AudioStreamRandomizerEditorPlugin::edit(Object *p_object) { } diff --git a/editor/plugins/audio_stream_randomizer_editor_plugin.h b/editor/plugins/audio_stream_randomizer_editor_plugin.h index 9d2fc76e9e90..4579e0bd03df 100644 --- a/editor/plugins/audio_stream_randomizer_editor_plugin.h +++ b/editor/plugins/audio_stream_randomizer_editor_plugin.h @@ -32,7 +32,6 @@ #define AUDIO_STREAM_RANDOMIZER_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "servers/audio/audio_stream.h" class AudioStreamRandomizerEditorPlugin : public EditorPlugin { GDCLASS(AudioStreamRandomizerEditorPlugin, EditorPlugin); diff --git a/editor/plugins/bit_map_editor_plugin.cpp b/editor/plugins/bit_map_editor_plugin.cpp index 668ea04d6982..6bffa7b635b6 100644 --- a/editor/plugins/bit_map_editor_plugin.cpp +++ b/editor/plugins/bit_map_editor_plugin.cpp @@ -33,6 +33,7 @@ #include "editor/themes/editor_scale.h" #include "scene/gui/label.h" #include "scene/gui/texture_rect.h" +#include "scene/resources/bit_map.h" #include "scene/resources/image_texture.h" void BitMapEditor::setup(const Ref &p_bitmap) { diff --git a/editor/plugins/bit_map_editor_plugin.h b/editor/plugins/bit_map_editor_plugin.h index 030536ab6b35..40fcbab05a4a 100644 --- a/editor/plugins/bit_map_editor_plugin.h +++ b/editor/plugins/bit_map_editor_plugin.h @@ -33,8 +33,8 @@ #include "editor/editor_inspector.h" #include "editor/plugins/editor_plugin.h" -#include "scene/resources/bit_map.h" +class BitMap; class TextureRect; class BitMapEditor : public VBoxContainer { diff --git a/editor/plugins/bone_map_editor_plugin.cpp b/editor/plugins/bone_map_editor_plugin.cpp index c00436b01f83..95167455db1f 100644 --- a/editor/plugins/bone_map_editor_plugin.cpp +++ b/editor/plugins/bone_map_editor_plugin.cpp @@ -38,8 +38,12 @@ #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/aspect_ratio_container.h" +#include "scene/gui/button.h" +#include "scene/gui/color_rect.h" #include "scene/gui/separator.h" #include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" +#include "scene/resources/bone_map.h" void BoneMapperButton::fetch_textures() { if (selected) { diff --git a/editor/plugins/bone_map_editor_plugin.h b/editor/plugins/bone_map_editor_plugin.h index f3aa2fc84df3..846801f460ed 100644 --- a/editor/plugins/bone_map_editor_plugin.h +++ b/editor/plugins/bone_map_editor_plugin.h @@ -42,12 +42,13 @@ #include "scene/3d/skeleton_3d.h" #include "scene/gui/box_container.h" -#include "scene/gui/color_rect.h" #include "scene/gui/dialogs.h" -#include "scene/resources/bone_map.h" -#include "scene/resources/texture.h" +#include "scene/gui/texture_button.h" class AspectRatioContainer; +class BoneMap; +class ColorRect; +class TextureRect; class BoneMapperButton : public TextureButton { GDCLASS(BoneMapperButton, TextureButton); diff --git a/editor/plugins/camera_3d_editor_plugin.cpp b/editor/plugins/camera_3d_editor_plugin.cpp index 62b40043c1bf..d7ccb7955fe4 100644 --- a/editor/plugins/camera_3d_editor_plugin.cpp +++ b/editor/plugins/camera_3d_editor_plugin.cpp @@ -31,7 +31,9 @@ #include "camera_3d_editor_plugin.h" #include "editor/editor_node.h" -#include "node_3d_editor_plugin.h" +#include "editor/plugins/node_3d_editor_plugin.h" +#include "scene/3d/camera_3d.h" +#include "scene/gui/button.h" void Camera3DEditor::_node_removed(Node *p_node) { if (p_node == node) { diff --git a/editor/plugins/camera_3d_editor_plugin.h b/editor/plugins/camera_3d_editor_plugin.h index 2e4d8a1ee375..3469f3c3167f 100644 --- a/editor/plugins/camera_3d_editor_plugin.h +++ b/editor/plugins/camera_3d_editor_plugin.h @@ -32,7 +32,6 @@ #define CAMERA_3D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/camera_3d.h" class Camera3DEditor : public Control { GDCLASS(Camera3DEditor, Control); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index fbc5ffabb82a..c6d1270076f4 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -52,11 +52,18 @@ #include "scene/2d/sprite_2d.h" #include "scene/2d/touch_screen_button.h" #include "scene/gui/base_button.h" +#include "scene/gui/check_box.h" #include "scene/gui/flow_container.h" #include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/separator.h" +#include "scene/gui/spin_box.h" #include "scene/gui/split_container.h" #include "scene/gui/subviewport_container.h" +#include "scene/gui/texture_button.h" #include "scene/gui/view_panner.h" #include "scene/main/canvas_layer.h" #include "scene/main/window.h" diff --git a/editor/plugins/cast_2d_editor_plugin.cpp b/editor/plugins/cast_2d_editor_plugin.cpp index 3da7d4a7dc25..adcd2f098b49 100644 --- a/editor/plugins/cast_2d_editor_plugin.cpp +++ b/editor/plugins/cast_2d_editor_plugin.cpp @@ -33,6 +33,7 @@ #include "canvas_item_editor_plugin.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/2d/node_2d.h" #include "scene/2d/physics/ray_cast_2d.h" #include "scene/2d/physics/shape_cast_2d.h" diff --git a/editor/plugins/cast_2d_editor_plugin.h b/editor/plugins/cast_2d_editor_plugin.h index cbe7e0300869..1de47e96445f 100644 --- a/editor/plugins/cast_2d_editor_plugin.h +++ b/editor/plugins/cast_2d_editor_plugin.h @@ -32,9 +32,9 @@ #define CAST_2D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/node_2d.h" class CanvasItemEditor; +class Node2D; class Cast2DEditor : public Control { GDCLASS(Cast2DEditor, Control); diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/editor/plugins/collision_polygon_2d_editor_plugin.cpp index 7f4e0d3f2771..7fa8e672e80a 100644 --- a/editor/plugins/collision_polygon_2d_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_2d_editor_plugin.cpp @@ -30,6 +30,8 @@ #include "collision_polygon_2d_editor_plugin.h" +#include "scene/2d/physics/collision_polygon_2d.h" + Node2D *CollisionPolygon2DEditor::_get_node() const { return node; } diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.h b/editor/plugins/collision_polygon_2d_editor_plugin.h index 61e6cc3ddaa3..890518548ea8 100644 --- a/editor/plugins/collision_polygon_2d_editor_plugin.h +++ b/editor/plugins/collision_polygon_2d_editor_plugin.h @@ -32,7 +32,8 @@ #define COLLISION_POLYGON_2D_EDITOR_PLUGIN_H #include "editor/plugins/abstract_polygon_2d_editor.h" -#include "scene/2d/physics/collision_polygon_2d.h" + +class CollisionPolygon2D; class CollisionPolygon2DEditor : public AbstractPolygon2DEditor { GDCLASS(CollisionPolygon2DEditor, AbstractPolygon2DEditor); diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp index d27036654e7b..42fb7dae2b98 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp @@ -35,6 +35,7 @@ #include "editor/editor_node.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/2d/physics/collision_shape_2d.h" #include "scene/resources/2d/capsule_shape_2d.h" #include "scene/resources/2d/circle_shape_2d.h" #include "scene/resources/2d/concave_polygon_shape_2d.h" diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h index 672e1d9ce0ab..77ad8ca32264 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/editor/plugins/collision_shape_2d_editor_plugin.h @@ -32,9 +32,10 @@ #define COLLISION_SHAPE_2D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/physics/collision_shape_2d.h" class CanvasItemEditor; +class CollisionShape2D; +class Shape2D; class CollisionShape2DEditor : public Control { GDCLASS(CollisionShape2DEditor, Control); diff --git a/editor/plugins/control_editor_plugin.cpp b/editor/plugins/control_editor_plugin.cpp index df20395ac5ab..dadfb5b3b8fc 100644 --- a/editor/plugins/control_editor_plugin.cpp +++ b/editor/plugins/control_editor_plugin.cpp @@ -36,9 +36,15 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel_container.h" +#include "scene/gui/popup.h" #include "scene/gui/separator.h" +#include "scene/gui/texture_rect.h" // Inspector controls. diff --git a/editor/plugins/control_editor_plugin.h b/editor/plugins/control_editor_plugin.h index 2672e8ef9703..de45213c3a37 100644 --- a/editor/plugins/control_editor_plugin.h +++ b/editor/plugins/control_editor_plugin.h @@ -35,19 +35,18 @@ #include "editor/plugins/editor_plugin.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/gui/check_box.h" -#include "scene/gui/control.h" -#include "scene/gui/label.h" #include "scene/gui/margin_container.h" -#include "scene/gui/option_button.h" -#include "scene/gui/panel_container.h" -#include "scene/gui/popup.h" -#include "scene/gui/separator.h" -#include "scene/gui/texture_rect.h" +class CheckBox; class CheckButton; class EditorSelection; class GridContainer; +class Label; +class OptionButton; +class PanelContainer; +class PopupPanel; +class Separator; +class TextureRect; // Inspector controls. class ControlPositioningWarning : public MarginContainer { diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp index 92c0fd847b6b..7f063d75670e 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp @@ -39,9 +39,11 @@ #include "editor/scene_tree_dock.h" #include "scene/2d/cpu_particles_2d.h" #include "scene/2d/gpu_particles_2d.h" +#include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" #include "scene/resources/particle_process_material.h" diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.h b/editor/plugins/cpu_particles_2d_editor_plugin.h index 4d59c9981e3e..ab9ac7036301 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.h +++ b/editor/plugins/cpu_particles_2d_editor_plugin.h @@ -32,16 +32,15 @@ #define CPU_PARTICLES_2D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/cpu_particles_2d.h" -#include "scene/2d/physics/collision_polygon_2d.h" -#include "scene/gui/box_container.h" class CheckBox; class ConfirmationDialog; -class SpinBox; +class CPUParticles2D; class EditorFileDialog; +class HBoxContainer; class MenuButton; class OptionButton; +class SpinBox; class CPUParticles2DEditorPlugin : public EditorPlugin { GDCLASS(CPUParticles2DEditorPlugin, EditorPlugin); diff --git a/editor/plugins/cpu_particles_3d_editor_plugin.cpp b/editor/plugins/cpu_particles_3d_editor_plugin.cpp index be2847d1d761..0422d08c87b4 100644 --- a/editor/plugins/cpu_particles_3d_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_3d_editor_plugin.cpp @@ -36,7 +36,11 @@ #include "editor/gui/scene_tree_editor.h" #include "editor/plugins/node_3d_editor_plugin.h" #include "editor/scene_tree_dock.h" +#include "scene/3d/cpu_particles_3d.h" +#include "scene/3d/gpu_particles_3d.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/spin_box.h" void CPUParticles3DEditor::_node_removed(Node *p_node) { if (p_node == node) { diff --git a/editor/plugins/cpu_particles_3d_editor_plugin.h b/editor/plugins/cpu_particles_3d_editor_plugin.h index 99178b7fde7c..177610a52499 100644 --- a/editor/plugins/cpu_particles_3d_editor_plugin.h +++ b/editor/plugins/cpu_particles_3d_editor_plugin.h @@ -32,7 +32,8 @@ #define CPU_PARTICLES_3D_EDITOR_PLUGIN_H #include "editor/plugins/gpu_particles_3d_editor_plugin.h" -#include "scene/3d/cpu_particles_3d.h" + +class CPUParticles3D; class CPUParticles3DEditor : public GPUParticles3DEditorBase { GDCLASS(CPUParticles3DEditor, GPUParticles3DEditorBase); diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 180de700b7ba..fc5be9fc846f 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -45,6 +45,7 @@ #include "scene/gui/menu_button.h" #include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" +#include "scene/resources/curve.h" #include "scene/resources/image_texture.h" CurveEdit::CurveEdit() { diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h index c844f420296f..629c1d8bc00f 100644 --- a/editor/plugins/curve_editor_plugin.h +++ b/editor/plugins/curve_editor_plugin.h @@ -34,8 +34,8 @@ #include "editor/editor_inspector.h" #include "editor/editor_resource_preview.h" #include "editor/plugins/editor_plugin.h" -#include "scene/resources/curve.h" +class Curve; class EditorSpinSlider; class MenuButton; class PopupMenu; diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/plugins/debugger_editor_plugin.cpp index 55416ab4ebc6..7e8ce1a85175 100644 --- a/editor/plugins/debugger_editor_plugin.cpp +++ b/editor/plugins/debugger_editor_plugin.cpp @@ -42,6 +42,7 @@ #include "editor/run_instances_dialog.h" #include "editor/themes/editor_scale.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" DebuggerEditorPlugin::DebuggerEditorPlugin(PopupMenu *p_debug_menu) { EditorDebuggerServer::initialize(); diff --git a/editor/plugins/editor_plugin.cpp b/editor/plugins/editor_plugin.cpp index d9f60e155d18..3ada7a24a9a4 100644 --- a/editor/plugins/editor_plugin.cpp +++ b/editor/plugins/editor_plugin.cpp @@ -54,6 +54,7 @@ #include "editor/scene_tree_dock.h" #include "scene/3d/camera_3d.h" #include "scene/gui/popup_menu.h" +#include "scene/gui/tab_container.h" #include "scene/resources/image_texture.h" #include "servers/rendering_server.h" diff --git a/editor/plugins/editor_plugin_settings.cpp b/editor/plugins/editor_plugin_settings.cpp index afc60b09d613..39dd3c1a61cc 100644 --- a/editor/plugins/editor_plugin_settings.cpp +++ b/editor/plugins/editor_plugin_settings.cpp @@ -38,6 +38,8 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" #include "scene/gui/margin_container.h" #include "scene/gui/tree.h" diff --git a/editor/plugins/editor_plugin_settings.h b/editor/plugins/editor_plugin_settings.h index 5b470b3e5835..f6e4e50f3d93 100644 --- a/editor/plugins/editor_plugin_settings.h +++ b/editor/plugins/editor_plugin_settings.h @@ -33,6 +33,7 @@ #include "editor/editor_data.h" #include "editor/plugins/plugin_config_dialog.h" +#include "scene/gui/box_container.h" class Tree; diff --git a/editor/plugins/font_config_plugin.cpp b/editor/plugins/font_config_plugin.cpp index e6ce63fe36b8..78db97b36e7e 100644 --- a/editor/plugins/font_config_plugin.cpp +++ b/editor/plugins/font_config_plugin.cpp @@ -33,7 +33,9 @@ #include "editor/editor_settings.h" #include "editor/import/dynamic_font_import_settings.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" #include "scene/gui/margin_container.h" +#include "scene/gui/popup_menu.h" /*************************************************************************/ /* EditorPropertyFontMetaObject */ diff --git a/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp b/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp index 19dd45a3ea58..b243c5c7f822 100644 --- a/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp +++ b/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp @@ -37,6 +37,7 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" +#include "scene/main/window.h" Camera3DGizmoPlugin::Camera3DGizmoPlugin() { Color gizmo_color = EDITOR_DEF_RST("editors/3d_gizmos/gizmo_colors/camera", Color(0.8, 0.4, 0.8)); diff --git a/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp b/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp index ae24b4250e17..f12a0caec186 100644 --- a/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp +++ b/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp @@ -38,6 +38,7 @@ #include "scene/3d/physics/joints/hinge_joint_3d.h" #include "scene/3d/physics/joints/pin_joint_3d.h" #include "scene/3d/physics/joints/slider_joint_3d.h" +#include "scene/main/timer.h" #define BODY_A_RADIUS 0.25 #define BODY_B_RADIUS 0.27 diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.cpp b/editor/plugins/gpu_particles_2d_editor_plugin.cpp index b70c34b78575..1968cfb981e7 100644 --- a/editor/plugins/gpu_particles_2d_editor_plugin.cpp +++ b/editor/plugins/gpu_particles_2d_editor_plugin.cpp @@ -38,8 +38,14 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/scene_tree_dock.h" #include "scene/2d/cpu_particles_2d.h" +#include "scene/2d/gpu_particles_2d.h" +#include "scene/gui/box_container.h" +#include "scene/gui/check_box.h" #include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" +#include "scene/gui/spin_box.h" #include "scene/resources/image_texture.h" #include "scene/resources/particle_process_material.h" diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.h b/editor/plugins/gpu_particles_2d_editor_plugin.h index bb0ca5de3a8f..fce5b4cde49f 100644 --- a/editor/plugins/gpu_particles_2d_editor_plugin.h +++ b/editor/plugins/gpu_particles_2d_editor_plugin.h @@ -32,16 +32,15 @@ #define GPU_PARTICLES_2D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/gpu_particles_2d.h" -#include "scene/2d/physics/collision_polygon_2d.h" -#include "scene/gui/box_container.h" -#include "scene/gui/spin_box.h" class CheckBox; class ConfirmationDialog; class EditorFileDialog; +class GPUParticles2D; +class HBoxContainer; class MenuButton; class OptionButton; +class SpinBox; class GPUParticles2DEditorPlugin : public EditorPlugin { GDCLASS(GPUParticles2DEditorPlugin, EditorPlugin); diff --git a/editor/plugins/gpu_particles_3d_editor_plugin.cpp b/editor/plugins/gpu_particles_3d_editor_plugin.cpp index 00c5332464ae..958d5c11119e 100644 --- a/editor/plugins/gpu_particles_3d_editor_plugin.cpp +++ b/editor/plugins/gpu_particles_3d_editor_plugin.cpp @@ -37,8 +37,12 @@ #include "editor/plugins/node_3d_editor_plugin.h" #include "editor/scene_tree_dock.h" #include "scene/3d/cpu_particles_3d.h" +#include "scene/3d/gpu_particles_3d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/spin_box.h" #include "scene/resources/image_texture.h" #include "scene/resources/particle_process_material.h" diff --git a/editor/plugins/gpu_particles_3d_editor_plugin.h b/editor/plugins/gpu_particles_3d_editor_plugin.h index 3b2ab2f8ca45..2b0663ac2338 100644 --- a/editor/plugins/gpu_particles_3d_editor_plugin.h +++ b/editor/plugins/gpu_particles_3d_editor_plugin.h @@ -32,14 +32,14 @@ #define GPU_PARTICLES_3D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/gpu_particles_3d.h" -#include "scene/gui/spin_box.h" class ConfirmationDialog; +class GPUParticles3D; class HBoxContainer; class MenuButton; class OptionButton; class SceneTreeDialog; +class SpinBox; class GPUParticles3DEditorBase : public Control { GDCLASS(GPUParticles3DEditorBase, Control); diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp index 25b076d0e55e..56897ceccfd6 100644 --- a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp +++ b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp @@ -34,6 +34,9 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" +#include "scene/3d/gpu_particles_collision_3d.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" void GPUParticlesCollisionSDF3DEditorPlugin::_bake() { if (col_sdf) { diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h index bba8bd258411..da34fb6f7968 100644 --- a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h +++ b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h @@ -32,11 +32,10 @@ #define GPU_PARTICLES_COLLISION_SDF_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/gpu_particles_collision_3d.h" -#include "scene/resources/material.h" struct EditorProgress; class EditorFileDialog; +class GPUParticlesCollisionSDF3D; class HBoxContainer; class GPUParticlesCollisionSDF3DEditorPlugin : public EditorPlugin { diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.cpp b/editor/plugins/gradient_texture_2d_editor_plugin.cpp index 7e22e1209c99..033abb1884ac 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.cpp +++ b/editor/plugins/gradient_texture_2d_editor_plugin.cpp @@ -38,6 +38,7 @@ #include "scene/gui/button.h" #include "scene/gui/flow_container.h" #include "scene/gui/separator.h" +#include "scene/gui/texture_rect.h" #include "scene/resources/gradient_texture.h" Point2 GradientTexture2DEdit::_get_handle_pos(const Handle p_handle) { diff --git a/editor/plugins/input_event_editor_plugin.cpp b/editor/plugins/input_event_editor_plugin.cpp index 5a90d2de61ab..c2b4bdbb15d2 100644 --- a/editor/plugins/input_event_editor_plugin.cpp +++ b/editor/plugins/input_event_editor_plugin.cpp @@ -32,6 +32,8 @@ #include "editor/event_listener_line_edit.h" #include "editor/input_event_configuration_dialog.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" void InputEventConfigContainer::_bind_methods() { } diff --git a/editor/plugins/light_occluder_2d_editor_plugin.cpp b/editor/plugins/light_occluder_2d_editor_plugin.cpp index 429add45400a..3298a6a8008c 100644 --- a/editor/plugins/light_occluder_2d_editor_plugin.cpp +++ b/editor/plugins/light_occluder_2d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/2d/light_occluder_2d.h" Ref LightOccluder2DEditor::_ensure_occluder() const { Ref occluder = node->get_occluder_polygon(); diff --git a/editor/plugins/light_occluder_2d_editor_plugin.h b/editor/plugins/light_occluder_2d_editor_plugin.h index 01c8a185b6a8..5dd38e14e47a 100644 --- a/editor/plugins/light_occluder_2d_editor_plugin.h +++ b/editor/plugins/light_occluder_2d_editor_plugin.h @@ -32,7 +32,9 @@ #define LIGHT_OCCLUDER_2D_EDITOR_PLUGIN_H #include "editor/plugins/abstract_polygon_2d_editor.h" -#include "scene/2d/light_occluder_2d.h" + +class LightOccluder2D; +class OccluderPolygon2D; class LightOccluder2DEditor : public AbstractPolygon2DEditor { GDCLASS(LightOccluder2DEditor, AbstractPolygon2DEditor); diff --git a/editor/plugins/lightmap_gi_editor_plugin.cpp b/editor/plugins/lightmap_gi_editor_plugin.cpp index 1c17d99d0dc1..0aadaf87b93d 100644 --- a/editor/plugins/lightmap_gi_editor_plugin.cpp +++ b/editor/plugins/lightmap_gi_editor_plugin.cpp @@ -33,6 +33,8 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" +#include "scene/3d/lightmap_gi.h" +#include "scene/gui/button.h" void LightmapGIEditorPlugin::_bake_select_file(const String &p_file) { if (lightmap) { diff --git a/editor/plugins/lightmap_gi_editor_plugin.h b/editor/plugins/lightmap_gi_editor_plugin.h index 3e739adf9e66..f2430e4b46d6 100644 --- a/editor/plugins/lightmap_gi_editor_plugin.h +++ b/editor/plugins/lightmap_gi_editor_plugin.h @@ -32,11 +32,10 @@ #define LIGHTMAP_GI_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/lightmap_gi.h" -#include "scene/resources/material.h" struct EditorProgress; class EditorFileDialog; +class LightmapGI; class LightmapGIEditorPlugin : public EditorPlugin { GDCLASS(LightmapGIEditorPlugin, EditorPlugin); diff --git a/editor/plugins/line_2d_editor_plugin.cpp b/editor/plugins/line_2d_editor_plugin.cpp index 0185617c368c..725f94d8cbd6 100644 --- a/editor/plugins/line_2d_editor_plugin.cpp +++ b/editor/plugins/line_2d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/2d/line_2d.h" Node2D *Line2DEditor::_get_node() const { return node; diff --git a/editor/plugins/line_2d_editor_plugin.h b/editor/plugins/line_2d_editor_plugin.h index f91fec80dd4e..3f395ddde4e0 100644 --- a/editor/plugins/line_2d_editor_plugin.h +++ b/editor/plugins/line_2d_editor_plugin.h @@ -32,7 +32,8 @@ #define LINE_2D_EDITOR_PLUGIN_H #include "editor/plugins/abstract_polygon_2d_editor.h" -#include "scene/2d/line_2d.h" + +class Line2D; class Line2DEditor : public AbstractPolygon2DEditor { GDCLASS(Line2DEditor, AbstractPolygon2DEditor); diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index 602e6f945c30..f461574056f9 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -44,6 +44,7 @@ #include "scene/gui/subviewport_container.h" #include "scene/main/viewport.h" #include "scene/resources/3d/fog_material.h" +#include "scene/resources/3d/primitive_meshes.h" #include "scene/resources/3d/sky_material.h" #include "scene/resources/particle_process_material.h" diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index fb6bafc0efb7..f9809a6681ba 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -34,17 +34,18 @@ #include "editor/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "editor/plugins/editor_resource_conversion_plugin.h" -#include "scene/resources/3d/primitive_meshes.h" -#include "scene/resources/material.h" +class BoxMesh; +class Button; class Camera3D; class ColorRect; class DirectionalLight3D; class HBoxContainer; +class Material; class MeshInstance3D; +class SphereMesh; class SubViewport; class SubViewportContainer; -class Button; class MaterialEditor : public Control { GDCLASS(MaterialEditor, Control); diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index c8eda600b845..c3bf822b4fc8 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -32,8 +32,12 @@ #include "core/config/project_settings.h" #include "editor/themes/editor_scale.h" +#include "scene/3d/camera_3d.h" +#include "scene/3d/light_3d.h" +#include "scene/3d/mesh_instance_3d.h" #include "scene/gui/button.h" #include "scene/main/viewport.h" +#include "scene/resources/camera_attributes.h" void MeshEditor::gui_input(const Ref &p_event) { ERR_FAIL_COND(p_event.is_null()); diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index 85d92e7800d1..a18764f174d7 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -33,15 +33,14 @@ #include "editor/editor_inspector.h" #include "editor/plugins/editor_plugin.h" -#include "scene/3d/camera_3d.h" -#include "scene/3d/light_3d.h" -#include "scene/3d/mesh_instance_3d.h" #include "scene/gui/subviewport_container.h" -#include "scene/resources/camera_attributes.h" -#include "scene/resources/material.h" -class SubViewport; class Button; +class Camera3D; +class CameraAttributesPractical; +class DirectionalLight3D; +class SubViewport; +class MeshInstance3D; class MeshEditor : public SubViewportContainer { GDCLASS(MeshEditor, SubViewportContainer); diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp index 4ebacbd0b37e..accd6b601c84 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp @@ -36,13 +36,17 @@ #include "editor/multi_node_edit.h" #include "editor/plugins/node_3d_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/navigation_region_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/gui/box_container.h" #include "scene/gui/dialogs.h" +#include "scene/gui/label.h" #include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/spin_box.h" #include "scene/resources/3d/concave_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h" diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.h b/editor/plugins/mesh_instance_3d_editor_plugin.h index 20c151fb9269..39e3b8c8bd15 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.h +++ b/editor/plugins/mesh_instance_3d_editor_plugin.h @@ -32,12 +32,12 @@ #define MESH_INSTANCE_3D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/gui/option_button.h" class AcceptDialog; class ConfirmationDialog; class MenuButton; +class MeshInstance3D; +class OptionButton; class SpinBox; class MeshInstance3DEditor : public Control { diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp index 0b2549986c9e..499eeb3b4d45 100644 --- a/editor/plugins/mesh_library_editor_plugin.cpp +++ b/editor/plugins/mesh_library_editor_plugin.cpp @@ -43,6 +43,7 @@ #include "scene/3d/physics/physics_body_3d.h" #include "scene/3d/physics/static_body_3d.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp index 3980f23c8a72..64fea8e1bcee 100644 --- a/editor/plugins/multimesh_editor_plugin.cpp +++ b/editor/plugins/multimesh_editor_plugin.cpp @@ -35,9 +35,14 @@ #include "editor/gui/scene_tree_editor.h" #include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/multimesh_instance_3d.h" #include "scene/gui/box_container.h" +#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/slider.h" +#include "scene/gui/spin_box.h" void MultiMeshEditor::_node_removed(Node *p_node) { if (p_node == node) { diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h index 5051926c64f8..868878f2ca6c 100644 --- a/editor/plugins/multimesh_editor_plugin.h +++ b/editor/plugins/multimesh_editor_plugin.h @@ -32,15 +32,16 @@ #define MULTIMESH_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/multimesh_instance_3d.h" -#include "scene/gui/slider.h" -#include "scene/gui/spin_box.h" class AcceptDialog; class ConfirmationDialog; +class HSlider; +class LineEdit; class MenuButton; +class MultiMeshInstance3D; class OptionButton; class SceneTreeDialog; +class SpinBox; class MultiMeshEditor : public Control { GDCLASS(MultiMeshEditor, Control); diff --git a/editor/plugins/navigation_link_2d_editor_plugin.cpp b/editor/plugins/navigation_link_2d_editor_plugin.cpp index 5419e487bf4a..f39af494e0f9 100644 --- a/editor/plugins/navigation_link_2d_editor_plugin.cpp +++ b/editor/plugins/navigation_link_2d_editor_plugin.cpp @@ -34,6 +34,7 @@ #include "editor/editor_node.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/2d/navigation_link_2d.h" #include "servers/navigation_server_3d.h" void NavigationLink2DEditor::_notification(int p_what) { diff --git a/editor/plugins/navigation_link_2d_editor_plugin.h b/editor/plugins/navigation_link_2d_editor_plugin.h index 7a4be18c3167..dd4e04836d29 100644 --- a/editor/plugins/navigation_link_2d_editor_plugin.h +++ b/editor/plugins/navigation_link_2d_editor_plugin.h @@ -32,9 +32,9 @@ #define NAVIGATION_LINK_2D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/navigation_link_2d.h" class CanvasItemEditor; +class NavigationLink2D; class NavigationLink2DEditor : public Control { GDCLASS(NavigationLink2DEditor, Control); diff --git a/editor/plugins/navigation_obstacle_2d_editor_plugin.cpp b/editor/plugins/navigation_obstacle_2d_editor_plugin.cpp index a0ef3f9a2059..4211b023baf2 100644 --- a/editor/plugins/navigation_obstacle_2d_editor_plugin.cpp +++ b/editor/plugins/navigation_obstacle_2d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/2d/navigation_obstacle_2d.h" Node2D *NavigationObstacle2DEditor::_get_node() const { return node; diff --git a/editor/plugins/navigation_obstacle_2d_editor_plugin.h b/editor/plugins/navigation_obstacle_2d_editor_plugin.h index ae5b3a056aee..74629b0a3dde 100644 --- a/editor/plugins/navigation_obstacle_2d_editor_plugin.h +++ b/editor/plugins/navigation_obstacle_2d_editor_plugin.h @@ -32,7 +32,8 @@ #define NAVIGATION_OBSTACLE_2D_EDITOR_PLUGIN_H #include "editor/plugins/abstract_polygon_2d_editor.h" -#include "scene/2d/navigation_obstacle_2d.h" + +class NavigationObstacle2D; class NavigationObstacle2DEditor : public AbstractPolygon2DEditor { GDCLASS(NavigationObstacle2DEditor, AbstractPolygon2DEditor); diff --git a/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp b/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp index 9629a673e9e8..219a93931da1 100644 --- a/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp +++ b/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp @@ -39,9 +39,13 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "node_3d_editor_plugin.h" +#include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" +#include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/navigation_obstacle_3d.h" +#include "scene/gui/button.h" #include "scene/gui/separator.h" +#include "scene/resources/immediate_mesh.h" void NavigationObstacle3DEditor::_notification(int p_what) { switch (p_what) { diff --git a/editor/plugins/navigation_obstacle_3d_editor_plugin.h b/editor/plugins/navigation_obstacle_3d_editor_plugin.h index c62a5a281b82..bce8af319b39 100644 --- a/editor/plugins/navigation_obstacle_3d_editor_plugin.h +++ b/editor/plugins/navigation_obstacle_3d_editor_plugin.h @@ -32,15 +32,13 @@ #define NAVIGATION_OBSTACLE_3D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/3d/physics/collision_polygon_3d.h" #include "scene/gui/box_container.h" -#include "scene/resources/immediate_mesh.h" - -#include "scene/3d/navigation_obstacle_3d.h" class CanvasItemEditor; +class ImmediateMesh; class MenuButton; +class MeshInstance3D; +class NavigationObstacle3D; class NavigationObstacle3DEditor : public HBoxContainer { GDCLASS(NavigationObstacle3DEditor, HBoxContainer); diff --git a/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp index ec59bbb54399..1ef16e6b2f22 100644 --- a/editor/plugins/navigation_polygon_editor_plugin.cpp +++ b/editor/plugins/navigation_polygon_editor_plugin.cpp @@ -34,7 +34,10 @@ #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "scene/2d/navigation_region_2d.h" +#include "scene/gui/button.h" #include "scene/gui/dialogs.h" +#include "scene/gui/label.h" +#include "scene/main/timer.h" Ref NavigationPolygonEditor::_ensure_navpoly() const { Ref navpoly = node->get_navigation_polygon(); diff --git a/editor/plugins/navigation_polygon_editor_plugin.h b/editor/plugins/navigation_polygon_editor_plugin.h index 4d6d245cc506..867e8e6dd6fe 100644 --- a/editor/plugins/navigation_polygon_editor_plugin.h +++ b/editor/plugins/navigation_polygon_editor_plugin.h @@ -32,13 +32,13 @@ #define NAVIGATION_POLYGON_EDITOR_PLUGIN_H #include "editor/plugins/abstract_polygon_2d_editor.h" - #include "editor/plugins/editor_plugin.h" class AcceptDialog; class HBoxContainer; class NavigationPolygon; class NavigationRegion2D; +class Timer; class NavigationPolygonEditor : public AbstractPolygon2DEditor { friend class NavigationPolygonEditorPlugin; diff --git a/editor/plugins/node_3d_editor_gizmos.cpp b/editor/plugins/node_3d_editor_gizmos.cpp index 9c07b664341c..f98b118cdcfb 100644 --- a/editor/plugins/node_3d_editor_gizmos.cpp +++ b/editor/plugins/node_3d_editor_gizmos.cpp @@ -36,6 +36,7 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/plugins/node_3d_editor_plugin.h" +#include "scene/main/viewport.h" #include "scene/resources/3d/primitive_meshes.h" #define HANDLE_HALF_SIZE 9.5 diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 6ee3c043bf16..a258f1d3aea9 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -76,7 +76,6 @@ #include "editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h" #include "editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h" #include "editor/plugins/gizmos/voxel_gi_gizmo_plugin.h" -#include "editor/plugins/node_3d_editor_gizmos.h" #include "editor/scene_tree_dock.h" #include "scene/3d/audio_stream_player_3d.h" #include "scene/3d/camera_3d.h" @@ -89,8 +88,17 @@ #include "scene/3d/visual_instance_3d.h" #include "scene/3d/world_environment.h" #include "scene/gui/center_container.h" +#include "scene/gui/check_box.h" #include "scene/gui/color_picker.h" #include "scene/gui/flow_container.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel_container.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/separator.h" +#include "scene/gui/spin_box.h" #include "scene/gui/split_container.h" #include "scene/gui/subviewport_container.h" #include "scene/resources/3d/sky_material.h" @@ -6080,6 +6088,26 @@ void Node3DEditor::_generate_selection_boxes() { selection_box_xray = st_xray->commit(); } +float Node3DEditor::get_znear() const { + return settings_znear->get_value(); +} + +float Node3DEditor::get_zfar() const { + return settings_zfar->get_value(); +} + +float Node3DEditor::get_fov() const { + return settings_fov->get_value(); +} + +bool Node3DEditor::are_local_coords_enabled() const { + return tool_option_button[Node3DEditor::TOOL_OPT_LOCAL_COORDS]->is_pressed(); +} + +void Node3DEditor::set_local_coords_enabled(bool p_toggled_on) const { + tool_option_button[Node3DEditor::TOOL_OPT_LOCAL_COORDS]->set_pressed(p_toggled_on); +} + Dictionary Node3DEditor::get_state() const { Dictionary d; diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h index 11f2c5065909..dcd9da8acba7 100644 --- a/editor/plugins/node_3d_editor_plugin.h +++ b/editor/plugins/node_3d_editor_plugin.h @@ -36,10 +36,9 @@ #include "editor/plugins/node_3d_editor_gizmos.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/spin_box.h" class AcceptDialog; +class Button; class CheckBox; class ColorPickerButton; class ConfirmationDialog; @@ -54,7 +53,9 @@ class Node3DEditor; class Node3DEditorViewport; class OptionButton; class PanelContainer; +class Popup; class ProceduralSkyMaterial; +class SpinBox; class SubViewport; class SubViewportContainer; class VSeparator; @@ -851,16 +852,16 @@ class Node3DEditor : public VBoxContainer { Vector3 snap_point(Vector3 p_target, Vector3 p_start = Vector3(0, 0, 0)) const; - float get_znear() const { return settings_znear->get_value(); } - float get_zfar() const { return settings_zfar->get_value(); } - float get_fov() const { return settings_fov->get_value(); } + float get_znear() const; + float get_zfar() const; + float get_fov() const; Transform3D get_gizmo_transform() const { return gizmo.transform; } bool is_gizmo_visible() const; ToolMode get_tool_mode() const { return tool_mode; } - bool are_local_coords_enabled() const { return tool_option_button[Node3DEditor::TOOL_OPT_LOCAL_COORDS]->is_pressed(); } - void set_local_coords_enabled(bool on) const { tool_option_button[Node3DEditor::TOOL_OPT_LOCAL_COORDS]->set_pressed(on); } + bool are_local_coords_enabled() const; + void set_local_coords_enabled(bool p_toggled_on) const; bool is_snap_enabled() const { return snap_enabled ^ snap_key_enabled; } real_t get_translate_snap() const; real_t get_rotate_snap() const; diff --git a/editor/plugins/occluder_instance_3d_editor_plugin.cpp b/editor/plugins/occluder_instance_3d_editor_plugin.cpp index c14d9e02aa4a..ff1be8aa2088 100644 --- a/editor/plugins/occluder_instance_3d_editor_plugin.cpp +++ b/editor/plugins/occluder_instance_3d_editor_plugin.cpp @@ -33,6 +33,8 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" +#include "scene/3d/occluder_instance_3d.h" +#include "scene/gui/button.h" void OccluderInstance3DEditorPlugin::_bake_select_file(const String &p_file) { if (occluder_instance) { diff --git a/editor/plugins/occluder_instance_3d_editor_plugin.h b/editor/plugins/occluder_instance_3d_editor_plugin.h index 7920ff59c9ed..832b036bc873 100644 --- a/editor/plugins/occluder_instance_3d_editor_plugin.h +++ b/editor/plugins/occluder_instance_3d_editor_plugin.h @@ -32,10 +32,10 @@ #define OCCLUDER_INSTANCE_3D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/occluder_instance_3d.h" -#include "scene/resources/material.h" +class Button; class EditorFileDialog; +class OccluderInstance3D; class OccluderInstance3DEditorPlugin : public EditorPlugin { GDCLASS(OccluderInstance3DEditorPlugin, EditorPlugin); diff --git a/editor/plugins/parallax_background_editor_plugin.cpp b/editor/plugins/parallax_background_editor_plugin.cpp index 6c55fd27531a..6489c60b043a 100644 --- a/editor/plugins/parallax_background_editor_plugin.cpp +++ b/editor/plugins/parallax_background_editor_plugin.cpp @@ -39,6 +39,7 @@ #include "scene/2d/parallax_layer.h" #include "scene/gui/box_container.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" void ParallaxBackgroundEditorPlugin::edit(Object *p_object) { parallax_background = Object::cast_to(p_object); diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index 86dbfbba9520..bb8e4b3dca4c 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -37,8 +37,10 @@ #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/themes/editor_scale.h" +#include "scene/2d/path_2d.h" #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" void Path2DEditor::_notification(int p_what) { switch (p_what) { diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h index f45b75a968ce..17cea444c4c3 100644 --- a/editor/plugins/path_2d_editor_plugin.h +++ b/editor/plugins/path_2d_editor_plugin.h @@ -32,12 +32,12 @@ #define PATH_2D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/path_2d.h" #include "scene/gui/box_container.h" class CanvasItemEditor; class ConfirmationDialog; class MenuButton; +class Path2D; class Path2DEditor : public HBoxContainer { GDCLASS(Path2DEditor, HBoxContainer); diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp index 240206e12452..eb97655286fa 100644 --- a/editor/plugins/path_3d_editor_plugin.cpp +++ b/editor/plugins/path_3d_editor_plugin.cpp @@ -37,9 +37,12 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "node_3d_editor_plugin.h" +#include "editor/plugins/node_3d_editor_plugin.h" +#include "scene/3d/camera_3d.h" +#include "scene/3d/path_3d.h" #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/resources/curve.h" String Path3DGizmo::get_handle_name(int p_id, bool p_secondary) const { diff --git a/editor/plugins/path_3d_editor_plugin.h b/editor/plugins/path_3d_editor_plugin.h index ee73df1617a3..67473de67fd7 100644 --- a/editor/plugins/path_3d_editor_plugin.h +++ b/editor/plugins/path_3d_editor_plugin.h @@ -33,12 +33,12 @@ #include "editor/plugins/editor_plugin.h" #include "editor/plugins/node_3d_editor_gizmos.h" -#include "scene/3d/camera_3d.h" -#include "scene/3d/path_3d.h" +class Camera3D; +class ConfirmationDialog; class HBoxContainer; class MenuButton; -class ConfirmationDialog; +class Path3D; class Path3DGizmo : public EditorNode3DGizmo { GDCLASS(Path3DGizmo, EditorNode3DGizmo); diff --git a/editor/plugins/physical_bone_3d_editor_plugin.cpp b/editor/plugins/physical_bone_3d_editor_plugin.cpp index b7c12ab5c035..93f4d9ff19f5 100644 --- a/editor/plugins/physical_bone_3d_editor_plugin.cpp +++ b/editor/plugins/physical_bone_3d_editor_plugin.cpp @@ -34,7 +34,8 @@ #include "editor/editor_string_names.h" #include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/physics/physical_bone_3d.h" -#include "scene/gui/separator.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" void PhysicalBone3DEditor::_bind_methods() { } diff --git a/editor/plugins/physical_bone_3d_editor_plugin.h b/editor/plugins/physical_bone_3d_editor_plugin.h index fb6f30cc5779..b12bee489256 100644 --- a/editor/plugins/physical_bone_3d_editor_plugin.h +++ b/editor/plugins/physical_bone_3d_editor_plugin.h @@ -32,9 +32,9 @@ #define PHYSICAL_BONE_3D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/gui/box_container.h" -#include "scene/gui/button.h" +class Button; +class HBoxContainer; class PhysicalBone3D; class PhysicalBone3DEditor : public Object { diff --git a/editor/plugins/plugin_config_dialog.cpp b/editor/plugins/plugin_config_dialog.cpp index af9efda9398a..16c0867a0b12 100644 --- a/editor/plugins/plugin_config_dialog.cpp +++ b/editor/plugins/plugin_config_dialog.cpp @@ -39,7 +39,12 @@ #include "editor/plugins/editor_plugin.h" #include "editor/project_settings_editor.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" +#include "scene/gui/text_edit.h" void PluginConfigDialog::_clear_fields() { name_edit->set_text(""); diff --git a/editor/plugins/plugin_config_dialog.h b/editor/plugins/plugin_config_dialog.h index 7d6eab5e1875..9f4f746dd64c 100644 --- a/editor/plugins/plugin_config_dialog.h +++ b/editor/plugins/plugin_config_dialog.h @@ -31,16 +31,14 @@ #ifndef PLUGIN_CONFIG_DIALOG_H #define PLUGIN_CONFIG_DIALOG_H -#include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/option_button.h" -#include "scene/gui/panel_container.h" -#include "scene/gui/text_edit.h" -#include "scene/gui/texture_rect.h" +class CheckBox; class ConfigFile; class EditorValidationPanel; +class LineEdit; +class OptionButton; +class TextEdit; class PluginConfigDialog : public ConfirmationDialog { GDCLASS(PluginConfigDialog, ConfirmationDialog); diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index cd644e08ca62..e97f2c454f43 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -38,12 +38,15 @@ #include "editor/gui/editor_zoom_widget.h" #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/2d/polygon_2d.h" #include "scene/2d/skeleton_2d.h" #include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" #include "scene/gui/label.h" #include "scene/gui/menu_button.h" #include "scene/gui/panel.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/scroll_container.h" #include "scene/gui/separator.h" #include "scene/gui/slider.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h index 164aa3eccc83..748d105f9b87 100644 --- a/editor/plugins/polygon_2d_editor_plugin.h +++ b/editor/plugins/polygon_2d_editor_plugin.h @@ -41,6 +41,7 @@ class HSlider; class Label; class MenuButton; class Panel; +class Polygon2D; class ScrollContainer; class SpinBox; class TextureRect; diff --git a/editor/plugins/polygon_3d_editor_plugin.cpp b/editor/plugins/polygon_3d_editor_plugin.cpp index 56baa4a839fc..47d20320cc54 100644 --- a/editor/plugins/polygon_3d_editor_plugin.cpp +++ b/editor/plugins/polygon_3d_editor_plugin.cpp @@ -41,7 +41,10 @@ #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" +#include "scene/3d/mesh_instance_3d.h" +#include "scene/gui/button.h" #include "scene/gui/separator.h" +#include "scene/resources/immediate_mesh.h" void Polygon3DEditor::_notification(int p_what) { switch (p_what) { diff --git a/editor/plugins/polygon_3d_editor_plugin.h b/editor/plugins/polygon_3d_editor_plugin.h index f49663851586..43a2777792b2 100644 --- a/editor/plugins/polygon_3d_editor_plugin.h +++ b/editor/plugins/polygon_3d_editor_plugin.h @@ -32,13 +32,12 @@ #define POLYGON_3D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/3d/physics/collision_polygon_3d.h" #include "scene/gui/box_container.h" -#include "scene/resources/immediate_mesh.h" class CanvasItemEditor; +class ImmediateMesh; class MenuButton; +class MeshInstance3D; class Polygon3DEditor : public HBoxContainer { GDCLASS(Polygon3DEditor, HBoxContainer); diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp index ba6699fcc4c5..20a8ab64efe3 100644 --- a/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/editor/plugins/resource_preloader_editor_plugin.cpp @@ -40,6 +40,11 @@ #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/tree.h" +#include "scene/main/resource_preloader.h" void ResourcePreloaderEditor::_notification(int p_what) { switch (p_what) { diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h index 76ef2fe9a4df..3dbd2b1377d6 100644 --- a/editor/plugins/resource_preloader_editor_plugin.h +++ b/editor/plugins/resource_preloader_editor_plugin.h @@ -32,12 +32,12 @@ #define RESOURCE_PRELOADER_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/gui/dialogs.h" #include "scene/gui/panel_container.h" -#include "scene/gui/tree.h" -#include "scene/main/resource_preloader.h" +class AcceptDialog; class EditorFileDialog; +class ResourcePreloader; +class Tree; class ResourcePreloaderEditor : public PanelContainer { GDCLASS(ResourcePreloaderEditor, PanelContainer); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 80e1b17768c6..081d80259400 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -62,7 +62,16 @@ #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "editor/window_wrapper.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.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/main/node.h" +#include "scene/main/timer.h" #include "scene/main/window.h" #include "script_text_editor.h" #include "servers/display_server.h" diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index ef88bc107b07..b25ed89391af 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -33,6 +33,7 @@ #include "core/object/script_language.h" #include "editor/plugins/editor_plugin.h" +#include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" #include "scene/gui/panel_container.h" #include "scene/resources/syntax_highlighter.h" @@ -47,6 +48,7 @@ class ItemList; class MenuButton; class TabContainer; class TextureRect; +class Timer; class Tree; class VSplitContainer; class WindowWrapper; diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 070471f3f3ec..67131b62135a 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -40,8 +40,14 @@ #include "editor/editor_string_names.h" #include "editor/gui/editor_toaster.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/code_edit.h" +#include "scene/gui/color_picker.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/split_container.h" +#include "scene/gui/tree.h" void ConnectionInfoDialog::ok_pressed() { } diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h index 8c2ec1561b3c..68f675df34b4 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/plugins/script_text_editor.h @@ -34,11 +34,12 @@ #include "script_editor_plugin.h" #include "editor/code_editor.h" -#include "scene/gui/color_picker.h" #include "scene/gui/dialogs.h" -#include "scene/gui/tree.h" +class ColorPicker; +class PopupPanel; class RichTextLabel; +class Tree; class ConnectionInfoDialog : public AcceptDialog { GDCLASS(ConnectionInfoDialog, AcceptDialog); diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index 72d1c1753efb..f5e2a732d26e 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -43,6 +43,11 @@ #include "editor/themes/editor_scale.h" #include "editor/window_wrapper.h" #include "scene/gui/item_list.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/split_container.h" +#include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" void ShaderEditorPlugin::_update_shader_list() { diff --git a/editor/plugins/shader_file_editor_plugin.cpp b/editor/plugins/shader_file_editor_plugin.cpp index 05919fb0f657..68c7a579b6c6 100644 --- a/editor/plugins/shader_file_editor_plugin.cpp +++ b/editor/plugins/shader_file_editor_plugin.cpp @@ -39,7 +39,9 @@ #include "editor/editor_string_names.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" #include "scene/gui/item_list.h" +#include "scene/gui/rich_text_label.h" #include "scene/gui/split_container.h" #include "servers/display_server.h" #include "servers/rendering/shader_types.h" diff --git a/editor/plugins/shader_file_editor_plugin.h b/editor/plugins/shader_file_editor_plugin.h index 9a915513ef9e..6f98d971e345 100644 --- a/editor/plugins/shader_file_editor_plugin.h +++ b/editor/plugins/shader_file_editor_plugin.h @@ -33,15 +33,11 @@ #include "editor/code_editor.h" #include "editor/plugins/editor_plugin.h" -#include "scene/gui/menu_button.h" #include "scene/gui/panel_container.h" -#include "scene/gui/rich_text_label.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/text_edit.h" -#include "scene/main/timer.h" #include "servers/rendering/rendering_device_binds.h" class ItemList; +class RichTextLabel; class ShaderFileEditor : public PanelContainer { GDCLASS(ShaderFileEditor, PanelContainer); diff --git a/editor/plugins/skeleton_2d_editor_plugin.cpp b/editor/plugins/skeleton_2d_editor_plugin.cpp index 8308fe6d6ef4..c1a06ac5c6c8 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.cpp +++ b/editor/plugins/skeleton_2d_editor_plugin.cpp @@ -35,8 +35,10 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/plugins/canvas_item_editor_plugin.h" #include "scene/2d/mesh_instance_2d.h" +#include "scene/2d/skeleton_2d.h" #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" void Skeleton2DEditor::_node_removed(Node *p_node) { if (p_node == node) { diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/plugins/skeleton_2d_editor_plugin.h index 74fd59f1c416..b1c8a5b085b8 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.h +++ b/editor/plugins/skeleton_2d_editor_plugin.h @@ -32,10 +32,10 @@ #define SKELETON_2D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/skeleton_2d.h" class AcceptDialog; class MenuButton; +class Skeleton2D; class Skeleton2DEditor : public Control { GDCLASS(Skeleton2DEditor, Control); diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp index b340dd976e00..2c53d2137354 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.cpp +++ b/editor/plugins/skeleton_3d_editor_plugin.cpp @@ -40,14 +40,21 @@ #include "editor/plugins/animation_player_editor_plugin.h" #include "editor/plugins/node_3d_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/3d/camera_3d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/physics/collision_shape_3d.h" #include "scene/3d/physics/joints/joint_3d.h" #include "scene/3d/physics/physical_bone_3d.h" #include "scene/3d/physics/physics_body_3d.h" +#include "scene/3d/skeleton_3d.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" #include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" #include "scene/resources/3d/capsule_shape_3d.h" +#include "scene/resources/immediate_mesh.h" #include "scene/resources/skeleton_profile.h" #include "scene/resources/surface_tool.h" diff --git a/editor/plugins/skeleton_3d_editor_plugin.h b/editor/plugins/skeleton_3d_editor_plugin.h index 79dc16ae2f6e..3af38facc613 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.h +++ b/editor/plugins/skeleton_3d_editor_plugin.h @@ -34,11 +34,8 @@ #include "editor/editor_properties.h" #include "editor/gui/editor_file_dialog.h" #include "editor/plugins/editor_plugin.h" +#include "editor/plugins/node_3d_editor_gizmos.h" #include "editor/plugins/node_3d_editor_plugin.h" -#include "scene/3d/camera_3d.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/3d/skeleton_3d.h" -#include "scene/resources/immediate_mesh.h" class EditorInspectorPluginSkeleton; class EditorPropertyVector3; @@ -46,6 +43,10 @@ class Joint; class PhysicalBone3D; class Skeleton3DEditorPlugin; class Button; +class Camera3D; +class ImmediateMesh; +class MeshInstance3D; +class Skeleton3D; class Tree; class TreeItem; class VSeparator; diff --git a/editor/plugins/sprite_2d_editor_plugin.cpp b/editor/plugins/sprite_2d_editor_plugin.cpp index 3647fa2d5967..989f4d4385c2 100644 --- a/editor/plugins/sprite_2d_editor_plugin.cpp +++ b/editor/plugins/sprite_2d_editor_plugin.cpp @@ -42,10 +42,16 @@ #include "scene/2d/mesh_instance_2d.h" #include "scene/2d/physics/collision_polygon_2d.h" #include "scene/2d/polygon_2d.h" +#include "scene/2d/sprite_2d.h" #include "scene/gui/box_container.h" +#include "scene/gui/label.h" #include "scene/gui/menu_button.h" #include "scene/gui/panel.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/spin_box.h" #include "scene/gui/view_panner.h" +#include "scene/resources/bit_map.h" #include "thirdparty/clipper2/include/clipper2/clipper.h" #define PRECISION 1 diff --git a/editor/plugins/sprite_2d_editor_plugin.h b/editor/plugins/sprite_2d_editor_plugin.h index 7cbde7708189..cd7308ef9752 100644 --- a/editor/plugins/sprite_2d_editor_plugin.h +++ b/editor/plugins/sprite_2d_editor_plugin.h @@ -32,15 +32,17 @@ #define SPRITE_2D_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/sprite_2d.h" -#include "scene/gui/spin_box.h" class AcceptDialog; class ConfirmationDialog; class EditorZoomWidget; +class HScrollBar; class MenuButton; class Panel; +class SpinBox; +class Sprite2D; class ViewPanner; +class VScrollBar; class Sprite2DEditor : public Control { GDCLASS(Sprite2DEditor, Control); diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 48087e3166aa..ed6e50a9e0ef 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -43,13 +43,25 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/scene_tree_dock.h" #include "editor/themes/editor_scale.h" +#include "scene/2d/animated_sprite_2d.h" +#include "scene/3d/sprite_3d.h" +#include "scene/gui/button.h" #include "scene/gui/center_container.h" +#include "scene/gui/dialogs.h" #include "scene/gui/flow_container.h" +#include "scene/gui/item_list.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" #include "scene/gui/option_button.h" #include "scene/gui/panel_container.h" +#include "scene/gui/scroll_container.h" #include "scene/gui/separator.h" +#include "scene/gui/spin_box.h" +#include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" #include "scene/resources/atlas_texture.h" +#include "scene/resources/image_texture.h" static void _draw_shadowed_line(Control *p_control, const Point2 &p_from, const Size2 &p_size, const Size2 &p_shadow_offset, Color p_color, Color p_shadow_color) { p_control->draw_line(p_from, p_from + p_size, p_color); @@ -1772,6 +1784,8 @@ void SpriteFramesEditor::_node_removed(Node *p_node) { } SpriteFramesEditor::SpriteFramesEditor() { + empty_icon = Ref(memnew(ImageTexture)); + VBoxContainer *vbc_animlist = memnew(VBoxContainer); add_child(vbc_animlist); vbc_animlist->set_custom_minimum_size(Size2(150, 0) * EDSCALE); diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h index 9b6aaf98fe0c..94c450657dd8 100644 --- a/editor/plugins/sprite_frames_editor_plugin.h +++ b/editor/plugins/sprite_frames_editor_plugin.h @@ -32,22 +32,22 @@ #define SPRITE_FRAMES_EDITOR_PLUGIN_H #include "editor/plugins/editor_plugin.h" -#include "scene/2d/animated_sprite_2d.h" -#include "scene/3d/sprite_3d.h" -#include "scene/gui/button.h" -#include "scene/gui/check_button.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/scroll_container.h" -#include "scene/gui/spin_box.h" #include "scene/gui/split_container.h" -#include "scene/gui/texture_rect.h" -#include "scene/gui/tree.h" -#include "scene/resources/image_texture.h" -class OptionButton; +class AcceptDialog; +class Button; +class ConfirmationDialog; class EditorFileDialog; +class HBoxContainer; +class ItemList; +class LineEdit; +class OptionButton; +class ScrollContainer; +class SpinBox; +class SpriteFrames; +class TextureRect; +class Tree; +class VBoxContainer; class ClipboardSpriteFrames : public Resource { GDCLASS(ClipboardSpriteFrames, Resource); @@ -94,7 +94,7 @@ class SpriteFramesEditor : public HSplitContainer { Ref autoplay_icon; Ref stop_icon; Ref pause_icon; - Ref empty_icon = memnew(ImageTexture); + Ref empty_icon; HBoxContainer *playback_container = nullptr; Button *stop = nullptr; diff --git a/editor/plugins/sub_viewport_preview_editor_plugin.cpp b/editor/plugins/sub_viewport_preview_editor_plugin.cpp index abf4ababe996..479d58cf47bb 100644 --- a/editor/plugins/sub_viewport_preview_editor_plugin.cpp +++ b/editor/plugins/sub_viewport_preview_editor_plugin.cpp @@ -30,6 +30,8 @@ #include "sub_viewport_preview_editor_plugin.h" +#include "scene/main/viewport.h" + bool EditorInspectorPluginSubViewportPreview::can_handle(Object *p_object) { return Object::cast_to(p_object) != nullptr; } diff --git a/editor/plugins/sub_viewport_preview_editor_plugin.h b/editor/plugins/sub_viewport_preview_editor_plugin.h index d05e90b61e46..ab4adfe70728 100644 --- a/editor/plugins/sub_viewport_preview_editor_plugin.h +++ b/editor/plugins/sub_viewport_preview_editor_plugin.h @@ -33,7 +33,6 @@ #include "editor/plugins/editor_plugin.h" #include "editor/plugins/texture_editor_plugin.h" -#include "scene/main/viewport.h" class EditorInspectorPluginSubViewportPreview : public EditorInspectorPluginTexture { GDCLASS(EditorInspectorPluginSubViewportPreview, EditorInspectorPluginTexture); diff --git a/editor/plugins/text_editor.cpp b/editor/plugins/text_editor.cpp index ecdc4acf47c3..700be56bd096 100644 --- a/editor/plugins/text_editor.cpp +++ b/editor/plugins/text_editor.cpp @@ -34,7 +34,9 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" +#include "scene/gui/code_edit.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" void TextEditor::add_syntax_highlighter(Ref p_highlighter) { ERR_FAIL_COND(p_highlighter.is_null()); diff --git a/editor/plugins/text_shader_editor.cpp b/editor/plugins/text_shader_editor.cpp index 276c57533f72..6cbe30b30718 100644 --- a/editor/plugins/text_shader_editor.cpp +++ b/editor/plugins/text_shader_editor.cpp @@ -38,6 +38,11 @@ #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/gui/code_edit.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/rich_text_label.h" #include "scene/gui/split_container.h" #include "servers/rendering/shader_preprocessor.h" #include "servers/rendering/shader_types.h" diff --git a/editor/plugins/text_shader_editor.h b/editor/plugins/text_shader_editor.h index 61066ed7c651..5010565b1a88 100644 --- a/editor/plugins/text_shader_editor.h +++ b/editor/plugins/text_shader_editor.h @@ -33,10 +33,13 @@ #include "editor/code_editor.h" #include "scene/gui/margin_container.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/rich_text_label.h" +#include "scene/resources/syntax_highlighter.h" #include "servers/rendering/shader_warnings.h" +class MenuButton; +class PopupMenu; +class RichTextLabel; + class GDShaderSyntaxHighlighter : public CodeHighlighter { GDCLASS(GDShaderSyntaxHighlighter, CodeHighlighter) diff --git a/editor/plugins/texture_3d_editor_plugin.cpp b/editor/plugins/texture_3d_editor_plugin.cpp index fa90e982febf..3edda07605f7 100644 --- a/editor/plugins/texture_3d_editor_plugin.cpp +++ b/editor/plugins/texture_3d_editor_plugin.cpp @@ -31,6 +31,8 @@ #include "texture_3d_editor_plugin.h" #include "scene/gui/label.h" +#include "scene/gui/spin_box.h" +#include "scene/resources/shader.h" void Texture3DEditor::_texture_rect_draw() { texture_rect->draw_rect(Rect2(Point2(), texture_rect->get_size()), Color(1, 1, 1, 1)); diff --git a/editor/plugins/texture_3d_editor_plugin.h b/editor/plugins/texture_3d_editor_plugin.h index 7a33a97a8f8c..a86b681d2392 100644 --- a/editor/plugins/texture_3d_editor_plugin.h +++ b/editor/plugins/texture_3d_editor_plugin.h @@ -33,9 +33,10 @@ #include "editor/editor_inspector.h" #include "editor/plugins/editor_plugin.h" -#include "scene/gui/spin_box.h" -#include "scene/resources/shader.h" -#include "scene/resources/texture.h" + +class SpinBox; +class Shader; +class ShaderMaterial; class Texture3DEditor : public Control { GDCLASS(Texture3DEditor, Control); diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h index ea31429238ef..8535c6ce7076 100644 --- a/editor/plugins/texture_editor_plugin.h +++ b/editor/plugins/texture_editor_plugin.h @@ -34,8 +34,8 @@ #include "editor/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/margin_container.h" -#include "scene/resources/texture.h" +class Texture2D; class TextureRect; class TexturePreview : public MarginContainer { diff --git a/editor/plugins/texture_layered_editor_plugin.cpp b/editor/plugins/texture_layered_editor_plugin.cpp index 4ec9c91cf9a8..0994fa4f9edb 100644 --- a/editor/plugins/texture_layered_editor_plugin.cpp +++ b/editor/plugins/texture_layered_editor_plugin.cpp @@ -31,6 +31,9 @@ #include "texture_layered_editor_plugin.h" #include "scene/gui/label.h" +#include "scene/gui/spin_box.h" +#include "scene/resources/shader.h" +#include "scene/resources/texture.h" void TextureLayeredEditor::gui_input(const Ref &p_event) { ERR_FAIL_COND(p_event.is_null()); diff --git a/editor/plugins/texture_layered_editor_plugin.h b/editor/plugins/texture_layered_editor_plugin.h index 83729f922ef0..7d6207f2e780 100644 --- a/editor/plugins/texture_layered_editor_plugin.h +++ b/editor/plugins/texture_layered_editor_plugin.h @@ -33,9 +33,10 @@ #include "editor/editor_inspector.h" #include "editor/plugins/editor_plugin.h" -#include "scene/gui/spin_box.h" -#include "scene/resources/shader.h" -#include "scene/resources/texture.h" + +class Shader; +class SpinBox; +class TextureLayered; class TextureLayeredEditor : public Control { GDCLASS(TextureLayeredEditor, Control); diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index a8126334809c..e5b7c3ce870d 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -39,9 +39,12 @@ #include "editor/themes/editor_scale.h" #include "scene/2d/sprite_2d.h" #include "scene/3d/sprite_3d.h" +#include "scene/gui/label.h" #include "scene/gui/nine_patch_rect.h" #include "scene/gui/option_button.h" +#include "scene/gui/panel.h" #include "scene/gui/panel_container.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" #include "scene/gui/view_panner.h" diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index 99635a25319c..845e7a566f21 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -45,13 +45,17 @@ #include "scene/gui/check_button.h" #include "scene/gui/color_picker.h" #include "scene/gui/item_list.h" +#include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/gui/panel_container.h" #include "scene/gui/scroll_container.h" +#include "scene/gui/separator.h" +#include "scene/gui/spin_box.h" #include "scene/gui/split_container.h" #include "scene/gui/tab_bar.h" #include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" +#include "scene/main/timer.h" #include "scene/theme/theme_db.h" void ThemeItemImportTree::_update_items_tree() { diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h index ba8e3a30b7ae..bf09f368a16e 100644 --- a/editor/plugins/theme_editor_plugin.h +++ b/editor/plugins/theme_editor_plugin.h @@ -34,6 +34,7 @@ #include "editor/plugins/editor_plugin.h" #include "editor/plugins/theme_editor_preview.h" #include "scene/gui/dialogs.h" +#include "scene/gui/label.h" #include "scene/gui/margin_container.h" #include "scene/gui/tree.h" #include "scene/resources/theme.h" @@ -42,7 +43,6 @@ class Button; class CheckButton; class EditorFileDialog; class ItemList; -class Label; class OptionButton; class PanelContainer; class TabBar; diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp index 4d98b24ccc0f..e3db6eb9c06c 100644 --- a/editor/plugins/theme_editor_preview.cpp +++ b/editor/plugins/theme_editor_preview.cpp @@ -41,9 +41,19 @@ #include "scene/gui/check_button.h" #include "scene/gui/color_picker.h" #include "scene/gui/color_rect.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/progress_bar.h" +#include "scene/gui/scroll_bar.h" #include "scene/gui/scroll_container.h" +#include "scene/gui/separator.h" +#include "scene/gui/slider.h" +#include "scene/gui/spin_box.h" #include "scene/gui/tab_container.h" #include "scene/gui/text_edit.h" #include "scene/gui/tree.h" diff --git a/editor/plugins/tiles/atlas_merging_dialog.cpp b/editor/plugins/tiles/atlas_merging_dialog.cpp index e25005f9968a..0ae25ca82263 100644 --- a/editor/plugins/tiles/atlas_merging_dialog.cpp +++ b/editor/plugins/tiles/atlas_merging_dialog.cpp @@ -34,8 +34,11 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/control.h" +#include "scene/gui/button.h" +#include "scene/gui/item_list.h" +#include "scene/gui/label.h" #include "scene/gui/split_container.h" +#include "scene/gui/texture_rect.h" #include "scene/resources/image_texture.h" void AtlasMergingDialog::_property_changed(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing) { diff --git a/editor/plugins/tiles/atlas_merging_dialog.h b/editor/plugins/tiles/atlas_merging_dialog.h index 83389c2e2953..0b95086ec88c 100644 --- a/editor/plugins/tiles/atlas_merging_dialog.h +++ b/editor/plugins/tiles/atlas_merging_dialog.h @@ -33,12 +33,12 @@ #include "editor/editor_properties.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/texture_rect.h" #include "scene/resources/2d/tile_set.h" class EditorFileDialog; class EditorPropertyVector2i; +class ItemList; +class TextureRect; class AtlasMergingDialog : public ConfirmationDialog { GDCLASS(AtlasMergingDialog, ConfirmationDialog); diff --git a/editor/plugins/tiles/tile_atlas_view.cpp b/editor/plugins/tiles/tile_atlas_view.cpp index b806d1e0429b..7d9a562ebac6 100644 --- a/editor/plugins/tiles/tile_atlas_view.cpp +++ b/editor/plugins/tiles/tile_atlas_view.cpp @@ -33,10 +33,13 @@ #include "core/input/input.h" #include "core/os/keyboard.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_zoom_widget.h" #include "editor/themes/editor_scale.h" #include "scene/2d/tile_map.h" -#include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/center_container.h" #include "scene/gui/label.h" +#include "scene/gui/margin_container.h" #include "scene/gui/panel.h" #include "scene/gui/view_panner.h" diff --git a/editor/plugins/tiles/tile_atlas_view.h b/editor/plugins/tiles/tile_atlas_view.h index 8fcf942056c4..dcdba8f27870 100644 --- a/editor/plugins/tiles/tile_atlas_view.h +++ b/editor/plugins/tiles/tile_atlas_view.h @@ -31,14 +31,15 @@ #ifndef TILE_ATLAS_VIEW_H #define TILE_ATLAS_VIEW_H -#include "editor/gui/editor_zoom_widget.h" -#include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/center_container.h" -#include "scene/gui/label.h" -#include "scene/gui/margin_container.h" +#include "scene/gui/control.h" #include "scene/resources/2d/tile_set.h" +class Button; +class CenterContainer; +class EditorZoomWidget; +class HBoxContainer; +class Label; +class MarginContainer; class ViewPanner; class TileAtlasView : public Control { diff --git a/editor/plugins/tiles/tile_data_editors.cpp b/editor/plugins/tiles/tile_data_editors.cpp index 03177b7d2912..75f5ca6dadc2 100644 --- a/editor/plugins/tiles/tile_data_editors.cpp +++ b/editor/plugins/tiles/tile_data_editors.cpp @@ -40,15 +40,16 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_zoom_widget.h" #include "editor/themes/editor_scale.h" - -#include "scene/gui/control.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" +#include "scene/gui/panel.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" - #include "servers/navigation_server_2d.h" void TileDataEditor::_tile_set_changed_plan_update() { diff --git a/editor/plugins/tiles/tile_data_editors.h b/editor/plugins/tiles/tile_data_editors.h index 9b1eadf3317d..a4f52cb1f2e9 100644 --- a/editor/plugins/tiles/tile_data_editors.h +++ b/editor/plugins/tiles/tile_data_editors.h @@ -36,8 +36,8 @@ #include "editor/editor_properties.h" #include "scene/2d/tile_map.h" #include "scene/gui/box_container.h" -#include "scene/gui/panel_container.h" +class ButtonGroup; class Label; class MenuButton; class SpinBox; diff --git a/editor/plugins/tiles/tile_map_layer_editor.cpp b/editor/plugins/tiles/tile_map_layer_editor.cpp index fbf88cc472af..cd6e86a2d030 100644 --- a/editor/plugins/tiles/tile_map_layer_editor.cpp +++ b/editor/plugins/tiles/tile_map_layer_editor.cpp @@ -32,6 +32,9 @@ #include "tiles_editor_plugin.h" +#include "core/input/input.h" +#include "core/math/geometry_2d.h" +#include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_resource_preview.h" #include "editor/editor_settings.h" @@ -41,12 +44,18 @@ #include "editor/themes/editor_scale.h" #include "scene/2d/camera_2d.h" #include "scene/2d/tile_map_layer.h" -#include "scene/gui/center_container.h" -#include "scene/gui/split_container.h" - -#include "core/input/input.h" -#include "core/math/geometry_2d.h" -#include "core/os/keyboard.h" +#include "scene/gui/check_box.h" +#include "scene/gui/flow_container.h" +#include "scene/gui/item_list.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/separator.h" +#include "scene/gui/spin_box.h" +#include "scene/gui/tab_bar.h" +#include "scene/gui/tree.h" TileMapLayer *TileMapLayerSubEditorPlugin::_get_edited_layer() const { return Object::cast_to(ObjectDB::get_instance(edited_tile_map_layer_id)); diff --git a/editor/plugins/tiles/tile_map_layer_editor.h b/editor/plugins/tiles/tile_map_layer_editor.h index 7d749be1bacd..c9476a83817d 100644 --- a/editor/plugins/tiles/tile_map_layer_editor.h +++ b/editor/plugins/tiles/tile_map_layer_editor.h @@ -37,18 +37,20 @@ #include "core/typedefs.h" #include "scene/2d/tile_map.h" #include "scene/gui/box_container.h" -#include "scene/gui/check_box.h" -#include "scene/gui/flow_container.h" -#include "scene/gui/item_list.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/option_button.h" -#include "scene/gui/separator.h" -#include "scene/gui/spin_box.h" -#include "scene/gui/split_container.h" -#include "scene/gui/tab_bar.h" -#include "scene/gui/tree.h" +class BaseButton; +class ButtonGroup; +class CheckBox; +class HFlowContainer; +class HSplitContainer; +class ItemList; +class MenuButton; +class OptionButton; +class SpinBox; +class TabBar; class TileMapLayerEditor; +class Tree; +class VSeparator; class TileMapLayerSubEditorPlugin : public Object { protected: diff --git a/editor/plugins/tiles/tile_proxies_manager_dialog.cpp b/editor/plugins/tiles/tile_proxies_manager_dialog.cpp index 35e64899fbc0..2e6e275497c6 100644 --- a/editor/plugins/tiles/tile_proxies_manager_dialog.cpp +++ b/editor/plugins/tiles/tile_proxies_manager_dialog.cpp @@ -34,7 +34,9 @@ #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/dialogs.h" +#include "scene/gui/button.h" +#include "scene/gui/item_list.h" +#include "scene/gui/label.h" #include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" diff --git a/editor/plugins/tiles/tile_proxies_manager_dialog.h b/editor/plugins/tiles/tile_proxies_manager_dialog.h index 357eefcb1558..9de49ffae8bb 100644 --- a/editor/plugins/tiles/tile_proxies_manager_dialog.h +++ b/editor/plugins/tiles/tile_proxies_manager_dialog.h @@ -34,10 +34,10 @@ #include "editor/editor_properties.h" #include "scene/2d/tile_map.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" class EditorPropertyVector2i; class EditorUndoRedoManager; +class ItemList; class TileProxiesManagerDialog : public ConfirmationDialog { GDCLASS(TileProxiesManagerDialog, ConfirmationDialog); diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp b/editor/plugins/tiles/tile_set_atlas_source_editor.cpp index 7e34a36a6e1d..a9bb6f61e7f8 100644 --- a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp +++ b/editor/plugins/tiles/tile_set_atlas_source_editor.cpp @@ -32,6 +32,8 @@ #include "tiles_editor_plugin.h" +#include "core/math/geometry_2d.h" +#include "core/os/keyboard.h" #include "editor/editor_inspector.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" @@ -41,18 +43,15 @@ #include "editor/plugins/tiles/tile_set_editor.h" #include "editor/progress_dialog.h" #include "editor/themes/editor_scale.h" - #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/control.h" #include "scene/gui/item_list.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" -#include "scene/gui/split_container.h" #include "scene/gui/tab_container.h" - -#include "core/math/geometry_2d.h" -#include "core/os/keyboard.h" - +#include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" #include "servers/navigation_server_2d.h" void TileSetAtlasSourceEditor::TileSetAtlasSourceProxyObject::set_id(int p_id) { diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.h b/editor/plugins/tiles/tile_set_atlas_source_editor.h index 957f768429f7..dca539029bd6 100644 --- a/editor/plugins/tiles/tile_set_atlas_source_editor.h +++ b/editor/plugins/tiles/tile_set_atlas_source_editor.h @@ -37,6 +37,7 @@ #include "scene/gui/split_container.h" #include "scene/resources/2d/tile_set.h" +class ButtonGroup; class Popup; class TileSet; class Tree; diff --git a/editor/plugins/tiles/tile_set_editor.cpp b/editor/plugins/tiles/tile_set_editor.cpp index 263e9cfa3b4a..fb51859e3570 100644 --- a/editor/plugins/tiles/tile_set_editor.cpp +++ b/editor/plugins/tiles/tile_set_editor.cpp @@ -40,11 +40,16 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" - #include "scene/gui/box_container.h" #include "scene/gui/control.h" #include "scene/gui/dialogs.h" -#include "scene/gui/tab_container.h" +#include "scene/gui/item_list.h" +#include "scene/gui/label.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/panel_container.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/spin_box.h" +#include "scene/gui/tab_bar.h" TileSetEditor *TileSetEditor::singleton = nullptr; diff --git a/editor/plugins/tiles/tile_set_editor.h b/editor/plugins/tiles/tile_set_editor.h index 106be5acbdde..b4e41cdef624 100644 --- a/editor/plugins/tiles/tile_set_editor.h +++ b/editor/plugins/tiles/tile_set_editor.h @@ -32,18 +32,18 @@ #define TILE_SET_EDITOR_H #include "atlas_merging_dialog.h" -#include "scene/gui/tab_bar.h" #include "scene/resources/2d/tile_set.h" #include "tile_proxies_manager_dialog.h" #include "tile_set_atlas_source_editor.h" #include "tile_set_scenes_collection_source_editor.h" class AcceptDialog; -class SpinBox; -class HBoxContainer; -class SplitContainer; class EditorFileDialog; class EditorInspectorPlugin; +class HBoxContainer; +class SpinBox; +class SplitContainer; +class TabBar; class TileSetEditor : public Control { GDCLASS(TileSetEditor, Control); diff --git a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp index 22ef779b8d90..62d13571abf3 100644 --- a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp +++ b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp @@ -38,7 +38,6 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/plugins/tiles/tile_set_editor.h" #include "editor/themes/editor_scale.h" - #include "scene/gui/button.h" #include "scene/gui/item_list.h" #include "scene/gui/label.h" diff --git a/editor/plugins/tiles/tiles_editor_plugin.cpp b/editor/plugins/tiles/tiles_editor_plugin.cpp index 3213c290fd1f..c1b0919b093b 100644 --- a/editor/plugins/tiles/tiles_editor_plugin.cpp +++ b/editor/plugins/tiles/tiles_editor_plugin.cpp @@ -33,7 +33,6 @@ #include "tile_set_editor.h" #include "core/os/mutex.h" - #include "editor/editor_command_palette.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" @@ -45,9 +44,9 @@ #include "editor/themes/editor_scale.h" #include "scene/2d/tile_map.h" #include "scene/2d/tile_map_layer.h" -#include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/control.h" +#include "scene/gui/item_list.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" #include "scene/resources/2d/tile_set.h" #include "scene/resources/image_texture.h" diff --git a/editor/plugins/tiles/tiles_editor_plugin.h b/editor/plugins/tiles/tiles_editor_plugin.h index f1da9e31faf4..b514f11c5ca6 100644 --- a/editor/plugins/tiles/tiles_editor_plugin.h +++ b/editor/plugins/tiles/tiles_editor_plugin.h @@ -31,13 +31,13 @@ #ifndef TILES_EDITOR_PLUGIN_H #define TILES_EDITOR_PLUGIN_H -#include "editor/plugins/editor_plugin.h" -#include "scene/gui/box_container.h" - #include "tile_atlas_view.h" #include "tile_map_layer_editor.h" #include "tile_set_editor.h" +#include "editor/plugins/editor_plugin.h" +#include "scene/gui/box_container.h" + class TilesEditorUtils : public Object { GDCLASS(TilesEditorUtils, Object); diff --git a/editor/plugins/version_control_editor_plugin.cpp b/editor/plugins/version_control_editor_plugin.cpp index 071be1369254..d2719b43d20f 100644 --- a/editor/plugins/version_control_editor_plugin.cpp +++ b/editor/plugins/version_control_editor_plugin.cpp @@ -44,7 +44,16 @@ #include "editor/gui/editor_bottom_panel.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/check_button.h" +#include "scene/gui/file_dialog.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/rich_text_label.h" #include "scene/gui/separator.h" +#include "scene/gui/text_edit.h" #define CHECK_PLUGIN_INITIALIZED() \ ERR_FAIL_NULL_MSG(EditorVCSInterface::get_singleton(), "No VCS plugin is initialized. Select a Version Control Plugin from Project menu."); diff --git a/editor/plugins/version_control_editor_plugin.h b/editor/plugins/version_control_editor_plugin.h index 4e60cb0a8430..9c6591d9e70a 100644 --- a/editor/plugins/version_control_editor_plugin.h +++ b/editor/plugins/version_control_editor_plugin.h @@ -33,14 +33,19 @@ #include "editor/editor_vcs_interface.h" #include "editor/plugins/editor_plugin.h" -#include "scene/gui/check_button.h" -#include "scene/gui/container.h" -#include "scene/gui/file_dialog.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/rich_text_label.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/text_edit.h" -#include "scene/gui/tree.h" + +class AcceptDialog; +class CheckButton; +class ConfirmationDialog; +class FileDialog; +class LineEdit; +class MenuButton; +class OptionButton; +class RichTextLabel; +class TextEdit; +class Tree; +class TreeItem; +class VBoxContainer; class VersionControlEditorPlugin : public EditorPlugin { GDCLASS(VersionControlEditorPlugin, EditorPlugin) diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index b2f09fff4769..45da30f42edd 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -51,11 +51,16 @@ #include "scene/gui/code_edit.h" #include "scene/gui/color_picker.h" #include "scene/gui/graph_edit.h" +#include "scene/gui/graph_frame.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/popup.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/separator.h" +#include "scene/gui/texture_button.h" #include "scene/gui/tree.h" #include "scene/gui/view_panner.h" #include "scene/main/window.h" diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h index a9826fd61780..fde533ab7b8c 100644 --- a/editor/plugins/visual_shader_editor_plugin.h +++ b/editor/plugins/visual_shader_editor_plugin.h @@ -35,6 +35,7 @@ #include "editor/plugins/editor_plugin.h" #include "editor/plugins/editor_resource_conversion_plugin.h" #include "scene/gui/graph_edit.h" +#include "scene/gui/graph_node.h" #include "scene/resources/syntax_highlighter.h" #include "scene/resources/visual_shader.h" diff --git a/editor/plugins/voxel_gi_editor_plugin.cpp b/editor/plugins/voxel_gi_editor_plugin.cpp index e7b2435567c1..c175e8d81ecc 100644 --- a/editor/plugins/voxel_gi_editor_plugin.cpp +++ b/editor/plugins/voxel_gi_editor_plugin.cpp @@ -34,6 +34,8 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" void VoxelGIEditorPlugin::_bake() { if (voxel_gi) { diff --git a/editor/progress_dialog.cpp b/editor/progress_dialog.cpp index 2f345e516161..4c197cf9f025 100644 --- a/editor/progress_dialog.cpp +++ b/editor/progress_dialog.cpp @@ -35,6 +35,9 @@ #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" #include "main/main.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" +#include "scene/gui/progress_bar.h" #include "servers/display_server.h" void BackgroundProgress::_add_task(const String &p_task, const String &p_label, int p_steps) { diff --git a/editor/progress_dialog.h b/editor/progress_dialog.h index 355812b0b7a6..26a5a5e74f25 100644 --- a/editor/progress_dialog.h +++ b/editor/progress_dialog.h @@ -32,10 +32,11 @@ #define PROGRESS_DIALOG_H #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/label.h" #include "scene/gui/popup.h" -#include "scene/gui/progress_bar.h" + +class Button; +class Label; +class ProgressBar; class BackgroundProgress : public HBoxContainer { GDCLASS(BackgroundProgress, HBoxContainer); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 60327e66fabc..9b70381f28e9 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -57,12 +57,16 @@ #include "main/main.h" #include "scene/gui/check_box.h" #include "scene/gui/color_rect.h" +#include "scene/gui/dialogs.h" #include "scene/gui/flow_container.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" #include "scene/gui/option_button.h" +#include "scene/gui/panel.h" #include "scene/gui/panel_container.h" #include "scene/gui/rich_text_label.h" +#include "scene/gui/scroll_container.h" #include "scene/gui/separator.h" #include "scene/gui/texture_rect.h" #include "scene/main/window.h" diff --git a/editor/project_manager.h b/editor/project_manager.h index 669b5d8b6c57..9fa0e31c23b6 100644 --- a/editor/project_manager.h +++ b/editor/project_manager.h @@ -31,14 +31,18 @@ #ifndef PROJECT_MANAGER_H #define PROJECT_MANAGER_H -#include "scene/gui/dialogs.h" -#include "scene/gui/scroll_container.h" +#include "scene/gui/control.h" +class AcceptDialog; +class Button; +class ButtonGroup; class CheckBox; +class ConfirmationDialog; class EditorAbout; class EditorAssetLibrary; class EditorFileDialog; class EditorTitleBar; +class HBoxContainer; class HFlowContainer; class LineEdit; class LinkButton; diff --git a/editor/project_manager/project_dialog.cpp b/editor/project_manager/project_dialog.cpp index afbb223eb5ef..ce7389b3ea4f 100644 --- a/editor/project_manager/project_dialog.cpp +++ b/editor/project_manager/project_dialog.cpp @@ -40,8 +40,10 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_icons.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/gui/separator.h" diff --git a/editor/project_manager/project_dialog.h b/editor/project_manager/project_dialog.h index b985492f8475..559147e7c94b 100644 --- a/editor/project_manager/project_dialog.h +++ b/editor/project_manager/project_dialog.h @@ -34,11 +34,13 @@ #include "scene/gui/dialogs.h" class Button; +class ButtonGroup; class CheckButton; class EditorFileDialog; class LineEdit; class OptionButton; class TextureRect; +class VBoxContainer; class ProjectDialog : public ConfirmationDialog { GDCLASS(ProjectDialog, ConfirmationDialog); diff --git a/editor/project_manager/quick_settings_dialog.cpp b/editor/project_manager/quick_settings_dialog.cpp index a98d9073b011..debb4253fbfc 100644 --- a/editor/project_manager/quick_settings_dialog.cpp +++ b/editor/project_manager/quick_settings_dialog.cpp @@ -41,6 +41,7 @@ #include "scene/gui/margin_container.h" #include "scene/gui/option_button.h" #include "scene/gui/panel_container.h" +#include "scene/gui/popup_menu.h" void QuickSettingsDialog::_fetch_setting_values() { #ifndef ANDROID_ENABLED diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index bdf4e41c5f8c..3e61a77536f4 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -39,6 +39,13 @@ #include "editor/export/editor_export.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_button.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel_container.h" +#include "scene/gui/tab_container.h" +#include "scene/gui/texture_rect.h" +#include "scene/main/timer.h" #include "servers/movie_writer/movie_writer.h" ProjectSettingsEditor *ProjectSettingsEditor::singleton = nullptr; diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index 5890ed2c2dd7..b229b5d93ff0 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -41,9 +41,9 @@ #include "editor/localization_editor.h" #include "editor/plugins/editor_plugin_settings.h" #include "editor/shader_globals_editor.h" -#include "scene/gui/tab_container.h" class FileSystemDock; +class TabContainer; class ProjectSettingsEditor : public AcceptDialog { GDCLASS(ProjectSettingsEditor, AcceptDialog); diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 0394c9e24920..c5dadfe135cf 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -35,6 +35,7 @@ #include "editor/editor_help.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" #include "scene/gui/line_edit.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/tree.h" diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index 71d2ccf1244f..03ebcef837b8 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -46,6 +46,7 @@ #include "scene/gui/control.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h index 37d159b4e234..9dbb9aedbfe3 100644 --- a/editor/rename_dialog.h +++ b/editor/rename_dialog.h @@ -36,12 +36,12 @@ #include "editor/gui/scene_tree_editor.h" #include "scene/gui/dialogs.h" -#include "scene/gui/line_edit.h" class Button; class CheckBox; class CheckButton; class Label; +class LineEdit; class OptionButton; class SpinBox; class TabContainer; diff --git a/editor/reparent_dialog.cpp b/editor/reparent_dialog.cpp index a725508bc468..604bdd8cadac 100644 --- a/editor/reparent_dialog.cpp +++ b/editor/reparent_dialog.cpp @@ -34,6 +34,7 @@ #include "editor/gui/scene_tree_editor.h" #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" +#include "scene/gui/tree.h" void ReparentDialog::_notification(int p_what) { switch (p_what) { diff --git a/editor/run_instances_dialog.cpp b/editor/run_instances_dialog.cpp index d617c899ad66..05b0220b9c63 100644 --- a/editor/run_instances_dialog.cpp +++ b/editor/run_instances_dialog.cpp @@ -33,6 +33,7 @@ #include "core/config/project_settings.h" #include "editor/editor_settings.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" diff --git a/editor/scene_create_dialog.cpp b/editor/scene_create_dialog.cpp index 90e4d74fcbfc..14f17d5442a1 100644 --- a/editor/scene_create_dialog.cpp +++ b/editor/scene_create_dialog.cpp @@ -41,6 +41,7 @@ #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/resources/packed_scene.h" diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 5cd78e8a38e7..d24486403d39 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -55,9 +55,16 @@ #include "editor/reparent_dialog.h" #include "editor/shader_create_dialog.h" #include "editor/themes/editor_scale.h" +#include "scene/2d/node_2d.h" +#include "scene/animation/animation_player.h" #include "scene/animation/animation_tree.h" #include "scene/audio/audio_stream_player.h" #include "scene/gui/check_box.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/main/timer.h" #include "scene/property_utils.h" #include "scene/resources/packed_scene.h" #include "servers/display_server.h" diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index 671224d4f346..dd48e414b8f4 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -41,6 +41,7 @@ class EditorData; class EditorSelection; class EditorQuickOpen; class MenuButton; +class PopupMenu; class ReparentDialog; class ShaderCreateDialog; class TextureRect; diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 64c97e164159..5c04fd1d11e4 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -43,8 +43,11 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_validation_panel.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" static String _get_parent_class_of_script(const String &p_path) { if (!ResourceLoader::exists(p_path, "Script")) { diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h index c8f043b42013..17ffbc853073 100644 --- a/editor/script_create_dialog.h +++ b/editor/script_create_dialog.h @@ -32,15 +32,15 @@ #define SCRIPT_CREATE_DIALOG_H #include "core/object/script_language.h" -#include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" -#include "scene/gui/option_button.h" -#include "scene/gui/panel_container.h" +class CheckBox; class CreateDialog; class EditorFileDialog; class EditorValidationPanel; class LineEdit; +class OptionButton; +class VBoxContainer; class ScriptCreateDialog : public ConfirmationDialog { GDCLASS(ScriptCreateDialog, ConfirmationDialog); diff --git a/editor/shader_create_dialog.cpp b/editor/shader_create_dialog.cpp index fd9d5bc127d7..dcd4a78ea34b 100644 --- a/editor/shader_create_dialog.cpp +++ b/editor/shader_create_dialog.cpp @@ -34,6 +34,12 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_validation_panel.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/box_container.h" +#include "scene/gui/check_box.h" +#include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" #include "scene/resources/shader_include.h" #include "scene/resources/visual_shader.h" #include "servers/rendering/shader_types.h" diff --git a/editor/shader_create_dialog.h b/editor/shader_create_dialog.h index 5240842110c0..47fa6af55c4a 100644 --- a/editor/shader_create_dialog.h +++ b/editor/shader_create_dialog.h @@ -32,15 +32,15 @@ #define SHADER_CREATE_DIALOG_H #include "editor/editor_settings.h" -#include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" -#include "scene/gui/grid_container.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/option_button.h" -#include "scene/gui/panel_container.h" +class Button; +class CheckBox; class EditorFileDialog; class EditorValidationPanel; +class GridContainer; +class LineEdit; +class OptionButton; class ShaderCreateDialog : public ConfirmationDialog { GDCLASS(ShaderCreateDialog, ConfirmationDialog); diff --git a/editor/shader_globals_editor.cpp b/editor/shader_globals_editor.cpp index 0582c598a137..1c940f5a0c2e 100644 --- a/editor/shader_globals_editor.cpp +++ b/editor/shader_globals_editor.cpp @@ -32,7 +32,11 @@ #include "core/config/project_settings.h" #include "editor/editor_node.h" +#include "editor/editor_sectioned_inspector.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" #include "servers/rendering/shader_language.h" static const char *global_var_type_names[RS::GLOBAL_VAR_TYPE_MAX] = { diff --git a/editor/shader_globals_editor.h b/editor/shader_globals_editor.h index fd94e483ff48..509b2bd92715 100644 --- a/editor/shader_globals_editor.h +++ b/editor/shader_globals_editor.h @@ -31,12 +31,12 @@ #ifndef SHADER_GLOBALS_EDITOR_H #define SHADER_GLOBALS_EDITOR_H -#include "editor/editor_autoload_settings.h" -#include "editor/editor_data.h" -#include "editor/editor_sectioned_inspector.h" -#include "editor/plugins/editor_plugin_settings.h" -#include "scene/gui/tab_container.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" +class EditorInspector; +class LineEdit; +class OptionButton; class ShaderGlobalsEditorInterface; class ShaderGlobalsEditor : public VBoxContainer { diff --git a/editor/surface_upgrade_tool.cpp b/editor/surface_upgrade_tool.cpp index f532535034da..06bbf7e91b5e 100644 --- a/editor/surface_upgrade_tool.cpp +++ b/editor/surface_upgrade_tool.cpp @@ -36,6 +36,7 @@ #include "editor/editor_settings.h" #include "editor/gui/editor_toaster.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/label.h" #include "servers/rendering_server.h" SurfaceUpgradeTool *SurfaceUpgradeTool::singleton = nullptr; diff --git a/editor/window_wrapper.h b/editor/window_wrapper.h index a07e95f09ee3..d46cfc58f8b1 100644 --- a/editor/window_wrapper.h +++ b/editor/window_wrapper.h @@ -31,12 +31,12 @@ #ifndef WINDOW_WRAPPER_H #define WINDOW_WRAPPER_H -#include "core/math/rect2.h" +#include "scene/gui/button.h" #include "scene/gui/margin_container.h" -#include "scene/gui/menu_button.h" -class Window; class HBoxContainer; +class Popup; +class Window; class WindowWrapper : public MarginContainer { GDCLASS(WindowWrapper, MarginContainer); diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp index 022d2e44771b..d9a42bc9b438 100644 --- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp +++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp @@ -40,6 +40,7 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/import/3d/scene_import_settings.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/popup_menu.h" String SceneExporterGLTFPlugin::get_name() const { return "ConvertGLTF2"; diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 0b8fb584df28..383c6dfd7900 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -43,6 +43,9 @@ #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" #include "main/main.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" #include "scene/gui/line_edit.h" #ifdef MINGW_ENABLED diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index ea63e0710423..2397117fa23f 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -43,7 +43,9 @@ #include "scene/3d/camera_3d.h" #include "scene/gui/dialogs.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" #include "scene/main/window.h" diff --git a/modules/multiplayer/editor/editor_network_profiler.cpp b/modules/multiplayer/editor/editor_network_profiler.cpp index 212fd1ef6bc8..6ce138ee6292 100644 --- a/modules/multiplayer/editor/editor_network_profiler.cpp +++ b/modules/multiplayer/editor/editor_network_profiler.cpp @@ -34,6 +34,12 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" +#include "scene/gui/button.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/split_container.h" +#include "scene/gui/tree.h" +#include "scene/main/timer.h" void EditorNetworkProfiler::_bind_methods() { ADD_SIGNAL(MethodInfo("enable_profiling", PropertyInfo(Variant::BOOL, "enable"))); diff --git a/modules/multiplayer/editor/editor_network_profiler.h b/modules/multiplayer/editor/editor_network_profiler.h index b4f8ffa72425..c91efc5bd219 100644 --- a/modules/multiplayer/editor/editor_network_profiler.h +++ b/modules/multiplayer/editor/editor_network_profiler.h @@ -35,10 +35,12 @@ #include "scene/debugger/scene_debugger.h" #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/label.h" -#include "scene/gui/split_container.h" -#include "scene/gui/tree.h" + +class Button; +class LineEdit; +class Timer; +class Tree; +class TreeItem; class EditorNetworkProfiler : public VBoxContainer { GDCLASS(EditorNetworkProfiler, VBoxContainer) diff --git a/modules/multiplayer/editor/multiplayer_editor_plugin.cpp b/modules/multiplayer/editor/multiplayer_editor_plugin.cpp index a496f5dfa296..a138e6b79725 100644 --- a/modules/multiplayer/editor/multiplayer_editor_plugin.cpp +++ b/modules/multiplayer/editor/multiplayer_editor_plugin.cpp @@ -38,6 +38,7 @@ #include "editor/editor_interface.h" #include "editor/editor_node.h" #include "editor/gui/editor_bottom_panel.h" +#include "scene/gui/button.h" void MultiplayerEditorDebugger::_bind_methods() { ADD_SIGNAL(MethodInfo("open_request", PropertyInfo(Variant::STRING, "path"))); diff --git a/modules/multiplayer/editor/multiplayer_editor_plugin.h b/modules/multiplayer/editor/multiplayer_editor_plugin.h index e8ade539a775..a2f0fbbc9db2 100644 --- a/modules/multiplayer/editor/multiplayer_editor_plugin.h +++ b/modules/multiplayer/editor/multiplayer_editor_plugin.h @@ -34,6 +34,8 @@ #include "editor/plugins/editor_debugger_plugin.h" #include "editor/plugins/editor_plugin.h" +class Button; + class EditorNetworkProfiler; class MultiplayerEditorDebugger : public EditorDebuggerPlugin { GDCLASS(MultiplayerEditorDebugger, EditorDebuggerPlugin); diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp index 851ad858769b..b301bf67c85c 100644 --- a/modules/multiplayer/editor/replication_editor.cpp +++ b/modules/multiplayer/editor/replication_editor.cpp @@ -41,7 +41,10 @@ #include "editor/property_selector.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "scene/gui/button.h" #include "scene/gui/dialogs.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/separator.h" #include "scene/gui/tree.h" diff --git a/platform/android/platform_config.h b/platform/android/platform_config.h index d2376d2de79d..5ee1ece8fdaa 100644 --- a/platform/android/platform_config.h +++ b/platform/android/platform_config.h @@ -28,5 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ +#ifdef HAVE_ALLOCA_H #include +#endif #include diff --git a/platform/ios/platform_config.h b/platform/ios/platform_config.h index 01b0a12b5d33..c02b015bc738 100644 --- a/platform/ios/platform_config.h +++ b/platform/ios/platform_config.h @@ -28,7 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ +#ifdef HAVE_ALLOCA_H #include +#endif #define PTHREAD_RENAME_SELF diff --git a/platform/macos/platform_config.h b/platform/macos/platform_config.h index 01b0a12b5d33..c02b015bc738 100644 --- a/platform/macos/platform_config.h +++ b/platform/macos/platform_config.h @@ -28,7 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ +#ifdef HAVE_ALLOCA_H #include +#endif #define PTHREAD_RENAME_SELF diff --git a/platform/web/platform_config.h b/platform/web/platform_config.h index c3189bccfb18..a9ef414d393f 100644 --- a/platform/web/platform_config.h +++ b/platform/web/platform_config.h @@ -28,4 +28,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ +#ifdef HAVE_ALLOCA_H #include +#endif diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 89a0479de3a8..d3d2cb746d63 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -37,7 +37,6 @@ #include "scene/audio/audio_stream_player_internal.h" #include "scene/main/viewport.h" #include "scene/resources/world_2d.h" -#include "servers/audio/audio_stream.h" #include "servers/audio_server.h" void AudioStreamPlayer2D::_notification(int p_what) { diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h index 309e206fe4ec..9b46dc90e4a2 100644 --- a/scene/2d/audio_stream_player_2d.h +++ b/scene/2d/audio_stream_player_2d.h @@ -32,11 +32,10 @@ #define AUDIO_STREAM_PLAYER_2D_H #include "scene/2d/node_2d.h" +#include "servers/audio/audio_stream.h" #include "servers/audio_server.h" struct AudioFrame; -class AudioStream; -class AudioStreamPlayback; class AudioStreamPlayerInternal; class AudioStreamPlayer2D : public Node2D { diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index 4d3f494ccf3d..4e220f9eaee4 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -38,7 +38,6 @@ #include "scene/3d/velocity_tracker_3d.h" #include "scene/audio/audio_stream_player_internal.h" #include "scene/main/viewport.h" -#include "servers/audio/audio_stream.h" // Based on "A Novel Multichannel Panning Method for Standard and Arbitrary Loudspeaker Configurations" by Ramy Sadek and Chris Kyriakakis (2004) // Speaker-Placement Correction Amplitude Panning (SPCAP) diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h index 72356faad7fc..263144142426 100644 --- a/scene/3d/audio_stream_player_3d.h +++ b/scene/3d/audio_stream_player_3d.h @@ -32,12 +32,11 @@ #define AUDIO_STREAM_PLAYER_3D_H #include "scene/3d/node_3d.h" +#include "servers/audio/audio_stream.h" #include "servers/audio_server.h" class Area3D; struct AudioFrame; -class AudioStream; -class AudioStreamPlayback; class AudioStreamPlayerInternal; class Camera3D; class VelocityTracker3D; diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 5e177772ffad..43a7df8b8eee 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -31,7 +31,9 @@ #include "base_button.h" #include "core/config/project_settings.h" +#include "core/input/shortcut.h" #include "core/os/keyboard.h" +#include "scene/main/timer.h" #include "scene/main/window.h" void BaseButton::_unpress_group() { diff --git a/scene/gui/base_button.h b/scene/gui/base_button.h index a8d5cee44cad..1aed2d0efedc 100644 --- a/scene/gui/base_button.h +++ b/scene/gui/base_button.h @@ -31,10 +31,11 @@ #ifndef BASE_BUTTON_H #define BASE_BUTTON_H -#include "core/input/shortcut.h" #include "scene/gui/control.h" class ButtonGroup; +class Shortcut; +class Timer; class BaseButton : public Control { GDCLASS(BaseButton, Control); diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp index 412eb8351525..1c249a7d77eb 100644 --- a/scene/gui/code_edit.cpp +++ b/scene/gui/code_edit.cpp @@ -34,6 +34,7 @@ #include "core/os/keyboard.h" #include "core/string/string_builder.h" #include "core/string/ustring.h" +#include "scene/resources/text_line.h" #include "scene/theme/theme_db.h" void CodeEdit::_notification(int p_what) { diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index cc886d300f0c..be508024d75b 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -30,13 +30,19 @@ #include "color_picker.h" -#include "core/input/input.h" -#include "core/io/image.h" -#include "core/math/color.h" -#include "core/os/keyboard.h" -#include "core/os/os.h" +#include "scene/gui/aspect_ratio_container.h" #include "scene/gui/color_mode.h" +#include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/margin_container.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/slider.h" +#include "scene/gui/spin_box.h" +#include "scene/gui/texture_rect.h" #include "scene/resources/image_texture.h" #include "scene/resources/style_box_flat.h" #include "scene/resources/style_box_texture.h" diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h index ad028584b11b..c79a45cdbe08 100644 --- a/scene/gui/color_picker.h +++ b/scene/gui/color_picker.h @@ -31,28 +31,27 @@ #ifndef COLOR_PICKER_H #define COLOR_PICKER_H -#include "scene/gui/aspect_ratio_container.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/gui/control.h" -#include "scene/gui/grid_container.h" -#include "scene/gui/label.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/option_button.h" -#include "scene/gui/panel.h" #include "scene/gui/popup.h" -#include "scene/gui/separator.h" -#include "scene/gui/slider.h" -#include "scene/gui/spin_box.h" -#include "scene/gui/texture_rect.h" -#include "scene/resources/style_box_flat.h" +class AspectRatioContainer; class ColorMode; class ColorModeRGB; class ColorModeHSV; class ColorModeRAW; class ColorModeOKHSL; +class GridContainer; +class HSlider; +class Label; +class LineEdit; +class MenuButton; +class OptionButton; +class Panel; +class PopupMenu; +class SpinBox; +class StyleBoxFlat; +class TextureRect; class ColorPresetButton : public BaseButton { GDCLASS(ColorPresetButton, BaseButton); diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index ba851675f006..2f58a92f4fb3 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -34,13 +34,9 @@ #include "container.h" #include "core/config/project_settings.h" #include "core/math/geometry_2d.h" -#include "core/os/keyboard.h" #include "core/os/os.h" #include "core/string/print_string.h" #include "core/string/translation.h" -#include "scene/gui/label.h" -#include "scene/gui/panel.h" -#include "scene/main/canvas_layer.h" #include "scene/main/window.h" #include "scene/theme/theme_db.h" #include "scene/theme/theme_owner.h" diff --git a/scene/gui/control.h b/scene/gui/control.h index c784d4330dac..143ae46c2362 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -31,11 +31,8 @@ #ifndef CONTROL_H #define CONTROL_H -#include "core/math/transform_2d.h" #include "core/object/gdvirtual.gen.inc" -#include "core/templates/rid.h" #include "scene/main/canvas_item.h" -#include "scene/main/timer.h" #include "scene/resources/theme.h" class Viewport; diff --git a/scene/gui/dialogs.compat.inc b/scene/gui/dialogs.compat.inc index e114675a8957..52d11f07e3d2 100644 --- a/scene/gui/dialogs.compat.inc +++ b/scene/gui/dialogs.compat.inc @@ -30,6 +30,9 @@ #ifndef DISABLE_DEPRECATED +#include "scene/gui/button.h" +#include "scene/gui/line_edit.h" + void AcceptDialog::_register_text_enter_bind_compat_89419(Control *p_line_edit) { register_text_enter(Object::cast_to(p_line_edit)); } diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index 7801c39ce6dc..40b4cfc56d35 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -34,7 +34,11 @@ #include "core/os/keyboard.h" #include "core/string/print_string.h" #include "core/string/translation.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.h" #include "scene/theme/theme_db.h" // AcceptDialog diff --git a/scene/gui/dialogs.h b/scene/gui/dialogs.h index 404237bfd855..cb22986d16df 100644 --- a/scene/gui/dialogs.h +++ b/scene/gui/dialogs.h @@ -31,15 +31,14 @@ #ifndef DIALOGS_H #define DIALOGS_H -#include "box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/label.h" -#include "scene/gui/panel.h" -#include "scene/gui/popup.h" -#include "scene/gui/texture_button.h" #include "scene/main/window.h" +class Control; +class Button; +class HBoxContainer; +class Label; class LineEdit; +class Panel; class AcceptDialog : public Window { GDCLASS(AcceptDialog, Window); diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 2614e1d180cf..57df6c1366e8 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -31,12 +31,17 @@ #include "file_dialog.h" #include "core/config/project_settings.h" +#include "core/io/dir_access.h" #include "core/os/keyboard.h" #include "core/string/print_string.h" +#include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/tree.h" #include "scene/theme/theme_db.h" FileDialog::GetIconFunc FileDialog::get_icon_func = nullptr; diff --git a/scene/gui/file_dialog.h b/scene/gui/file_dialog.h index 9680157f0a41..76950b8730b2 100644 --- a/scene/gui/file_dialog.h +++ b/scene/gui/file_dialog.h @@ -31,15 +31,16 @@ #ifndef FILE_DIALOG_H #define FILE_DIALOG_H -#include "box_container.h" -#include "core/io/dir_access.h" #include "scene/gui/dialogs.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/option_button.h" -#include "scene/gui/tree.h" #include "scene/property_list_helper.h" +class DirAccess; class GridContainer; +class HBoxContainer; +class LineEdit; +class OptionButton; +class Tree; +class VBoxContainer; class FileDialog : public ConfirmationDialog { GDCLASS(FileDialog, ConfirmationDialog); diff --git a/scene/gui/foldable_container.cpp b/scene/gui/foldable_container.cpp index 8d6f0c073390..e76e406374ad 100644 --- a/scene/gui/foldable_container.cpp +++ b/scene/gui/foldable_container.cpp @@ -30,6 +30,7 @@ #include "foldable_container.h" +#include "scene/resources/text_line.h" #include "scene/theme/theme_db.h" Size2 FoldableContainer::get_minimum_size() const { diff --git a/scene/gui/foldable_container.h b/scene/gui/foldable_container.h index e9c6a155077b..56a95941bcc5 100644 --- a/scene/gui/foldable_container.h +++ b/scene/gui/foldable_container.h @@ -32,7 +32,8 @@ #define FOLDABLE_CONTAINER_H #include "scene/gui/container.h" -#include "scene/resources/text_line.h" + +class TextLine; class FoldableContainer : public Container { GDCLASS(FoldableContainer, Container); diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 60b3e371a0a6..b3da9b0801b9 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -39,6 +39,8 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/graph_edit_arranger.h" +#include "scene/gui/graph_frame.h" +#include "scene/gui/graph_node.h" #include "scene/gui/label.h" #include "scene/gui/panel_container.h" #include "scene/gui/scroll_bar.h" diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index 20c98c462c49..9eb87ca852d7 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -31,13 +31,15 @@ #ifndef GRAPH_EDIT_H #define GRAPH_EDIT_H -#include "scene/gui/box_container.h" -#include "scene/gui/graph_frame.h" -#include "scene/gui/graph_node.h" +#include "scene/gui/control.h" class Button; class GraphEdit; class GraphEditArranger; +class GraphElement; +class GraphFrame; +class GraphNode; +class HBoxContainer; class HScrollBar; class Label; class Line2D; diff --git a/scene/gui/graph_edit_arranger.cpp b/scene/gui/graph_edit_arranger.cpp index fa1059c66760..b91f63257f54 100644 --- a/scene/gui/graph_edit_arranger.cpp +++ b/scene/gui/graph_edit_arranger.cpp @@ -31,6 +31,7 @@ #include "graph_edit_arranger.h" #include "scene/gui/graph_edit.h" +#include "scene/gui/graph_node.h" void GraphEditArranger::arrange_nodes() { ERR_FAIL_NULL(graph_edit); diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index bf16c0699e5a..562a258a9b48 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -33,6 +33,7 @@ #include "core/config/project_settings.h" #include "core/os/os.h" #include "core/string/translation.h" +#include "scene/gui/scroll_bar.h" #include "scene/theme/theme_db.h" void ItemList::_shape_text(int p_idx) { diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h index a20688b3d016..09f89bc24de9 100644 --- a/scene/gui/item_list.h +++ b/scene/gui/item_list.h @@ -32,10 +32,11 @@ #define ITEM_LIST_H #include "scene/gui/control.h" -#include "scene/gui/scroll_bar.h" #include "scene/property_list_helper.h" #include "scene/resources/text_paragraph.h" +class VScrollBar; + class ItemList : public Control { GDCLASS(ItemList, Control); diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 42b4e56b484b..c61176dc7a25 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -34,6 +34,7 @@ #include "core/string/print_string.h" #include "core/string/translation.h" #include "scene/gui/container.h" +#include "scene/resources/label_settings.h" #include "scene/theme/theme_db.h" #include "servers/text_server.h" diff --git a/scene/gui/label.h b/scene/gui/label.h index e0ebca944ab3..7363f1cfe9cc 100644 --- a/scene/gui/label.h +++ b/scene/gui/label.h @@ -32,7 +32,8 @@ #define LABEL_H #include "scene/gui/control.h" -#include "scene/resources/label_settings.h" + +class LabelSettings; class Label : public Control { GDCLASS(Label, Control); diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 0006204ae35d..6a5c04b1eed4 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -36,6 +36,7 @@ #include "core/string/print_string.h" #include "core/string/translation.h" #include "scene/gui/label.h" +#include "scene/gui/popup_menu.h" #include "scene/main/window.h" #include "scene/theme/theme_db.h" #include "servers/display_server.h" diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h index 993bc727e481..7bf980a20a8a 100644 --- a/scene/gui/line_edit.h +++ b/scene/gui/line_edit.h @@ -32,7 +32,8 @@ #define LINE_EDIT_H #include "scene/gui/control.h" -#include "scene/gui/popup_menu.h" + +class PopupMenu; class LineEdit : public Control { GDCLASS(LineEdit, Control); diff --git a/scene/gui/menu_bar.h b/scene/gui/menu_bar.h index 04f6afc2fa7d..3f9f6039c52a 100644 --- a/scene/gui/menu_bar.h +++ b/scene/gui/menu_bar.h @@ -31,7 +31,7 @@ #ifndef MENU_BAR_H #define MENU_BAR_H -#include "scene/gui/button.h" +#include "scene/gui/control.h" #include "scene/gui/popup_menu.h" class MenuBar : public Control { diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index 8c5bb1b33d83..71da6306869d 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -31,6 +31,7 @@ #include "menu_button.h" #include "core/os/keyboard.h" +#include "scene/gui/popup_menu.h" #include "scene/main/window.h" void MenuButton::shortcut_input(const Ref &p_event) { diff --git a/scene/gui/menu_button.h b/scene/gui/menu_button.h index 5a74d61091c7..71d40a72abf3 100644 --- a/scene/gui/menu_button.h +++ b/scene/gui/menu_button.h @@ -32,9 +32,10 @@ #define MENU_BUTTON_H #include "scene/gui/button.h" -#include "scene/gui/popup_menu.h" #include "scene/property_list_helper.h" +class PopupMenu; + class MenuButton : public Button { GDCLASS(MenuButton, Button); diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index 5432058f7b31..cb01de08f303 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -32,6 +32,7 @@ #include "core/os/keyboard.h" #include "core/string/print_string.h" +#include "scene/gui/popup_menu.h" #include "scene/theme/theme_db.h" static const int NONE_SELECTED = -1; diff --git a/scene/gui/option_button.h b/scene/gui/option_button.h index 351df9a74977..63c3ab89c14c 100644 --- a/scene/gui/option_button.h +++ b/scene/gui/option_button.h @@ -32,9 +32,10 @@ #define OPTION_BUTTON_H #include "scene/gui/button.h" -#include "scene/gui/popup_menu.h" #include "scene/property_list_helper.h" +class PopupMenu; + class OptionButton : public Button { GDCLASS(OptionButton, Button); diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 5de4cdaf599d..c8d497dfbdee 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -32,12 +32,13 @@ #include "popup_menu.compat.inc" #include "core/config/project_settings.h" -#include "core/input/input.h" -#include "core/os/keyboard.h" #include "core/os/os.h" #include "core/string/print_string.h" #include "core/string/translation.h" #include "scene/gui/menu_bar.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/scroll_container.h" +#include "scene/main/timer.h" #include "scene/theme/theme_db.h" HashMap PopupMenu::system_menus; diff --git a/scene/gui/popup_menu.h b/scene/gui/popup_menu.h index 5313dae404f7..a2c8fcf0106e 100644 --- a/scene/gui/popup_menu.h +++ b/scene/gui/popup_menu.h @@ -32,11 +32,14 @@ #define POPUP_MENU_H #include "core/input/shortcut.h" +#include "scene/gui/control.h" #include "scene/gui/popup.h" -#include "scene/gui/scroll_container.h" #include "scene/property_list_helper.h" #include "scene/resources/text_line.h" +class ScrollContainer; +class Timer; + class PopupMenu : public Popup { GDCLASS(PopupMenu, Popup); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index adb80bc0788f..6eb78bbb5e0b 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -37,7 +37,9 @@ #include "core/os/os.h" #include "core/string/translation.h" #include "scene/gui/label.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/rich_text_effect.h" +#include "scene/gui/scroll_bar.h" #include "scene/resources/atlas_texture.h" #include "scene/theme/theme_db.h" #include "servers/display_server.h" diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index 83285bd7cde5..44dd98e79c77 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -33,12 +33,14 @@ #include "core/object/worker_thread_pool.h" #include "core/templates/rid_owner.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/scroll_bar.h" +#include "scene/gui/control.h" +#include "scene/resources/text_line.h" #include "scene/resources/text_paragraph.h" class CharFXTransform; +class PopupMenu; class RichTextEffect; +class VScrollBar; class RichTextLabel : public Control { GDCLASS(RichTextLabel, Control); diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 414bf27a6098..72902175aab4 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -31,6 +31,7 @@ #include "scroll_container.h" #include "core/config/project_settings.h" +#include "scene/gui/scroll_bar.h" #include "scene/main/window.h" #include "scene/theme/theme_db.h" diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index dd3027a57d59..0c6f65d6a398 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -31,9 +31,10 @@ #ifndef SCROLL_CONTAINER_H #define SCROLL_CONTAINER_H -#include "container.h" +#include "scene/gui/container.h" -#include "scroll_bar.h" +class HScrollBar; +class VScrollBar; class ScrollContainer : public Container { GDCLASS(ScrollContainer, Container); diff --git a/scene/gui/separator.h b/scene/gui/separator.h index 7c973604ac5d..aec60b5a869f 100644 --- a/scene/gui/separator.h +++ b/scene/gui/separator.h @@ -32,6 +32,7 @@ #define SEPARATOR_H #include "scene/gui/control.h" + class Separator : public Control { GDCLASS(Separator, Control); diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index 2c08d36e7e6f..865cc36647f1 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -32,6 +32,9 @@ #include "core/input/input.h" #include "core/math/expression.h" +#include "scene/gui/line_edit.h" +#include "scene/main/timer.h" +#include "scene/main/viewport.h" #include "scene/theme/theme_db.h" Size2 SpinBox::get_minimum_size() const { diff --git a/scene/gui/spin_box.h b/scene/gui/spin_box.h index 4d49626d71d8..e124f8137574 100644 --- a/scene/gui/spin_box.h +++ b/scene/gui/spin_box.h @@ -31,9 +31,10 @@ #ifndef SPIN_BOX_H #define SPIN_BOX_H -#include "scene/gui/line_edit.h" #include "scene/gui/range.h" -#include "scene/main/timer.h" + +class LineEdit; +class Timer; class SpinBox : public Range { GDCLASS(SpinBox, Range); diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index 23b99d1e537e..86741c133852 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -30,6 +30,7 @@ #include "tab_container.h" +#include "scene/gui/popup.h" #include "scene/theme/theme_db.h" int TabContainer::_get_tab_height() const { diff --git a/scene/gui/tab_container.h b/scene/gui/tab_container.h index e00bc780d47b..8583e506f59f 100644 --- a/scene/gui/tab_container.h +++ b/scene/gui/tab_container.h @@ -32,9 +32,10 @@ #define TAB_CONTAINER_H #include "scene/gui/container.h" -#include "scene/gui/popup.h" #include "scene/gui/tab_bar.h" +class Popup; + class TabContainer : public Container { GDCLASS(TabContainer, Container); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index ac6ebd5cc1fb..36d317f8cc94 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -35,12 +35,15 @@ #include "core/input/input.h" #include "core/input/input_map.h" #include "core/object/script_language.h" -#include "core/os/keyboard.h" #include "core/os/os.h" #include "core/string/string_builder.h" #include "core/string/translation.h" #include "scene/gui/label.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" +#include "scene/main/timer.h" #include "scene/main/window.h" +#include "scene/resources/text_line.h" #include "scene/theme/theme_db.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index c8cd7b0e4d50..d817ae9cd00b 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -32,12 +32,14 @@ #define TEXT_EDIT_H #include "scene/gui/control.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/scroll_bar.h" -#include "scene/main/timer.h" #include "scene/resources/syntax_highlighter.h" #include "scene/resources/text_paragraph.h" +class HScrollBar; +class PopupMenu; +class Timer; +class VScrollBar; + class TextEdit : public Control { GDCLASS(TextEdit, Control); diff --git a/scene/gui/texture_button.h b/scene/gui/texture_button.h index 9d393d3c65b6..26bc16124026 100644 --- a/scene/gui/texture_button.h +++ b/scene/gui/texture_button.h @@ -33,6 +33,7 @@ #include "scene/gui/base_button.h" #include "scene/resources/bit_map.h" + class TextureButton : public BaseButton { GDCLASS(TextureButton, BaseButton); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 2b4bee841d9a..eb0b7c58b1a8 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -33,10 +33,14 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/math/math_funcs.h" -#include "core/os/keyboard.h" #include "core/os/os.h" #include "scene/gui/box_container.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/slider.h" #include "scene/gui/text_edit.h" +#include "scene/main/timer.h" #include "scene/main/window.h" #include "scene/theme/theme_db.h" diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 3200459b5ae0..bc5e0e585dde 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -32,14 +32,17 @@ #define TREE_H #include "scene/gui/control.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/scroll_bar.h" -#include "scene/gui/slider.h" #include "scene/resources/text_paragraph.h" +class HScrollBar; +class HSlider; +class LineEdit; +class Popup; +class PopupMenu; class TextEdit; class Tree; +class Timer; +class VScrollBar; class TreeItem : public Object { GDCLASS(TreeItem, Object); diff --git a/scene/gui/video_stream_player.cpp b/scene/gui/video_stream_player.cpp index 0b521f926df0..2a19a4b0047f 100644 --- a/scene/gui/video_stream_player.cpp +++ b/scene/gui/video_stream_player.cpp @@ -31,7 +31,7 @@ #include "video_stream_player.h" #include "core/os/os.h" -#include "servers/audio_server.h" +#include "scene/resources/video_stream.h" int VideoStreamPlayer::sp_get_channel_count() const { if (playback.is_null()) { diff --git a/scene/gui/video_stream_player.h b/scene/gui/video_stream_player.h index c173c8bfa387..3cb34a417ebb 100644 --- a/scene/gui/video_stream_player.h +++ b/scene/gui/video_stream_player.h @@ -32,9 +32,10 @@ #define VIDEO_STREAM_PLAYER_H #include "scene/gui/control.h" -#include "scene/resources/video_stream.h" #include "servers/audio/audio_rb_resampler.h" -#include "servers/audio_server.h" + +class VideoStream; +class VideoStreamPlayback; class VideoStreamPlayer : public Control { GDCLASS(VideoStreamPlayer, Control); diff --git a/scene/gui/view_panner.cpp b/scene/gui/view_panner.cpp index 438a228c4ff4..6c3351938472 100644 --- a/scene/gui/view_panner.cpp +++ b/scene/gui/view_panner.cpp @@ -31,7 +31,6 @@ #include "view_panner.h" #include "core/input/input.h" -#include "core/input/shortcut.h" #include "core/os/keyboard.h" bool ViewPanner::gui_input(const Ref &p_event, Rect2 p_canvas_rect) { diff --git a/scene/gui/view_panner.h b/scene/gui/view_panner.h index 5aec2d4f6b59..cb2cbc161e0b 100644 --- a/scene/gui/view_panner.h +++ b/scene/gui/view_panner.h @@ -31,10 +31,10 @@ #ifndef VIEW_PANNER_H #define VIEW_PANNER_H +#include "core/input/shortcut.h" #include "core/object/ref_counted.h" class InputEvent; -class Shortcut; class ViewPanner : public RefCounted { GDCLASS(ViewPanner, RefCounted); diff --git a/tests/scene/test_text_edit.h b/tests/scene/test_text_edit.h index b2d9f5100e81..8926eadf1ec3 100644 --- a/tests/scene/test_text_edit.h +++ b/tests/scene/test_text_edit.h @@ -31,6 +31,7 @@ #ifndef TEST_TEXT_EDIT_H #define TEST_TEXT_EDIT_H +#include "scene/gui/scroll_bar.h" #include "scene/gui/text_edit.h" #include "tests/test_macros.h"