From bca78798ef5b44546372fdfcbf34617b5145dfd6 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 19 Mar 2022 02:25:58 +0100 Subject: [PATCH] Header include cleanups for the classes in the editor folder. --- editor/animation_bezier_editor.h | 5 ++-- editor/animation_track_editor.h | 23 +++++-------------- editor/animation_track_editor_plugins.h | 3 ++- editor/array_property_edit.h | 1 + editor/audio_stream_preview.h | 2 ++ editor/code_editor.h | 10 ++------ editor/connections_dialog.h | 14 ++++------- editor/create_dialog.h | 7 +----- editor/dependency_editor.h | 4 +--- editor/dictionary_property_edit.h | 1 + editor/editor_about.h | 12 +--------- editor/editor_audio_buses.h | 18 ++++----------- editor/editor_autoload_settings.h | 5 ++-- editor/editor_data.h | 9 ++++---- editor/editor_dir_dialog.h | 5 ++-- editor/editor_export.h | 6 +++-- editor/editor_file_dialog.h | 13 ++++------- editor/editor_file_system.h | 5 ++-- editor/editor_folding.h | 1 + editor/editor_help.h | 15 ++++-------- editor/editor_help_search.h | 13 ++++------- editor/editor_inspector.h | 11 +++++---- editor/editor_layouts_dialog.h | 2 +- editor/editor_log.h | 12 ++-------- editor/editor_network_profiler.h | 5 +--- editor/editor_node.h | 19 ++++++++------- editor/editor_path.h | 5 +--- editor/editor_plugin.h | 13 +++++------ editor/editor_plugin_settings.h | 9 +++----- editor/editor_profiler.h | 3 +++ editor/editor_properties.h | 4 +++- editor/editor_properties_array_dict.h | 4 +++- editor/editor_property_name_processor.h | 1 + editor/editor_resource_picker.h | 4 +++- editor/editor_resource_preview.h | 8 ++++--- editor/editor_run.h | 2 ++ editor/editor_run_native.h | 2 ++ editor/editor_run_script.h | 2 ++ editor/editor_sectioned_inspector.h | 4 +++- editor/editor_settings.h | 6 +++-- editor/editor_spin_slider.h | 4 +++- editor/editor_sub_scene.h | 4 +++- editor/export_template_manager.h | 4 +++- editor/filesystem_dock.h | 6 +++-- editor/find_in_files.h | 7 +++--- editor/groups_editor.h | 7 ++++-- editor/import_defaults_editor.h | 5 +++- editor/import_dock.h | 9 +++++--- editor/inspector_dock.h | 4 +++- editor/multi_node_edit.h | 4 +++- editor/node_dock.h | 3 ++- editor/pane_drag.h | 1 + editor/plugin_config_dialog.h | 4 +++- editor/plugins/item_list_editor_plugin.h | 3 +++ editor/plugins/mesh_editor_plugin.h | 1 + editor/progress_dialog.h | 6 +++-- editor/project_export.h | 10 ++++---- editor/project_manager.h | 6 +++-- editor/project_settings_editor.h | 6 +++-- editor/property_editor.h | 10 ++++---- editor/property_selector.h | 4 +++- editor/quick_open.h | 6 +++-- editor/rename_dialog.h | 21 +++++++++-------- editor/reparent_dialog.h | 4 +++- editor/run_settings_dialog.h | 4 +++- editor/scene_tree_dock.h | 9 +++++--- editor/scene_tree_editor.h | 8 ++++--- editor/script_create_dialog.h | 4 +++- editor/script_editor_debugger.h | 4 +++- editor/settings_config_dialog.h | 4 +++- editor/spatial_editor_gizmos.h | 3 +++ .../skeleton_editor/spatial_editor_gizmos.cpp | 1 + 72 files changed, 244 insertions(+), 220 deletions(-) diff --git a/editor/animation_bezier_editor.h b/editor/animation_bezier_editor.h index f3117cb84..aa6aa1872 100644 --- a/editor/animation_bezier_editor.h +++ b/editor/animation_bezier_editor.h @@ -30,7 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "animation_track_editor.h" +#include "scene/gui/control.h" + #include "core/map.h" #include "core/math/rect2.h" #include "core/math/vector2.h" @@ -40,7 +41,7 @@ #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" -#include "scene/gui/control.h" + #include "scene/resources/animation.h" #include "scene/resources/texture.h" diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index f28a85eb9..022a48195 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -30,22 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/editor_data.h" -#include "editor/editor_spin_slider.h" -#include "editor/property_editor.h" -#include "editor/property_selector.h" -#include "scene/animation/animation_cache.h" +#include "scene/gui/box_container.h" +#include "scene/gui/range.h" #include "scene/gui/control.h" -#include "scene/gui/file_dialog.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/scroll_bar.h" +#include "core/reference.h" + #include "scene/gui/slider.h" -#include "scene/gui/spin_box.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/texture_rect.h" -#include "scene/gui/tool_button.h" + +#include "scene/resources/texture.h" #include "scene/resources/animation.h" -#include "scene_tree_editor.h" #include "core/dictionary.h" #include "core/list.h" #include "core/map.h" @@ -53,13 +46,9 @@ #include "core/math/vector2.h" #include "core/node_path.h" #include "core/object.h" -#include "core/reference.h" #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" -#include "scene/gui/box_container.h" -#include "scene/gui/range.h" -#include "scene/resources/texture.h" class AnimationTrackEdit; class Button; diff --git a/editor/animation_track_editor_plugins.h b/editor/animation_track_editor_plugins.h index 540aa4dab..889ee360e 100644 --- a/editor/animation_track_editor_plugins.h +++ b/editor/animation_track_editor_plugins.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "editor/animation_track_editor.h" + #include "core/math/rect2.h" #include "core/math/vector2.h" #include "core/object.h" @@ -38,7 +39,7 @@ #include "core/reference.h" #include "core/ustring.h" #include "core/variant.h" -#include "scene/gui/control.h" + #include "scene/resources/texture.h" class InputEvent; diff --git a/editor/array_property_edit.h b/editor/array_property_edit.h index 981ad97c9..15221eeec 100644 --- a/editor/array_property_edit.h +++ b/editor/array_property_edit.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "scene/main/node.h" + #include "core/list.h" #include "core/object.h" #include "core/object_id.h" diff --git a/editor/audio_stream_preview.h b/editor/audio_stream_preview.h index 3765c00bb..f0ffae962 100644 --- a/editor/audio_stream_preview.h +++ b/editor/audio_stream_preview.h @@ -32,8 +32,10 @@ #include "core/os/thread.h" #include "core/safe_refcount.h" + #include "scene/main/node.h" #include "servers/audio/audio_stream.h" + #include "core/map.h" #include "core/object.h" #include "core/object_id.h" diff --git a/editor/code_editor.h b/editor/code_editor.h index f0b3bbb0e..1616408fa 100644 --- a/editor/code_editor.h +++ b/editor/code_editor.h @@ -30,21 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/editor_plugin.h" -#include "scene/gui/check_box.h" -#include "scene/gui/check_button.h" #include "scene/gui/dialogs.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/text_edit.h" -#include "scene/gui/tool_button.h" -#include "scene/main/timer.h" +#include "scene/gui/box_container.h" + #include "core/list.h" #include "core/math/math_defs.h" #include "core/object.h" #include "core/reference.h" #include "core/ustring.h" #include "core/variant.h" -#include "scene/gui/box_container.h" class Button; class CheckBox; diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h index 25e02d013..39ed6031d 100644 --- a/editor/connections_dialog.h +++ b/editor/connections_dialog.h @@ -34,23 +34,17 @@ @author Juan Linietsky */ -#include "core/undo_redo.h" -#include "editor/editor_inspector.h" -#include "editor/scene_tree_editor.h" -#include "scene/gui/button.h" -#include "scene/gui/check_button.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/popup.h" #include "scene/gui/tree.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/box_container.h" + +#include "core/undo_redo.h" #include "core/map.h" #include "core/node_path.h" #include "core/object.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/vector.h" -#include "scene/gui/box_container.h" class PopupMenu; class ConnectDialogBinds; diff --git a/editor/create_dialog.h b/editor/create_dialog.h index 75c4d5861..e8f34fd91 100644 --- a/editor/create_dialog.h +++ b/editor/create_dialog.h @@ -30,13 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor_help.h" -#include "scene/gui/button.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/label.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/tree.h" + #include "core/hash_map.h" #include "core/list.h" #include "core/math/vector2.h" diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h index e34cf7dac..7730d103b 100644 --- a/editor/dependency_editor.h +++ b/editor/dependency_editor.h @@ -30,10 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor_file_dialog.h" #include "scene/gui/dialogs.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/tree.h" + #include "core/hash_map.h" #include "core/list.h" #include "core/map.h" diff --git a/editor/dictionary_property_edit.h b/editor/dictionary_property_edit.h index b127253e7..32db82803 100644 --- a/editor/dictionary_property_edit.h +++ b/editor/dictionary_property_edit.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "scene/main/node.h" + #include "core/list.h" #include "core/object.h" #include "core/object_id.h" diff --git a/editor/editor_about.h b/editor/editor_about.h index c2d328a6d..0e9f0dd53 100644 --- a/editor/editor_about.h +++ b/editor/editor_about.h @@ -30,18 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/gui/control.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" -#include "editor_scale.h" + #include "core/list.h" #include "core/object.h" #include "core/ustring.h" diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h index 82abc54c0..b220bafb4 100644 --- a/editor/editor_audio_buses.h +++ b/editor/editor_audio_buses.h @@ -30,22 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/editor_file_dialog.h" #include "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.h" -#include "scene/gui/texture_rect.h" -#include "scene/gui/tool_button.h" -#include "scene/gui/tree.h" +#include "scene/gui/box_container.h" + +#include "scene/gui/line_edit.h" + #include "core/color.h" #include "core/list.h" #include "core/math/vector2.h" @@ -70,6 +61,7 @@ class TextureProgress; class Timer; class Tree; class VSlider; +class LineEdit; class EditorAudioBus : public PanelContainer { GDCLASS(EditorAudioBus, PanelContainer); diff --git a/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h index af27a8e97..3db2017be 100644 --- a/editor/editor_autoload_settings.h +++ b/editor/editor_autoload_settings.h @@ -30,14 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/gui/tree.h" -#include "editor_file_dialog.h" +#include "scene/gui/box_container.h" + #include "core/list.h" #include "core/math/vector2.h" #include "core/object.h" #include "core/ustring.h" #include "core/variant.h" -#include "scene/gui/box_container.h" class Button; class Control; diff --git a/editor/editor_data.h b/editor/editor_data.h index ec97ab4a1..ff06c50f1 100644 --- a/editor/editor_data.h +++ b/editor/editor_data.h @@ -30,18 +30,19 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/object.h" + +#include "editor/plugins/script_editor_plugin.h" +#include "scene/resources/texture.h" + #include "core/list.h" #include "core/pair.h" #include "core/undo_redo.h" -#include "editor/editor_plugin.h" -#include "editor/plugins/script_editor_plugin.h" -#include "scene/resources/texture.h" #include "core/array.h" #include "core/dictionary.h" #include "core/hash_map.h" #include "core/map.h" #include "core/node_path.h" -#include "core/object.h" #include "core/object_id.h" #include "core/reference.h" #include "core/script_language.h" diff --git a/editor/editor_dir_dialog.h b/editor/editor_dir_dialog.h index f14c3c52c..a7cb1c62c 100644 --- a/editor/editor_dir_dialog.h +++ b/editor/editor_dir_dialog.h @@ -30,10 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/os/dir_access.h" -#include "editor/editor_file_system.h" #include "scene/gui/dialogs.h" -#include "scene/gui/tree.h" + +#include "core/os/dir_access.h" #include "core/object.h" #include "core/set.h" #include "core/ustring.h" diff --git a/editor/editor_export.h b/editor/editor_export.h index 85efd8590..dd27106a7 100644 --- a/editor/editor_export.h +++ b/editor/editor_export.h @@ -30,17 +30,19 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/os/dir_access.h" +#include "core/reference.h" #include "core/resource.h" #include "scene/main/node.h" + #include "scene/main/timer.h" #include "scene/resources/texture.h" + +#include "core/os/dir_access.h" #include "core/error_list.h" #include "core/list.h" #include "core/map.h" #include "core/object.h" #include "core/pool_vector.h" -#include "core/reference.h" #include "core/set.h" #include "core/string_name.h" #include "core/typedefs.h" diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h index b9e545672..32722a52d 100644 --- a/editor/editor_file_dialog.h +++ b/editor/editor_file_dialog.h @@ -30,16 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/os/dir_access.h" -#include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/option_button.h" +#include "scene/gui/box_container.h" + #include "scene/gui/separator.h" -#include "scene/gui/split_container.h" -#include "scene/gui/texture_rect.h" -#include "scene/gui/tool_button.h" +#include "scene/gui/item_list.h" + +#include "core/os/dir_access.h" #include "core/method_bind.h" #include "core/object.h" #include "core/reference.h" diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h index 9d0d521cb..b2be42a27 100644 --- a/editor/editor_file_system.h +++ b/editor/editor_file_system.h @@ -30,17 +30,18 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/main/node.h" +#include "core/object.h" + #include "core/os/dir_access.h" #include "core/os/thread.h" #include "core/os/thread_safe.h" #include "core/safe_refcount.h" #include "core/set.h" -#include "scene/main/node.h" #include "core/error_list.h" #include "core/hash_map.h" #include "core/list.h" #include "core/map.h" -#include "core/object.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/vector.h" diff --git a/editor/editor_folding.h b/editor/editor_folding.h index 48599159b..8f45418dc 100644 --- a/editor/editor_folding.h +++ b/editor/editor_folding.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "scene/main/node.h" + #include "core/pool_vector.h" #include "core/resource.h" #include "core/set.h" diff --git a/editor/editor_help.h b/editor/editor_help.h index 9b8ad8e58..e7085dad6 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -30,17 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/code_editor.h" -#include "editor/doc/doc_data.h" -#include "editor/editor_plugin.h" -#include "scene/gui/margin_container.h" -#include "scene/gui/menu_button.h" +#include "scene/gui/box_container.h" #include "scene/gui/panel_container.h" + +#include "editor/doc/doc_data.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 "core/color.h" #include "core/error_list.h" #include "core/map.h" @@ -48,7 +43,7 @@ #include "core/reference.h" #include "core/ustring.h" #include "core/vector.h" -#include "scene/gui/box_container.h" + class ConfirmationDialog; class HSplitContainer; diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h index cd4132be4..1cc259161 100644 --- a/editor/editor_help_search.h +++ b/editor/editor_help_search.h @@ -30,20 +30,17 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ordered_hash_map.h" -#include "editor/code_editor.h" -#include "editor/editor_help.h" -#include "editor/editor_plugin.h" -#include "scene/gui/option_button.h" -#include "scene/gui/tree.h" +#include "core/reference.h" +#include "scene/gui/dialogs.h" + #include "core/color.h" #include "core/map.h" #include "core/object.h" -#include "core/reference.h" #include "core/ustring.h" #include "core/vector.h" +#include "core/ordered_hash_map.h" + #include "editor/doc/doc_data.h" -#include "scene/gui/dialogs.h" #include "scene/resources/texture.h" class Control; diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index e165e4df6..1ac674559 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -30,9 +30,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/gui/box_container.h" -#include "scene/gui/line_edit.h" +#include "core/reference.h" #include "scene/gui/scroll_container.h" +#include "scene/gui/container.h" +#include "scene/gui/control.h" + #include "core/color.h" #include "core/list.h" #include "core/map.h" @@ -40,15 +42,14 @@ #include "core/math/vector2.h" #include "core/object.h" #include "core/object_id.h" -#include "core/reference.h" + #include "core/resource.h" #include "core/set.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" -#include "scene/gui/container.h" -#include "scene/gui/control.h" + #include "scene/resources/texture.h" class UndoRedo; diff --git a/editor/editor_layouts_dialog.h b/editor/editor_layouts_dialog.h index eb72806b9..b2f74cc3b 100644 --- a/editor/editor_layouts_dialog.h +++ b/editor/editor_layouts_dialog.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/gui/dialogs.h" -#include "core/object.h" + #include "core/reference.h" class LineEdit; diff --git a/editor/editor_log.h b/editor/editor_log.h index 936778a2f..a23469772 100644 --- a/editor/editor_log.h +++ b/editor/editor_log.h @@ -30,17 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/gui/control.h" -#include "scene/gui/label.h" -#include "scene/gui/rich_text_label.h" -#include "scene/gui/texture_button.h" -//#include "scene/gui/empty_control.h" -#include "core/os/thread.h" -#include "pane_drag.h" #include "scene/gui/box_container.h" -#include "scene/gui/panel_container.h" -#include "scene/gui/texture_rect.h" -#include "scene/gui/tool_button.h" + +#include "core/os/thread.h" #include "core/error_macros.h" #include "core/object.h" #include "core/ustring.h" diff --git a/editor/editor_network_profiler.h b/editor/editor_network_profiler.h index e81ab30d4..cc23b60b0 100644 --- a/editor/editor_network_profiler.h +++ b/editor/editor_network_profiler.h @@ -31,10 +31,7 @@ /*************************************************************************/ #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" + #include "core/io/multiplayer_api.h" #include "core/map.h" #include "core/object.h" diff --git a/editor/editor_node.h b/editor/editor_node.h index 756c08a76..c0b678f65 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -30,21 +30,24 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/safe_refcount.h" -#include "editor/editor_data.h" -#include "editor/editor_folding.h" -#include "editor/editor_run.h" +#include "core/object.h" +#include "scene/main/node.h" + #include "editor/inspector_dock.h" -#include "editor/property_editor.h" #include "editor/scene_tree_dock.h" -#include "scene/gui/link_button.h" +#include "editor/editor_run.h" +#include "editor/editor_folding.h" + +#include "scene/gui/split_container.h" +#include "scene/gui/menu_button.h" + #include "core/dictionary.h" #include "core/error_list.h" #include "core/list.h" #include "core/map.h" #include "core/math/rect2.h" #include "core/node_path.h" -#include "core/object.h" +#include "core/safe_refcount.h" #include "core/os/mutex.h" #include "core/os/os.h" #include "core/os/thread.h" @@ -58,7 +61,7 @@ #include "core/variant.h" #include "core/vector.h" #include "scene/gui/control.h" -#include "scene/main/node.h" + #include "scene/resources/texture.h" #include "scene/resources/theme.h" diff --git a/editor/editor_path.h b/editor/editor_path.h index 9fbd7b026..64dccf9aa 100644 --- a/editor/editor_path.h +++ b/editor/editor_path.h @@ -30,11 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor_data.h" -#include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/gui/popup_menu.h" -#include "core/object.h" + #include "core/object_id.h" #include "core/vector.h" diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index 8cef3223a..7de484d2d 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -30,15 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/io/config_file.h" -#include "core/undo_redo.h" -#include "editor/editor_inspector.h" -#include "editor/import/editor_import_plugin.h" -#include "editor/import/resource_importer_scene.h" -#include "editor/script_create_dialog.h" -#include "scene/gui/tool_button.h" #include "scene/main/node.h" + +#include "scene/gui/tool_button.h" + #include "scene/resources/texture.h" + #include "core/array.h" #include "core/dictionary.h" #include "core/error_list.h" @@ -51,6 +48,8 @@ #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" +#include "core/io/config_file.h" +#include "core/undo_redo.h" class EditorNode; class Spatial; diff --git a/editor/editor_plugin_settings.h b/editor/editor_plugin_settings.h index 1668a47c5..b16dd089a 100644 --- a/editor/editor_plugin_settings.h +++ b/editor/editor_plugin_settings.h @@ -30,15 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/undo_redo.h" -#include "editor/plugin_config_dialog.h" -#include "editor_data.h" -#include "property_editor.h" -#include "scene/gui/dialogs.h" +#include "scene/gui/box_container.h" + #include "core/object.h" #include "core/ustring.h" #include "core/vector.h" -#include "scene/gui/box_container.h" + class Button; class PluginConfigDialog; diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h index b6c7c360a..342d63fa1 100644 --- a/editor/editor_profiler.h +++ b/editor/editor_profiler.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "scene/gui/box_container.h" + #include "scene/gui/button.h" #include "scene/gui/label.h" #include "scene/gui/option_button.h" @@ -38,6 +39,7 @@ #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" @@ -48,6 +50,7 @@ #include "core/typedefs.h" #include "core/ustring.h" #include "core/vector.h" + #include "scene/resources/texture.h" class Button; diff --git a/editor/editor_properties.h b/editor/editor_properties.h index 51572ee63..e3766dcdd 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -30,14 +30,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/create_dialog.h" #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 f67221ae3..59823d9eb 100644 --- a/editor/editor_properties_array_dict.h +++ b/editor/editor_properties_array_dict.h @@ -31,14 +31,16 @@ /*************************************************************************/ #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" #include "core/object_id.h" -#include "core/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant.h" diff --git a/editor/editor_property_name_processor.h b/editor/editor_property_name_processor.h index 84e07a4f9..689ae28d9 100644 --- a/editor/editor_property_name_processor.h +++ b/editor/editor_property_name_processor.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "scene/main/node.h" + #include "core/map.h" #include "core/object.h" #include "core/ustring.h" diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h index f68a28043..13da8dedc 100644 --- a/editor/editor_resource_picker.h +++ b/editor/editor_resource_picker.h @@ -30,12 +30,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/box_container.h" + #include "editor_file_dialog.h" #include "quick_open.h" -#include "scene/gui/box_container.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_resource_preview.h b/editor/editor_resource_preview.h index 2ba104fb4..381d2b6fa 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -30,24 +30,26 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/main/node.h" +#include "core/reference.h" + #include "core/os/semaphore.h" #include "core/os/thread.h" #include "core/safe_refcount.h" -#include "scene/main/node.h" -#include "scene/resources/texture.h" #include "core/list.h" #include "core/map.h" #include "core/math/vector2.h" #include "core/object.h" #include "core/object_id.h" #include "core/os/mutex.h" -#include "core/reference.h" #include "core/resource.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" +#include "scene/resources/texture.h" + class EditorResourcePreviewGenerator : public Reference { GDCLASS(EditorResourcePreviewGenerator, Reference); diff --git a/editor/editor_run.h b/editor/editor_run.h index 892b6af07..f2df43511 100644 --- a/editor/editor_run.h +++ b/editor/editor_run.h @@ -31,7 +31,9 @@ /*************************************************************************/ #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 85cca653b..73ab6b7c1 100644 --- a/editor/editor_run_native.h +++ b/editor/editor_run_native.h @@ -31,7 +31,9 @@ /*************************************************************************/ #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 004a62a71..01a377174 100644 --- a/editor/editor_run_script.h +++ b/editor/editor_run_script.h @@ -31,7 +31,9 @@ /*************************************************************************/ #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 efc5a8951..e81d1309a 100644 --- a/editor/editor_sectioned_inspector.h +++ b/editor/editor_sectioned_inspector.h @@ -30,9 +30,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/editor_inspector.h" #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_settings.h b/editor/editor_settings.h index fe2019641..e4a53d6fe 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -30,12 +30,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/resource.h" + +#include "scene/gui/shortcut.h" + #include "core/object.h" #include "core/io/config_file.h" #include "core/os/thread_safe.h" -#include "core/resource.h" #include "core/translation.h" -#include "scene/gui/shortcut.h" #include "core/hash_map.h" #include "core/list.h" #include "core/map.h" diff --git a/editor/editor_spin_slider.h b/editor/editor_spin_slider.h index 4bb53ed30..45accc74f 100644 --- a/editor/editor_spin_slider.h +++ b/editor/editor_spin_slider.h @@ -30,9 +30,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/gui/line_edit.h" #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 be52f1088..d3433b998 100644 --- a/editor/editor_sub_scene.h +++ b/editor/editor_sub_scene.h @@ -30,9 +30,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/editor_file_dialog.h" #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 a624ffbf2..7bc36e509 100644 --- a/editor/export_template_manager.h +++ b/editor/export_template_manager.h @@ -30,13 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/editor_settings.h" #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 dc060abe3..b5b5561d6 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "scene/gui/box_container.h" + #include "scene/gui/control.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" @@ -42,13 +43,14 @@ #include "scene/gui/tool_button.h" #include "scene/gui/tree.h" #include "scene/main/timer.h" -#include "core/os/dir_access.h" -#include "core/os/thread.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" #include "core/list.h" #include "core/map.h" #include "core/math/vector2.h" diff --git a/editor/find_in_files.h b/editor/find_in_files.h index dba7dcbb3..b65632394 100644 --- a/editor/find_in_files.h +++ b/editor/find_in_files.h @@ -30,16 +30,17 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/hash_map.h" #include "scene/gui/dialogs.h" +#include "scene/gui/control.h" +#include "scene/main/node.h" + +#include "core/hash_map.h" #include "core/map.h" #include "core/object.h" #include "core/set.h" #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" -#include "scene/gui/control.h" -#include "scene/main/node.h" class Button; class Label; diff --git a/editor/groups_editor.h b/editor/groups_editor.h index b64062953..595844c1a 100644 --- a/editor/groups_editor.h +++ b/editor/groups_editor.h @@ -30,18 +30,21 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#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/dialogs.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" -#include "scene/gui/box_container.h" + class Button; class Label; diff --git a/editor/import_defaults_editor.h b/editor/import_defaults_editor.h index 32672c93f..435fb6cb5 100644 --- a/editor/import_defaults_editor.h +++ b/editor/import_defaults_editor.h @@ -30,6 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/box_container.h" + #include "core/undo_redo.h" #include "editor/editor_data.h" #include "editor/editor_plugin_settings.h" @@ -37,8 +39,9 @@ #include "editor_autoload_settings.h" #include "scene/gui/center_container.h" #include "scene/gui/option_button.h" + #include "core/object.h" -#include "scene/gui/box_container.h" + class ImportDefaultsEditorSettings; class Button; diff --git a/editor/import_dock.h b/editor/import_dock.h index 3c4d685de..dad83b335 100644 --- a/editor/import_dock.h +++ b/editor/import_dock.h @@ -30,15 +30,18 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/io/config_file.h" -#include "core/io/resource_importer.h" +#include "scene/gui/box_container.h" + + #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" +#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 444acd9b8..f1aa4942c 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -30,18 +30,20 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#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/box_container.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/editor/multi_node_edit.h b/editor/multi_node_edit.h index 43c688477..a79ef61bc 100644 --- a/editor/multi_node_edit.h +++ b/editor/multi_node_edit.h @@ -30,11 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/reference.h" + #include "scene/main/node.h" #include "core/list.h" #include "core/node_path.h" #include "core/object.h" -#include "core/reference.h" + #include "core/string_name.h" #include "core/ustring.h" #include "core/variant.h" diff --git a/editor/node_dock.h b/editor/node_dock.h index 5a2c9edfc..88ea681cc 100644 --- a/editor/node_dock.h +++ b/editor/node_dock.h @@ -30,10 +30,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/box_container.h" + #include "connections_dialog.h" #include "groups_editor.h" #include "core/object.h" -#include "scene/gui/box_container.h" class ConnectionsDock; class GroupsEditor; diff --git a/editor/pane_drag.h b/editor/pane_drag.h index 338c4b29b..f0f00d491 100644 --- a/editor/pane_drag.h +++ b/editor/pane_drag.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "scene/gui/control.h" + #include "core/math/vector2.h" #include "core/object.h" #include "core/reference.h" diff --git a/editor/plugin_config_dialog.h b/editor/plugin_config_dialog.h index 6304c427a..85799f272 100644 --- a/editor/plugin_config_dialog.h +++ b/editor/plugin_config_dialog.h @@ -30,12 +30,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" + +#include "scene/gui/check_box.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/gui/text_edit.h" #include "core/object.h" + #include "core/ustring.h" class CheckBox; diff --git a/editor/plugins/item_list_editor_plugin.h b/editor/plugins/item_list_editor_plugin.h index 70289d062..4401b9e09 100644 --- a/editor/plugins/item_list_editor_plugin.h +++ b/editor/plugins/item_list_editor_plugin.h @@ -34,6 +34,9 @@ #include "scene/gui/box_container.h" #include "editor/editor_plugin.h" +#include "scene/gui/option_button.h" +#include "scene/gui/item_list.h" + #include "scene/gui/popup_menu.h" #include "core/list.h" #include "core/reference.h" diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index 0778259f9..b2cf3d510 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -31,6 +31,7 @@ /*************************************************************************/ #include "editor/editor_plugin.h" +#include "editor/editor_inspector.h" #include "scene/gui/viewport_container.h" #include "core/object.h" diff --git a/editor/progress_dialog.h b/editor/progress_dialog.h index 4855d26e8..199b9959e 100644 --- a/editor/progress_dialog.h +++ b/editor/progress_dialog.h @@ -31,12 +31,14 @@ /*************************************************************************/ #include "scene/gui/box_container.h" +#include "scene/gui/popup.h" + #include "scene/gui/button.h" #include "scene/gui/label.h" -#include "scene/gui/popup.h" #include "scene/gui/progress_bar.h" -#include "core/map.h" #include "core/object.h" + +#include "core/map.h" #include "core/os/thread_safe.h" #include "core/ustring.h" diff --git a/editor/project_export.h b/editor/project_export.h index a6b714cb6..670fb6a0b 100644 --- a/editor/project_export.h +++ b/editor/project_export.h @@ -30,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/os/dir_access.h" -#include "core/os/thread.h" +#include "scene/gui/dialogs.h" + #include "editor/editor_export.h" #include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" @@ -40,7 +40,6 @@ #include "scene/gui/button.h" #include "scene/gui/check_button.h" #include "scene/gui/control.h" -#include "scene/gui/dialogs.h" #include "scene/gui/file_dialog.h" #include "scene/gui/label.h" #include "scene/gui/link_button.h" @@ -51,8 +50,11 @@ #include "scene/gui/tab_container.h" #include "scene/gui/tree.h" #include "scene/main/timer.h" -#include "core/math/vector2.h" #include "core/object.h" + +#include "core/os/dir_access.h" +#include "core/os/thread.h" +#include "core/math/vector2.h" #include "core/reference.h" #include "core/string_name.h" #include "core/ustring.h" diff --git a/editor/project_manager.h b/editor/project_manager.h index 9a81e9bad..f4100f74b 100644 --- a/editor/project_manager.h +++ b/editor/project_manager.h @@ -30,6 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/box_container.h" +#include "scene/gui/control.h" + #include "editor/editor_about.h" #include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" @@ -37,13 +40,12 @@ #include "scene/gui/scroll_container.h" #include "scene/gui/tool_button.h" #include "scene/gui/tree.h" + #include "core/list.h" #include "core/object.h" #include "core/reference.h" #include "core/ustring.h" #include "core/variant.h" -#include "scene/gui/box_container.h" -#include "scene/gui/control.h" class ProjectDialog; class ProjectList; diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index b8131e99e..91abfb56c 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -30,16 +30,18 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/dialogs.h" + #include "core/undo_redo.h" #include "editor/editor_autoload_settings.h" #include "editor/editor_data.h" #include "editor/editor_plugin_settings.h" #include "editor/editor_sectioned_inspector.h" #include "editor/import_defaults_editor.h" -#include "scene/gui/dialogs.h" #include "scene/gui/tab_container.h" -#include "core/math/vector2.h" #include "core/object.h" + +#include "core/math/vector2.h" #include "core/os/input_event.h" #include "core/reference.h" #include "core/ustring.h" diff --git a/editor/property_editor.h b/editor/property_editor.h index 55d5c727e..847323a65 100644 --- a/editor/property_editor.h +++ b/editor/property_editor.h @@ -30,13 +30,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/reference.h" +#include "scene/gui/popup.h" + +#include "scene/gui/dialogs.h" #include "editor/editor_file_dialog.h" #include "editor/scene_tree_editor.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/color_picker.h" -#include "scene/gui/dialogs.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" #include "scene/gui/menu_button.h" @@ -44,15 +47,14 @@ #include "scene/gui/text_edit.h" #include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" + #include "core/list.h" #include "core/math/math_defs.h" #include "core/node_path.h" -#include "core/object.h" -#include "core/reference.h" #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" -#include "scene/gui/popup.h" + class PropertyValueEvaluator; class CreateDialog; diff --git a/editor/property_selector.h b/editor/property_selector.h index 04dc44a25..9fa2f4263 100644 --- a/editor/property_selector.h +++ b/editor/property_selector.h @@ -30,16 +30,18 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/dialogs.h" + #include "editor/property_editor.h" #include "editor_help.h" #include "scene/gui/rich_text_label.h" #include "core/object.h" + #include "core/object_id.h" #include "core/reference.h" #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" -#include "scene/gui/dialogs.h" class EditorHelpBit; class InputEvent; diff --git a/editor/quick_open.h b/editor/quick_open.h index a9cdfa258..61e601a7f 100644 --- a/editor/quick_open.h +++ b/editor/quick_open.h @@ -30,11 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/pair.h" -#include "editor_file_system.h" #include "scene/gui/dialogs.h" + +#include "editor_file_system.h" #include "scene/gui/tree.h" #include "core/object.h" + +#include "core/pair.h" #include "core/reference.h" #include "core/string_name.h" #include "core/ustring.h" diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h index f3da9ce1d..08e016df5 100644 --- a/editor/rename_dialog.h +++ b/editor/rename_dialog.h @@ -31,6 +31,9 @@ /*************************************************************************/ #include "modules/modules_enabled.gen.h" // For regex. + +#ifdef MODULE_REGEX_ENABLED + #include "core/error_macros.h" #include "core/list.h" #include "core/node_path.h" @@ -38,6 +41,15 @@ #include "core/pair.h" #include "core/ustring.h" +#include "scene/gui/dialogs.h" + +#include "scene/gui/check_box.h" +#include "scene/gui/option_button.h" +#include "scene/gui/spin_box.h" +#include "core/undo_redo.h" +#include "editor/scene_tree_editor.h" + +class CheckButton; class Array; class Button; class CheckBox; @@ -49,16 +61,7 @@ class SceneTreeEditor; class SpinBox; class TabContainer; class UndoRedo; -#ifdef MODULE_REGEX_ENABLED -#include "scene/gui/check_box.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/option_button.h" -#include "scene/gui/spin_box.h" -#include "core/undo_redo.h" -#include "editor/scene_tree_editor.h" - -class CheckButton; /** @author Blazej Floch diff --git a/editor/reparent_dialog.h b/editor/reparent_dialog.h index cbbc6aaed..d253bea4a 100644 --- a/editor/reparent_dialog.h +++ b/editor/reparent_dialog.h @@ -30,13 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/dialogs.h" + #include "editor/scene_tree_editor.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" -#include "scene/gui/dialogs.h" #include "scene/gui/line_edit.h" #include "core/object.h" + #include "core/set.h" class CheckBox; diff --git a/editor/run_settings_dialog.h b/editor/run_settings_dialog.h index bc7830d01..651996d52 100644 --- a/editor/run_settings_dialog.h +++ b/editor/run_settings_dialog.h @@ -30,11 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/gui/check_button.h" #include "scene/gui/dialogs.h" + +#include "scene/gui/check_button.h" #include "scene/gui/file_dialog.h" #include "scene/gui/line_edit.h" #include "core/object.h" + #include "core/ustring.h" class LineEdit; diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index 62b7ab3ba..be93acedd 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -30,6 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/box_container.h" + #include "editor/connections_dialog.h" #include "editor/create_dialog.h" #include "editor/editor_data.h" @@ -40,7 +42,6 @@ #include "editor/reparent_dialog.h" #include "editor/script_create_dialog.h" #include "scene/animation/animation_player.h" -#include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/control.h" #include "scene/gui/label.h" @@ -48,12 +49,12 @@ #include "scene/gui/tool_button.h" #include "scene/gui/tree.h" #include "scene_tree_editor.h" -#include "modules/modules_enabled.gen.h" // For regex. +#include "core/object.h" + #include "core/hash_map.h" #include "core/list.h" #include "core/map.h" #include "core/node_path.h" -#include "core/object.h" #include "core/object_id.h" #include "core/reference.h" #include "core/resource.h" @@ -61,6 +62,8 @@ #include "core/ustring.h" #include "core/vector.h" +#include "modules/modules_enabled.gen.h" // For regex. + class EditorNode; class AcceptDialog; class Animation; diff --git a/editor/scene_tree_editor.h b/editor/scene_tree_editor.h index c5c511825..52742a3b0 100644 --- a/editor/scene_tree_editor.h +++ b/editor/scene_tree_editor.h @@ -30,23 +30,25 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/control.h" +#include "scene/gui/dialogs.h" + #include "core/undo_redo.h" #include "editor_data.h" #include "editor_settings.h" #include "scene/gui/button.h" -#include "scene/gui/dialogs.h" #include "scene/gui/tree.h" +#include "core/object.h" + #include "core/list.h" #include "core/math/vector2.h" #include "core/node_path.h" -#include "core/object.h" #include "core/object_id.h" #include "core/set.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" -#include "scene/gui/control.h" class EditorSelection; class LineEdit; diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h index 40da043f8..c59b9edcc 100644 --- a/editor/script_create_dialog.h +++ b/editor/script_create_dialog.h @@ -30,14 +30,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/dialogs.h" + #include "editor/editor_file_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" + #include "core/map.h" #include "core/object.h" #include "core/ustring.h" diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h index f0c01c93f..3715f7ba5 100644 --- a/editor/script_editor_debugger.h +++ b/editor/script_editor_debugger.h @@ -30,14 +30,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/margin_container.h" + #include "core/io/packet_peer.h" #include "core/io/tcp_server.h" #include "editor/editor_inspector.h" #include "editor/property_editor.h" #include "scene/3d/camera.h" #include "scene/gui/box_container.h" -#include "scene/gui/margin_container.h" #include "scene/gui/button.h" + #include "core/array.h" #include "core/hash_map.h" #include "core/list.h" diff --git a/editor/settings_config_dialog.h b/editor/settings_config_dialog.h index 64e4ab2b8..e718ac3c5 100644 --- a/editor/settings_config_dialog.h +++ b/editor/settings_config_dialog.h @@ -30,14 +30,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "scene/gui/dialogs.h" + #include "editor/editor_sectioned_inspector.h" #include "editor_inspector.h" -#include "scene/gui/dialogs.h" #include "scene/gui/panel_container.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" #include "scene/gui/tool_button.h" + #include "core/object.h" #include "core/reference.h" #include "core/ustring.h" diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h index 0c1a7faa9..160e48fb5 100644 --- a/editor/spatial_editor_gizmos.h +++ b/editor/spatial_editor_gizmos.h @@ -31,7 +31,9 @@ /*************************************************************************/ #include "editor/plugins/spatial_editor_plugin.h" + #include "scene/3d/camera.h" + #include "core/color.h" #include "core/math/basis.h" #include "core/math/math_defs.h" @@ -42,6 +44,7 @@ #include "core/ustring.h" #include "core/variant.h" #include "core/vector.h" + #include "scene/resources/mesh.h" class Camera; diff --git a/modules/skeleton_editor/spatial_editor_gizmos.cpp b/modules/skeleton_editor/spatial_editor_gizmos.cpp index 2de21d727..0b2dbe5ac 100644 --- a/modules/skeleton_editor/spatial_editor_gizmos.cpp +++ b/modules/skeleton_editor/spatial_editor_gizmos.cpp @@ -33,6 +33,7 @@ #include "scene/3d/skeleton.h" #include "scene/resources/skin.h" #include "scene/resources/surface_tool.h" +#include "editor/editor_settings.h" ModuleSkeletonSpatialGizmoPlugin::ModuleSkeletonSpatialGizmoPlugin() { skeleton_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/skeleton", Color(1, 0.8, 0.4));