From 7fd581f987a6155f21e00e7e432dade2444b09c2 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 19 Mar 2022 03:10:01 +0100 Subject: [PATCH] An another set of header include cleanups for the classes in the engine directory. --- editor/editor_profiler.h | 8 -------- editor/editor_properties.h | 8 -------- editor/editor_properties_array_dict.h | 4 ---- editor/editor_resource_picker.h | 6 ------ editor/editor_run.h | 2 -- editor/editor_run_native.h | 2 -- editor/editor_run_script.h | 2 -- editor/editor_sectioned_inspector.h | 3 --- editor/editor_spin_slider.h | 3 --- editor/editor_sub_scene.h | 3 --- editor/export_template_manager.h | 7 ------- editor/filesystem_dock.h | 15 --------------- editor/groups_editor.h | 10 ---------- editor/import_defaults_editor.h | 8 -------- editor/import_dock.h | 9 --------- editor/inspector_dock.h | 12 ------------ modules/rtile_map/tile_map_editor_plugin.cpp | 1 + modules/rtile_map/tile_set_editor_plugin.cpp | 2 ++ modules/rtile_map/tile_set_editor_plugin.h | 1 + .../skeleton_editor/skeleton_editor_plugin.cpp | 5 +++++ modules/skeleton_editor/skeleton_editor_plugin.h | 3 +++ modules/terraman/world/terrain_world_editor.cpp | 2 ++ .../terraman_2d/world/terrain_2d_world_editor.cpp | 2 ++ modules/voxelman/world/voxel_world_editor.cpp | 2 ++ 24 files changed, 18 insertions(+), 102 deletions(-) diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h index 342d63fa1..a759edd76 100644 --- a/editor/editor_profiler.h +++ b/editor/editor_profiler.h @@ -32,14 +32,6 @@ #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/label.h" -#include "scene/gui/option_button.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 "core/color.h" #include "core/map.h" #include "core/object.h" diff --git a/editor/editor_properties.h b/editor/editor_properties.h index e3766dcdd..4866ba44b 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -32,14 +32,6 @@ #include "editor/editor_inspector.h" -#include "editor/create_dialog.h" -#include "editor/editor_resource_picker.h" -#include "editor/editor_spin_slider.h" -#include "editor/property_selector.h" -#include "editor/scene_tree_editor.h" -#include "scene/gui/color_picker.h" -#include "scene/gui/line_edit.h" - #include "core/color.h" #include "core/math/vector2.h" #include "core/node_path.h" diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h index 59823d9eb..78ca86ff7 100644 --- a/editor/editor_properties_array_dict.h +++ b/editor/editor_properties_array_dict.h @@ -33,10 +33,6 @@ #include "editor/editor_inspector.h" #include "core/reference.h" -#include "editor/editor_spin_slider.h" -#include "editor/filesystem_dock.h" -#include "scene/gui/button.h" - #include "core/dictionary.h" #include "core/math/vector2.h" #include "core/object.h" diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h index 13da8dedc..bf2fe855e 100644 --- a/editor/editor_resource_picker.h +++ b/editor/editor_resource_picker.h @@ -32,12 +32,6 @@ #include "scene/gui/box_container.h" -#include "editor_file_dialog.h" -#include "quick_open.h" -#include "scene/gui/button.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/texture_rect.h" - #include "core/hash_map.h" #include "core/list.h" #include "core/math/vector2.h" diff --git a/editor/editor_run.h b/editor/editor_run.h index f2df43511..f339d2355 100644 --- a/editor/editor_run.h +++ b/editor/editor_run.h @@ -32,8 +32,6 @@ #include "core/os/os.h" -#include "scene/main/node.h" - #include "core/error_list.h" #include "core/list.h" #include "core/ustring.h" diff --git a/editor/editor_run_native.h b/editor/editor_run_native.h index 73ab6b7c1..6289d44d4 100644 --- a/editor/editor_run_native.h +++ b/editor/editor_run_native.h @@ -32,8 +32,6 @@ #include "scene/gui/box_container.h" -#include "scene/gui/menu_button.h" - #include "core/map.h" #include "core/object.h" diff --git a/editor/editor_run_script.h b/editor/editor_run_script.h index 01a377174..017eeb51e 100644 --- a/editor/editor_run_script.h +++ b/editor/editor_run_script.h @@ -32,8 +32,6 @@ #include "core/reference.h" -#include "editor_plugin.h" - #include "core/object.h" class EditorNode; diff --git a/editor/editor_sectioned_inspector.h b/editor/editor_sectioned_inspector.h index e81d1309a..0d0539db0 100644 --- a/editor/editor_sectioned_inspector.h +++ b/editor/editor_sectioned_inspector.h @@ -32,9 +32,6 @@ #include "scene/gui/split_container.h" -#include "editor/editor_inspector.h" -#include "scene/gui/tree.h" - #include "core/map.h" #include "core/object.h" #include "core/object_id.h" diff --git a/editor/editor_spin_slider.h b/editor/editor_spin_slider.h index 45accc74f..d8b16b088 100644 --- a/editor/editor_spin_slider.h +++ b/editor/editor_spin_slider.h @@ -32,9 +32,6 @@ #include "scene/gui/range.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/texture_rect.h" - #include "core/color.h" #include "core/math/vector2.h" #include "core/object.h" diff --git a/editor/editor_sub_scene.h b/editor/editor_sub_scene.h index d3433b998..55085c47d 100644 --- a/editor/editor_sub_scene.h +++ b/editor/editor_sub_scene.h @@ -32,9 +32,6 @@ #include "scene/gui/dialogs.h" -#include "editor/editor_file_dialog.h" -#include "scene/gui/tree.h" - #include "core/list.h" #include "core/object.h" #include "core/ustring.h" diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h index 7bc36e509..7d74cb53f 100644 --- a/editor/export_template_manager.h +++ b/editor/export_template_manager.h @@ -32,13 +32,6 @@ #include "scene/gui/dialogs.h" -#include "editor/editor_settings.h" -#include "scene/gui/file_dialog.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/progress_bar.h" -#include "scene/gui/scroll_container.h" -#include "scene/main/http_request.h" - #include "core/error_list.h" #include "core/object.h" #include "core/ustring.h" diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index b5b5561d6..b691107f3 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -32,22 +32,7 @@ #include "scene/gui/box_container.h" -#include "scene/gui/control.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/label.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/option_button.h" -#include "scene/gui/progress_bar.h" #include "scene/gui/split_container.h" -#include "scene/gui/tool_button.h" -#include "scene/gui/tree.h" -#include "scene/main/timer.h" -#include "create_dialog.h" -#include "dependency_editor.h" -#include "editor_dir_dialog.h" -#include "editor_file_system.h" -#include "script_create_dialog.h" #include "core/os/dir_access.h" #include "core/os/thread.h" diff --git a/editor/groups_editor.h b/editor/groups_editor.h index 595844c1a..922f7c581 100644 --- a/editor/groups_editor.h +++ b/editor/groups_editor.h @@ -33,19 +33,9 @@ #include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" -#include "core/undo_redo.h" -#include "editor/scene_tree_editor.h" -#include "scene/gui/button.h" -#include "scene/gui/item_list.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/popup.h" -#include "scene/gui/tool_button.h" -#include "scene/gui/tree.h" - #include "core/object.h" #include "core/ustring.h" - class Button; class Label; class LineEdit; diff --git a/editor/import_defaults_editor.h b/editor/import_defaults_editor.h index 435fb6cb5..500446a63 100644 --- a/editor/import_defaults_editor.h +++ b/editor/import_defaults_editor.h @@ -32,14 +32,6 @@ #include "scene/gui/box_container.h" -#include "core/undo_redo.h" -#include "editor/editor_data.h" -#include "editor/editor_plugin_settings.h" -#include "editor/editor_sectioned_inspector.h" -#include "editor_autoload_settings.h" -#include "scene/gui/center_container.h" -#include "scene/gui/option_button.h" - #include "core/object.h" diff --git a/editor/import_dock.h b/editor/import_dock.h index dad83b335..5e5ed6c4f 100644 --- a/editor/import_dock.h +++ b/editor/import_dock.h @@ -32,16 +32,7 @@ #include "scene/gui/box_container.h" - -#include "editor/editor_file_system.h" -#include "editor/editor_inspector.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/option_button.h" -#include "scene/gui/popup_menu.h" #include "core/io/config_file.h" -#include "core/io/resource_importer.h" - #include "core/list.h" #include "core/map.h" #include "core/object.h" diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index f1aa4942c..cb2c3ef14 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -32,18 +32,6 @@ #include "scene/gui/box_container.h" -#include "editor/animation_track_editor.h" -#include "editor/connections_dialog.h" -#include "editor/create_dialog.h" -#include "editor/editor_data.h" -#include "editor/editor_inspector.h" -#include "editor/editor_path.h" -#include "scene/gui/button.h" -#include "scene/gui/control.h" -#include "scene/gui/label.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/tool_button.h" - #include "core/object.h" #include "core/reference.h" #include "core/resource.h" diff --git a/modules/rtile_map/tile_map_editor_plugin.cpp b/modules/rtile_map/tile_map_editor_plugin.cpp index 87cbc32d8..7a1aa7a3d 100644 --- a/modules/rtile_map/tile_map_editor_plugin.cpp +++ b/modules/rtile_map/tile_map_editor_plugin.cpp @@ -37,6 +37,7 @@ #include "editor/editor_settings.h" #include "editor/plugins/canvas_item_editor_plugin.h" #include "scene/gui/split_container.h" +#include "scene/gui/slider.h" void RTileMapEditor::_node_removed(Node *p_node) { if (p_node == node) { diff --git a/modules/rtile_map/tile_set_editor_plugin.cpp b/modules/rtile_map/tile_set_editor_plugin.cpp index 6d32c87ad..264cd777a 100644 --- a/modules/rtile_map/tile_set_editor_plugin.cpp +++ b/modules/rtile_map/tile_set_editor_plugin.cpp @@ -36,6 +36,8 @@ #include "editor/plugins/canvas_item_editor_plugin.h" #include "scene/2d/physics_body_2d.h" #include "scene/2d/sprite.h" +#include "scene/gui/scroll_container.h" +#include "editor/editor_inspector.h" void RTileSetEditor::edit(const Ref &p_tileset) { tileset = p_tileset; diff --git a/modules/rtile_map/tile_set_editor_plugin.h b/modules/rtile_map/tile_set_editor_plugin.h index 2ba6dd4bf..93105ee91 100644 --- a/modules/rtile_map/tile_set_editor_plugin.h +++ b/modules/rtile_map/tile_set_editor_plugin.h @@ -38,6 +38,7 @@ #define WORKSPACE_MARGIN Vector2(10, 10) class RTilesetEditorContext; +class ScrollContainer; class RTileSetEditor : public HSplitContainer { friend class RTileSetEditorPlugin; diff --git a/modules/skeleton_editor/skeleton_editor_plugin.cpp b/modules/skeleton_editor/skeleton_editor_plugin.cpp index 405daafa6..f25070175 100644 --- a/modules/skeleton_editor/skeleton_editor_plugin.cpp +++ b/modules/skeleton_editor/skeleton_editor_plugin.cpp @@ -43,6 +43,11 @@ #include "scene/main/viewport.h" #include "scene/resources/capsule_shape.h" #include "scene/resources/sphere_shape.h" +#include "editor/editor_spin_slider.h" +#include "scene/gui/texture_rect.h" +#include "editor/editor_inspector.h" +#include "editor/editor_spin_slider.h" +#include "editor/animation_track_editor.h" #define DISTANCE_DEFAULT 4 diff --git a/modules/skeleton_editor/skeleton_editor_plugin.h b/modules/skeleton_editor/skeleton_editor_plugin.h index 9a7524a27..97053349f 100644 --- a/modules/skeleton_editor/skeleton_editor_plugin.h +++ b/modules/skeleton_editor/skeleton_editor_plugin.h @@ -37,6 +37,7 @@ #include "scene/3d/camera.h" #include "scene/3d/mesh_instance.h" #include "scene/3d/skeleton.h" +#include "editor/editor_inspector.h" class ModuleEditorInspectorPluginSkeleton; class Joint; @@ -44,6 +45,8 @@ class PhysicalBone; class ModuleSkeletonEditorPlugin; class Button; class CheckBox; +class EditorSpinSlider; +class EditorInspectorSection; class ModuleBoneTransformEditor : public VBoxContainer { GDCLASS(ModuleBoneTransformEditor, VBoxContainer); diff --git a/modules/terraman/world/terrain_world_editor.cpp b/modules/terraman/world/terrain_world_editor.cpp index 8dad3679e..1136d3079 100644 --- a/modules/terraman/world/terrain_world_editor.cpp +++ b/modules/terraman/world/terrain_world_editor.cpp @@ -41,6 +41,8 @@ SOFTWARE. #include "core/os/input.h" #include "editor/plugins/spatial_editor_plugin.h" #include "scene/3d/camera.h" +#include "scene/gui/slider.h" +#include "scene/gui/scroll_container.h" bool TerrainWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref &p_event) { if (!_world || !_world->get_editable()) { diff --git a/modules/terraman_2d/world/terrain_2d_world_editor.cpp b/modules/terraman_2d/world/terrain_2d_world_editor.cpp index 93e8c3d48..f080b36c8 100644 --- a/modules/terraman_2d/world/terrain_2d_world_editor.cpp +++ b/modules/terraman_2d/world/terrain_2d_world_editor.cpp @@ -39,6 +39,8 @@ SOFTWARE. #include "core/os/input.h" #include "editor/plugins/spatial_editor_plugin.h" #include "scene/3d/camera.h" +#include "scene/gui/slider.h" +#include "scene/gui/scroll_container.h" bool Terrain2DWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref &p_event) { if (!_world || !_world->get_editable()) { diff --git a/modules/voxelman/world/voxel_world_editor.cpp b/modules/voxelman/world/voxel_world_editor.cpp index 63d7d9b88..da0d75bf8 100644 --- a/modules/voxelman/world/voxel_world_editor.cpp +++ b/modules/voxelman/world/voxel_world_editor.cpp @@ -41,6 +41,8 @@ SOFTWARE. #include "core/os/input.h" #include "editor/plugins/spatial_editor_plugin.h" #include "scene/3d/camera.h" +#include "scene/gui/slider.h" +#include "scene/gui/scroll_container.h" bool VoxelWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref &p_event) { if (!_world || !_world->get_editable()) {