diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-15 16:22:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-15 16:22:11 +0100 |
| commit | fa67046e983a137e612b00e3de1d445cc4aa24ce (patch) | |
| tree | 32280e24a2957b4edf32157f40a43a602ff147fb | |
| parent | 1d910b1e5868814938d644ff181cf30d75516762 (diff) | |
| parent | 11572c6e309692b62554ae852dfa8fb8943bcbd7 (diff) | |
Merge pull request #58136 from akien-mga/editor-includes-cleanup
142 files changed, 161 insertions, 248 deletions
diff --git a/editor/action_map_editor.cpp b/editor/action_map_editor.cpp index 2b407ecacf..6fd0132ab1 100644 --- a/editor/action_map_editor.cpp +++ b/editor/action_map_editor.cpp @@ -29,10 +29,10 @@ /*************************************************************************/ #include "action_map_editor.h" + #include "core/input/input_map.h" #include "core/os/keyboard.h" #include "editor/editor_scale.h" -#include "scene/gui/center_container.h" #include "scene/gui/separator.h" ///////////////////////////////////////// diff --git a/editor/action_map_editor.h b/editor/action_map_editor.h index 9988cd8db6..de24d3ee1f 100644 --- a/editor/action_map_editor.h +++ b/editor/action_map_editor.h @@ -31,8 +31,14 @@ #ifndef ACTION_MAP_EDITOR_H #define ACTION_MAP_EDITOR_H -#include "editor/editor_data.h" +#include "scene/gui/check_box.h" +#include "scene/gui/check_button.h" #include "scene/gui/color_rect.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/label.h" +#include "scene/gui/option_button.h" +#include "scene/gui/tab_container.h" +#include "scene/gui/tree.h" // Confirmation Dialog used when configuring an input event. // Separate from ActionMapEditor for code cleanliness and separation of responsibilities. diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 3be6d6ea12..56dcd35c64 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -31,14 +31,11 @@ #include "code_editor.h" #include "core/input/input.h" -#include "core/object/message_queue.h" #include "core/os/keyboard.h" #include "core/string/string_builder.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "scene/gui/margin_container.h" -#include "scene/gui/separator.h" +#include "editor/plugins/script_editor_plugin.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 a385ae2287..aebdfe57c0 100644 --- a/editor/code_editor.h +++ b/editor/code_editor.h @@ -31,11 +31,12 @@ #ifndef CODE_EDITOR_H #define CODE_EDITOR_H -#include "editor/editor_plugin.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" #include "scene/gui/check_box.h" -#include "scene/gui/check_button.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" diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 3f221cd7e0..d4785afcf0 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -30,16 +30,12 @@ #include "connections_dialog.h" -#include "core/string/print_string.h" #include "editor/doc_tools.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/scene_tree_dock.h" #include "plugins/script_editor_plugin.h" -#include "scene/gui/label.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/spin_box.h" static Node *_find_first_script(Node *p_root, Node *p_node) { if (p_node != p_root && p_node->get_owner() != p_root) { diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h index 83419a8e08..a075ff0c55 100644 --- a/editor/connections_dialog.h +++ b/editor/connections_dialog.h @@ -35,16 +35,19 @@ #include "editor/editor_inspector.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/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/spin_box.h" #include "scene/gui/tree.h" -class PopupMenu; class ConnectDialogBinds; -class SpinBox; class ConnectDialog : public ConfirmationDialog { GDCLASS(ConnectDialog, ConfirmationDialog); diff --git a/editor/debugger/debug_adapter/debug_adapter_parser.cpp b/editor/debugger/debug_adapter/debug_adapter_parser.cpp index ff4051fc67..e7baeeeded 100644 --- a/editor/debugger/debug_adapter/debug_adapter_parser.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_parser.cpp @@ -34,6 +34,7 @@ #include "editor/debugger/script_editor_debugger.h" #include "editor/editor_node.h" #include "editor/editor_run_native.h" +#include "editor/plugins/script_editor_plugin.h" void DebugAdapterParser::_bind_methods() { // Requests diff --git a/editor/debugger/script_editor_debugger.h b/editor/debugger/script_editor_debugger.h index b673df6191..e4d3a2fa09 100644 --- a/editor/debugger/script_editor_debugger.h +++ b/editor/debugger/script_editor_debugger.h @@ -39,7 +39,6 @@ #include "scene/gui/margin_container.h" class Tree; -class EditorNode; class LineEdit; class TabContainer; class RichTextLabel; diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 2eae08e741..4ba30eaa0e 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -34,7 +34,6 @@ #include "core/donors.gen.h" #include "core/license.gen.h" #include "core/version.h" -#include "editor/editor_node.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/editor_data.cpp b/editor/editor_data.cpp index ff452f8a96..91bd89b201 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -31,11 +31,11 @@ #include "editor_data.h" #include "core/config/project_settings.h" -#include "core/io/dir_access.h" #include "core/io/file_access.h" #include "core/io/resource_loader.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/editor_plugin.h" +#include "editor/plugins/script_editor_plugin.h" #include "scene/resources/packed_scene.h" void EditorHistory::cleanup_history() { diff --git a/editor/editor_data.h b/editor/editor_data.h index e485d47bf6..0d1efc9b62 100644 --- a/editor/editor_data.h +++ b/editor/editor_data.h @@ -33,11 +33,11 @@ #include "core/object/undo_redo.h" #include "core/templates/list.h" -#include "core/templates/pair.h" -#include "editor/editor_plugin.h" -#include "editor/plugins/script_editor_plugin.h" #include "scene/resources/texture.h" +class ConfigFile; +class EditorPlugin; + class EditorHistory { enum { HISTORY_MAX = 64 @@ -59,8 +59,6 @@ class EditorHistory { Vector<History> history; int current; - //Vector<EditorPlugin*> editor_plugins; - struct PropertyData { String name; Variant value; diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index eee67693e2..98ae459c76 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -45,6 +45,7 @@ #include "core/version.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" #include "editor/editor_settings.h" #include "editor/plugins/script_editor_plugin.h" #include "scene/resources/resource_format_text.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 43100ebf12..208640a2e3 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -69,6 +69,7 @@ #include "servers/physics_server_2d.h" #include "servers/rendering/rendering_device.h" +#include "editor/animation_track_editor.h" #include "editor/audio_stream_preview.h" #include "editor/debugger/debug_adapter/debug_adapter_server.h" #include "editor/debugger/editor_debugger_node.h" @@ -103,12 +104,12 @@ #include "editor/editor_translation_parser.h" #include "editor/export_template_manager.h" #include "editor/filesystem_dock.h" -#include "editor/import/dynamicfont_import_settings.h" +#include "editor/import/dynamic_font_import_settings.h" #include "editor/import/editor_import_collada.h" #include "editor/import/resource_importer_bitmask.h" #include "editor/import/resource_importer_bmfont.h" #include "editor/import/resource_importer_csv_translation.h" -#include "editor/import/resource_importer_dynamicfont.h" +#include "editor/import/resource_importer_dynamic_font.h" #include "editor/import/resource_importer_image.h" #include "editor/import/resource_importer_imagefont.h" #include "editor/import/resource_importer_layered_texture.h" diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index 716f10c679..5cb3d0cd75 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -30,6 +30,7 @@ #include "editor_path.h" +#include "editor/editor_data.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" diff --git a/editor/editor_path.h b/editor/editor_path.h index 04cf3d2ca7..539ae7a11d 100644 --- a/editor/editor_path.h +++ b/editor/editor_path.h @@ -31,10 +31,13 @@ #ifndef EDITOR_PATH_H #define EDITOR_PATH_H -#include "editor/editor_data.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 EditorHistory; class EditorPath : public Button { GDCLASS(EditorPath, Button); diff --git a/editor/editor_paths.cpp b/editor/editor_paths.cpp index c209238447..7b454055e0 100644 --- a/editor/editor_paths.cpp +++ b/editor/editor_paths.cpp @@ -34,7 +34,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/os/os.h" -#include "main/main.h" // For `is_project_manager`. +#include "main/main.h" EditorPaths *EditorPaths::singleton = nullptr; diff --git a/editor/editor_paths.h b/editor/editor_paths.h index 4b814707b2..7d863a7c6c 100644 --- a/editor/editor_paths.h +++ b/editor/editor_paths.h @@ -32,6 +32,7 @@ #define EDITOR_PATHS_H #include "core/object/class_db.h" +#include "core/object/object.h" #include "core/string/ustring.h" class EditorPaths : public Object { diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 24ce9e2636..10a2af0cb0 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -37,11 +37,12 @@ #include "editor/editor_resource_preview.h" #include "editor/editor_settings.h" #include "editor/filesystem_dock.h" +#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/plugins/script_editor_plugin.h" #include "editor/project_settings_editor.h" #include "editor/scene_tree_dock.h" #include "main/main.h" -#include "plugins/canvas_item_editor_plugin.h" -#include "plugins/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" #include "scene/gui/popup_menu.h" #include "servers/rendering_server.h" diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp index 162e2192a3..3bd5abb296 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/editor_properties_array_dict.cpp @@ -32,9 +32,9 @@ #include "core/input/input.h" #include "core/io/marshalls.h" -#include "editor/editor_node.h" #include "editor/editor_properties.h" #include "editor/editor_scale.h" +#include "editor/inspector_dock.h" bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) { String name = p_name; diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index cb6901f130..2f14667fc0 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -36,6 +36,8 @@ #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/filesystem_dock.h" +#include "editor/plugins/script_editor_plugin.h" +#include "editor/quick_open.h" #include "editor/scene_tree_dock.h" HashMap<StringName, List<StringName>> EditorResourcePicker::allowed_types_cache; diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h index 192dca50ca..a6eff760e7 100644 --- a/editor/editor_resource_picker.h +++ b/editor/editor_resource_picker.h @@ -31,13 +31,13 @@ #ifndef EDITOR_RESOURCE_PICKER_H #define EDITOR_RESOURCE_PICKER_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" class EditorFileDialog; +class EditorQuickOpen; class EditorResourcePicker : public HBoxContainer { GDCLASS(EditorResourcePicker, HBoxContainer); diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 8a9ca53567..2bc92427e5 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -36,6 +36,7 @@ #include "core/io/resource_saver.h" #include "core/object/message_queue.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" diff --git a/editor/editor_run_script.h b/editor/editor_run_script.h index 1d2d53f299..28a854aaeb 100644 --- a/editor/editor_run_script.h +++ b/editor/editor_run_script.h @@ -33,7 +33,9 @@ #include "core/object/ref_counted.h" #include "editor/editor_plugin.h" + class EditorNode; + class EditorScript : public RefCounted { GDCLASS(EditorScript, RefCounted); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 4e1b7bde95..6bd11fcdd6 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -31,18 +31,22 @@ #include "editor_settings.h" #include "core/config/project_settings.h" +#include "core/input/input_event.h" #include "core/input/input_map.h" +#include "core/input/shortcut.h" #include "core/io/certs_compressed.gen.h" -#include "core/io/config_file.h" #include "core/io/dir_access.h" #include "core/io/file_access.h" #include "core/io/ip.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" +#include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" +#include "core/string/translation.h" #include "core/version.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" #include "editor/editor_translation.h" #include "scene/main/node.h" #include "scene/main/scene_tree.h" diff --git a/editor/editor_settings.h b/editor/editor_settings.h index 078abcb4d9..f0fec3acc7 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -31,15 +31,13 @@ #ifndef EDITOR_SETTINGS_H #define EDITOR_SETTINGS_H -#include "core/input/shortcut.h" #include "core/io/config_file.h" #include "core/io/resource.h" -#include "core/object/class_db.h" #include "core/os/thread_safe.h" -#include "core/string/translation.h" -#include "editor/editor_paths.h" class EditorPlugin; +class InputEvent; +class Shortcut; class EditorSettings : public Resource { GDCLASS(EditorSettings, Resource); diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp index 6a2e40387b..ccebca4cc9 100644 --- a/editor/editor_spin_slider.cpp +++ b/editor/editor_spin_slider.cpp @@ -33,7 +33,6 @@ #include "core/input/input.h" #include "core/math/expression.h" #include "core/os/keyboard.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" String EditorSpinSlider::get_tooltip(const Point2 &p_pos) const { diff --git a/editor/editor_toaster.cpp b/editor/editor_toaster.cpp index 121d1256dc..f96df86682 100644 --- a/editor/editor_toaster.cpp +++ b/editor/editor_toaster.cpp @@ -30,8 +30,8 @@ #include "editor_toaster.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/gui/button.h" #include "scene/gui/label.h" #include "scene/gui/panel_container.h" diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 379bbc343c..3cad600002 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -37,6 +37,7 @@ #include "core/os/keyboard.h" #include "core/version.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" #include "editor/editor_scale.h" #include "progress_dialog.h" #include "scene/gui/link_button.h" diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index c940e6bfc6..b41123c0dd 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -42,12 +42,13 @@ #include "editor/editor_resource_preview.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/import_dock.h" #include "editor/scene_tree_dock.h" -#include "import_dock.h" +#include "editor/shader_create_dialog.h" +#include "scene/gui/label.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" #include "servers/display_server.h" -#include "shader_create_dialog.h" FileSystemDock *FileSystemDock::singleton = nullptr; diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 0e27adb545..21c50beeb2 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -31,29 +31,22 @@ #ifndef FILESYSTEM_DOCK_H #define FILESYSTEM_DOCK_H +#include "editor/create_dialog.h" +#include "editor/dependency_editor.h" +#include "editor/editor_dir_dialog.h" +#include "editor/editor_file_system.h" +#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/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/progress_bar.h" #include "scene/gui/split_container.h" #include "scene/gui/tree.h" -#include "scene/main/timer.h" - -#include "core/io/dir_access.h" -#include "core/os/thread.h" - -#include "create_dialog.h" - -#include "dependency_editor.h" -#include "editor/editor_dir_dialog.h" -#include "editor/editor_file_system.h" -#include "script_create_dialog.h" -class EditorNode; class ShaderCreateDialog; class FileSystemDock : public VBoxContainer { diff --git a/editor/import/dynamicfont_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index ead3d67e39..864e69a16e 100644 --- a/editor/import/dynamicfont_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* dynamicfont_import_settings.cpp */ +/* dynamic_font_import_settings.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "dynamicfont_import_settings.h" +#include "dynamic_font_import_settings.h" #include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" diff --git a/editor/import/dynamicfont_import_settings.h b/editor/import/dynamic_font_import_settings.h index 8892e20ae6..7b2a9184a4 100644 --- a/editor/import/dynamicfont_import_settings.h +++ b/editor/import/dynamic_font_import_settings.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* dynamicfont_import_settings.h */ +/* dynamic_font_import_settings.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,10 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef FONTDATA_IMPORT_SETTINGS_H -#define FONTDATA_IMPORT_SETTINGS_H +#ifndef DYNAMIC_FONT_IMPORT_SETTINGS_H +#define DYNAMIC_FONT_IMPORT_SETTINGS_H -#include "editor/import/resource_importer_dynamicfont.h" +#include "editor/import/resource_importer_dynamic_font.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" @@ -41,7 +41,6 @@ #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" @@ -179,4 +178,4 @@ public: DynamicFontImportSettings(); }; -#endif // FONTDATA_IMPORT_SETTINGS_H +#endif // DYNAMIC_FONT_IMPORT_SETTINGS_H diff --git a/editor/import/resource_importer_bitmask.cpp b/editor/import/resource_importer_bitmask.cpp index 16b68bcc22..46d15e8989 100644 --- a/editor/import/resource_importer_bitmask.cpp +++ b/editor/import/resource_importer_bitmask.cpp @@ -29,13 +29,11 @@ /*************************************************************************/ #include "resource_importer_bitmask.h" -#include "core/io/config_file.h" + #include "core/io/image.h" #include "core/io/image_loader.h" -#include "editor/editor_file_system.h" -#include "editor/editor_node.h" +#include "core/io/resource_saver.h" #include "scene/resources/bit_map.h" -#include "scene/resources/texture.h" String ResourceImporterBitMap::get_importer_name() const { return "bitmap"; diff --git a/editor/import/resource_importer_bitmask.h b/editor/import/resource_importer_bitmask.h index e5cf1facff..6dd6843171 100644 --- a/editor/import/resource_importer_bitmask.h +++ b/editor/import/resource_importer_bitmask.h @@ -31,11 +31,8 @@ #ifndef RESOURCE_IMPORTER_BITMASK_H #define RESOURCE_IMPORTER_BITMASK_H -#include "core/io/image.h" #include "core/io/resource_importer.h" -class StreamBitMap; - class ResourceImporterBitMap : public ResourceImporter { GDCLASS(ResourceImporterBitMap, ResourceImporter); diff --git a/editor/import/resource_importer_dynamicfont.cpp b/editor/import/resource_importer_dynamic_font.cpp index 42be76ba12..70fc87ea3f 100644 --- a/editor/import/resource_importer_dynamicfont.cpp +++ b/editor/import/resource_importer_dynamic_font.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* resource_importer_dynamicfont.cpp */ +/* resource_importer_dynamic_font.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,12 +28,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "resource_importer_dynamicfont.h" +#include "resource_importer_dynamic_font.h" #include "core/io/file_access.h" #include "core/io/resource_saver.h" -#include "dynamicfont_import_settings.h" -#include "editor/editor_node.h" +#include "editor/import/dynamic_font_import_settings.h" +#include "scene/resources/font.h" +#include "servers/text_server.h" #include "modules/modules_enabled.gen.h" // For freetype. diff --git a/editor/import/resource_importer_dynamicfont.h b/editor/import/resource_importer_dynamic_font.h index a55d639e10..2761b418e1 100644 --- a/editor/import/resource_importer_dynamicfont.h +++ b/editor/import/resource_importer_dynamic_font.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* resource_importer_dynamicfont.h */ +/* resource_importer_dynamic_font.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,12 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCE_IMPORTER_FONT_DATA_H -#define RESOURCE_IMPORTER_FONT_DATA_H +#ifndef RESOURCE_IMPORTER_DYNAMIC_FONT_H +#define RESOURCE_IMPORTER_DYNAMIC_FONT_H #include "core/io/resource_importer.h" -#include "scene/resources/font.h" -#include "servers/text_server.h" class ResourceImporterDynamicFont : public ResourceImporter { GDCLASS(ResourceImporterDynamicFont, ResourceImporter); @@ -68,4 +66,4 @@ public: ResourceImporterDynamicFont(); }; -#endif // RESOURCE_IMPORTER_FONTDATA_H +#endif // RESOURCE_IMPORTER_DYNAMIC_FONT_H diff --git a/editor/import_defaults_editor.cpp b/editor/import_defaults_editor.cpp index 3ecf084ab1..767e2a7fad 100644 --- a/editor/import_defaults_editor.cpp +++ b/editor/import_defaults_editor.cpp @@ -31,6 +31,7 @@ #include "import_defaults_editor.h" #include "core/config/project_settings.h" +#include "core/io/resource_importer.h" #include "editor/action_map_editor.h" #include "editor/editor_autoload_settings.h" #include "editor/editor_plugin_settings.h" diff --git a/editor/import_defaults_editor.h b/editor/import_defaults_editor.h index 8eb6584b1e..ed94fe6156 100644 --- a/editor/import_defaults_editor.h +++ b/editor/import_defaults_editor.h @@ -32,6 +32,7 @@ #define IMPORT_DEFAULTS_EDITOR_H #include "scene/gui/box_container.h" +#include "scene/gui/button.h" #include "scene/gui/option_button.h" class ImportDefaultsEditorSettings; diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index 6df8dab8e7..087e51b0cb 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -33,7 +33,7 @@ #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" -#include "editor/plugins/animation_player_editor_plugin.h" +#include "editor/plugins/script_editor_plugin.h" InspectorDock *InspectorDock::singleton = nullptr; diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index 97c53ff63e..27552407bd 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -31,15 +31,17 @@ #ifndef INSPECTOR_DOCK_H #define INSPECTOR_DOCK_H -#include "editor/animation_track_editor.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/dialogs.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/tree.h" -class EditorNode; class EditorFileDialog; class InspectorDock : public VBoxContainer { diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h index 0c7b160db4..c0e7c1be2e 100644 --- a/editor/plugins/abstract_polygon_2d_editor.h +++ b/editor/plugins/abstract_polygon_2d_editor.h @@ -35,7 +35,6 @@ #include "scene/2d/polygon_2d.h" #include "scene/gui/box_container.h" -class EditorNode; class CanvasItemEditor; class AbstractPolygon2DEditor : public HBoxContainer { diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h index a52f901e5f..b1b905a3f5 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.h +++ b/editor/plugins/animation_blend_tree_editor_plugin.h @@ -40,7 +40,6 @@ #include "scene/gui/popup.h" #include "scene/gui/tree.h" -class EditorNode; class ProgressBar; class EditorFileDialog; diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index a273debefb..28b1126102 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -35,7 +35,6 @@ #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/os/keyboard.h" -#include "editor/animation_track_editor.h" #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h index 8f469dd32f..446c4d2f0e 100644 --- a/editor/plugins/animation_player_editor_plugin.h +++ b/editor/plugins/animation_player_editor_plugin.h @@ -31,6 +31,7 @@ #ifndef ANIMATION_PLAYER_EDITOR_PLUGIN_H #define ANIMATION_PLAYER_EDITOR_PLUGIN_H +#include "editor/animation_track_editor.h" #include "editor/editor_plugin.h" #include "scene/animation/animation_player.h" #include "scene/gui/dialogs.h" @@ -39,9 +40,7 @@ #include "scene/gui/texture_button.h" #include "scene/gui/tree.h" -class EditorNode; class EditorFileDialog; -class AnimationTrackEditor; class AnimationPlayerEditorPlugin; class AnimationPlayerEditor : public VBoxContainer { diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h index b739bf8b3c..5442584a40 100644 --- a/editor/plugins/animation_tree_editor_plugin.h +++ b/editor/plugins/animation_tree_editor_plugin.h @@ -39,8 +39,8 @@ #include "scene/gui/popup.h" #include "scene/gui/tree.h" -class EditorNode; class EditorFileDialog; + class AnimationTreeNodeEditorPlugin : public VBoxContainer { GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer); diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index f2c4ca3d5e..7ab9fa05f7 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -36,6 +36,7 @@ #include "core/version.h" #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/project_settings_editor.h" diff --git a/editor/plugins/audio_stream_editor_plugin.h b/editor/plugins/audio_stream_editor_plugin.h index 3decc348f4..2478210430 100644 --- a/editor/plugins/audio_stream_editor_plugin.h +++ b/editor/plugins/audio_stream_editor_plugin.h @@ -36,7 +36,6 @@ #include "scene/gui/color_rect.h" #include "scene/resources/texture.h" -class EditorNode; 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 3b0d57da0a..9e551ae0ed 100644 --- a/editor/plugins/audio_stream_randomizer_editor_plugin.cpp +++ b/editor/plugins/audio_stream_randomizer_editor_plugin.cpp @@ -30,6 +30,8 @@ #include "audio_stream_randomizer_editor_plugin.h" +#include "editor/editor_node.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 8d0630947a..7e509dc670 100644 --- a/editor/plugins/audio_stream_randomizer_editor_plugin.h +++ b/editor/plugins/audio_stream_randomizer_editor_plugin.h @@ -31,7 +31,6 @@ #ifndef AUDIO_STREAM_RANDOMIZER_EDITOR_PLUGIN_H #define AUDIO_STREAM_RANDOMIZER_EDITOR_PLUGIN_H -#include "editor/editor_node.h" #include "editor/editor_plugin.h" #include "servers/audio/audio_stream.h" diff --git a/editor/plugins/camera_3d_editor_plugin.h b/editor/plugins/camera_3d_editor_plugin.h index 50dcc0900f..c1f71d3b1b 100644 --- a/editor/plugins/camera_3d_editor_plugin.h +++ b/editor/plugins/camera_3d_editor_plugin.h @@ -34,8 +34,6 @@ #include "editor/editor_plugin.h" #include "scene/3d/camera_3d.h" -class EditorNode; - class Camera3DEditor : public Control { GDCLASS(Camera3DEditor, Control); diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index eacaa61f96..6c1b18acf4 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -42,7 +42,6 @@ #include "scene/gui/texture_rect.h" #include "scene/main/canvas_item.h" -class EditorNode; class EditorData; class CanvasItemEditorViewport; class ViewPanner; diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h index fddae88220..033ea3db93 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/editor/plugins/collision_shape_2d_editor_plugin.h @@ -32,10 +32,8 @@ #define COLLISION_SHAPE_2D_EDITOR_PLUGIN_H #include "editor/editor_plugin.h" - #include "scene/2d/collision_shape_2d.h" -class EditorNode; class CanvasItemEditor; class CollisionShape2DEditor : public Control { diff --git a/editor/plugins/control_editor_plugin.cpp b/editor/plugins/control_editor_plugin.cpp index 8d2ba1bbaf..e6f267673c 100644 --- a/editor/plugins/control_editor_plugin.cpp +++ b/editor/plugins/control_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "control_editor_plugin.h" +#include "editor/editor_node.h" #include "editor/plugins/canvas_item_editor_plugin.h" void ControlPositioningWarning::_update_warning() { diff --git a/editor/plugins/control_editor_plugin.h b/editor/plugins/control_editor_plugin.h index 93073a3595..bbbada2b3f 100644 --- a/editor/plugins/control_editor_plugin.h +++ b/editor/plugins/control_editor_plugin.h @@ -31,9 +31,7 @@ #ifndef CONTROL_EDITOR_PLUGIN_H #define CONTROL_EDITOR_PLUGIN_H -#include "editor/editor_node.h" #include "editor/editor_plugin.h" - #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/control.h" diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.h b/editor/plugins/cpu_particles_2d_editor_plugin.h index 54a27146c3..b10ed73e38 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.h +++ b/editor/plugins/cpu_particles_2d_editor_plugin.h @@ -36,7 +36,6 @@ #include "scene/2d/cpu_particles_2d.h" #include "scene/gui/box_container.h" -class EditorNode; class EditorPlugin; class SpinBox; class EditorFileDialog; diff --git a/editor/plugins/cpu_particles_3d_editor_plugin.h b/editor/plugins/cpu_particles_3d_editor_plugin.h index f03b272633..0501936574 100644 --- a/editor/plugins/cpu_particles_3d_editor_plugin.h +++ b/editor/plugins/cpu_particles_3d_editor_plugin.h @@ -34,8 +34,6 @@ #include "editor/plugins/gpu_particles_3d_editor_plugin.h" #include "scene/3d/cpu_particles_3d.h" -class EditorNode; - class CPUParticles3DEditor : public GPUParticles3DEditorBase { GDCLASS(CPUParticles3DEditor, GPUParticles3DEditorBase); diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h index fe2aa52d1f..4aba2fffd0 100644 --- a/editor/plugins/curve_editor_plugin.h +++ b/editor/plugins/curve_editor_plugin.h @@ -35,8 +35,6 @@ #include "editor/editor_resource_preview.h" #include "scene/resources/curve.h" -class EditorNode; - // Edits a y(x) curve class CurveEditor : public Control { GDCLASS(CurveEditor, Control); diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/plugins/debugger_editor_plugin.cpp index aa71ae0413..32f58c6931 100644 --- a/editor/plugins/debugger_editor_plugin.cpp +++ b/editor/plugins/debugger_editor_plugin.cpp @@ -36,6 +36,7 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/fileserver/editor_file_server.h" +#include "editor/plugins/script_editor_plugin.h" #include "scene/gui/menu_button.h" DebuggerEditorPlugin::DebuggerEditorPlugin(MenuButton *p_debug_menu) { diff --git a/editor/plugins/debugger_editor_plugin.h b/editor/plugins/debugger_editor_plugin.h index 9ac3115c6a..c024526285 100644 --- a/editor/plugins/debugger_editor_plugin.h +++ b/editor/plugins/debugger_editor_plugin.h @@ -33,7 +33,6 @@ #include "editor/editor_plugin.h" -class EditorNode; class EditorFileServer; class MenuButton; class PopupMenu; diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index 5dd92d3c3f..b8556220d2 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -34,7 +34,7 @@ #include "core/io/file_access_memory.h" #include "core/io/resource_loader.h" #include "core/os/os.h" -#include "editor/editor_node.h" +#include "editor/editor_paths.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "scene/resources/bit_map.h" diff --git a/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h index dd64918d41..803f03f17e 100644 --- a/editor/plugins/editor_preview_plugins.h +++ b/editor/plugins/editor_preview_plugins.h @@ -31,9 +31,8 @@ #ifndef EDITORPREVIEWPLUGINS_H #define EDITORPREVIEWPLUGINS_H -#include "editor/editor_resource_preview.h" - #include "core/templates/safe_refcount.h" +#include "editor/editor_resource_preview.h" void post_process_preview(Ref<Image> p_image); diff --git a/editor/plugins/font_editor_plugin.cpp b/editor/plugins/font_editor_plugin.cpp index e86b38fd0e..e14304a2c8 100644 --- a/editor/plugins/font_editor_plugin.cpp +++ b/editor/plugins/font_editor_plugin.cpp @@ -30,7 +30,6 @@ #include "font_editor_plugin.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" void FontDataPreview::_notification(int p_what) { diff --git a/editor/plugins/font_editor_plugin.h b/editor/plugins/font_editor_plugin.h index c55346aa4c..3f0700d880 100644 --- a/editor/plugins/font_editor_plugin.h +++ b/editor/plugins/font_editor_plugin.h @@ -35,8 +35,6 @@ #include "scene/resources/font.h" #include "scene/resources/text_line.h" -class EditorNode; - class FontDataPreview : public Control { GDCLASS(FontDataPreview, Control); diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.h b/editor/plugins/gpu_particles_2d_editor_plugin.h index 0f4a906f04..f94ce632e9 100644 --- a/editor/plugins/gpu_particles_2d_editor_plugin.h +++ b/editor/plugins/gpu_particles_2d_editor_plugin.h @@ -37,7 +37,6 @@ #include "scene/gui/box_container.h" #include "scene/gui/spin_box.h" -class EditorNode; class EditorFileDialog; class GPUParticles2DEditorPlugin : public EditorPlugin { diff --git a/editor/plugins/gpu_particles_3d_editor_plugin.h b/editor/plugins/gpu_particles_3d_editor_plugin.h index 879260d5e3..39aa596ece 100644 --- a/editor/plugins/gpu_particles_3d_editor_plugin.h +++ b/editor/plugins/gpu_particles_3d_editor_plugin.h @@ -35,7 +35,6 @@ #include "scene/3d/gpu_particles_3d.h" #include "scene/gui/spin_box.h" -class EditorNode; class SceneTreeDialog; class GPUParticles3DEditorBase : public Control { diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h index 4677e0bc86..f6e4fd3dec 100644 --- a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h +++ b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h @@ -35,7 +35,6 @@ #include "scene/3d/gpu_particles_collision_3d.h" #include "scene/resources/material.h" -class EditorNode; struct EditorProgress; class EditorFileDialog; diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h index 41bfff3c27..9857ea018d 100644 --- a/editor/plugins/gradient_editor_plugin.h +++ b/editor/plugins/gradient_editor_plugin.h @@ -34,8 +34,6 @@ #include "editor/editor_plugin.h" #include "scene/gui/gradient_edit.h" -class EditorNode; - class GradientEditor : public GradientEdit { GDCLASS(GradientEditor, GradientEdit); diff --git a/editor/plugins/input_event_editor_plugin.cpp b/editor/plugins/input_event_editor_plugin.cpp index 9f4f9a5646..b4a7081ebc 100644 --- a/editor/plugins/input_event_editor_plugin.cpp +++ b/editor/plugins/input_event_editor_plugin.cpp @@ -30,8 +30,6 @@ #include "input_event_editor_plugin.h" -#include "editor/editor_node.h" - void InputEventConfigContainer::_bind_methods() { } diff --git a/editor/plugins/input_event_editor_plugin.h b/editor/plugins/input_event_editor_plugin.h index 9e8746895f..ab948462ab 100644 --- a/editor/plugins/input_event_editor_plugin.h +++ b/editor/plugins/input_event_editor_plugin.h @@ -33,8 +33,7 @@ #include "editor/action_map_editor.h" #include "editor/editor_inspector.h" - -class EditorNode; +#include "editor/editor_plugin.h" class InputEventConfigContainer : public HBoxContainer { GDCLASS(InputEventConfigContainer, HBoxContainer); diff --git a/editor/plugins/lightmap_gi_editor_plugin.h b/editor/plugins/lightmap_gi_editor_plugin.h index 99f85279e9..e658230181 100644 --- a/editor/plugins/lightmap_gi_editor_plugin.h +++ b/editor/plugins/lightmap_gi_editor_plugin.h @@ -35,7 +35,6 @@ #include "scene/3d/lightmap_gi.h" #include "scene/resources/material.h" -class EditorNode; struct EditorProgress; class EditorFileDialog; diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index 5b4af6ba46..9c6247d59b 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -31,17 +31,15 @@ #ifndef MATERIAL_EDITOR_PLUGIN_H #define MATERIAL_EDITOR_PLUGIN_H -#include "editor/property_editor.h" -#include "scene/resources/primitive_meshes.h" - #include "editor/editor_plugin.h" +#include "editor/property_editor.h" #include "scene/3d/camera_3d.h" #include "scene/3d/light_3d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/gui/color_rect.h" #include "scene/resources/material.h" +#include "scene/resources/primitive_meshes.h" -class EditorNode; class SubViewportContainer; class MaterialEditor : public Control { diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index b8e7868ccc..8711559dbf 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -30,7 +30,6 @@ #include "mesh_editor_plugin.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" void MeshEditor::gui_input(const Ref<InputEvent> &p_event) { diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index fc5139b62a..37464c98fe 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -38,8 +38,6 @@ #include "scene/gui/subviewport_container.h" #include "scene/resources/material.h" -class EditorNode; - class MeshEditor : public SubViewportContainer { GDCLASS(MeshEditor, SubViewportContainer); diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.h b/editor/plugins/mesh_instance_3d_editor_plugin.h index e489b7adde..9c59c5fb9f 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.h +++ b/editor/plugins/mesh_instance_3d_editor_plugin.h @@ -35,8 +35,6 @@ #include "scene/3d/mesh_instance_3d.h" #include "scene/gui/spin_box.h" -class EditorNode; - class MeshInstance3DEditor : public Control { GDCLASS(MeshInstance3DEditor, Control); diff --git a/editor/plugins/mesh_library_editor_plugin.h b/editor/plugins/mesh_library_editor_plugin.h index 7b1676a8f8..6bc992869b 100644 --- a/editor/plugins/mesh_library_editor_plugin.h +++ b/editor/plugins/mesh_library_editor_plugin.h @@ -34,7 +34,6 @@ #include "editor/editor_plugin.h" #include "scene/resources/mesh_library.h" -class EditorNode; class EditorFileDialog; class ConfirmationDialog; class MenuButton; diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h index eaa4b4cc5e..846e6d17f3 100644 --- a/editor/plugins/multimesh_editor_plugin.h +++ b/editor/plugins/multimesh_editor_plugin.h @@ -36,7 +36,6 @@ #include "scene/gui/slider.h" #include "scene/gui/spin_box.h" -class EditorNode; class SceneTreeDialog; class MultiMeshEditor : public Control { diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h index a374d9158e..9e92a1e9b3 100644 --- a/editor/plugins/node_3d_editor_plugin.h +++ b/editor/plugins/node_3d_editor_plugin.h @@ -47,7 +47,6 @@ #include "scene/resources/fog_material.h" #include "scene/resources/sky_material.h" -class EditorNode; class EditorData; class Node3DEditor; class Node3DEditorViewport; diff --git a/editor/plugins/occluder_instance_3d_editor_plugin.h b/editor/plugins/occluder_instance_3d_editor_plugin.h index 5bc2d95542..24f31b2ea8 100644 --- a/editor/plugins/occluder_instance_3d_editor_plugin.h +++ b/editor/plugins/occluder_instance_3d_editor_plugin.h @@ -35,8 +35,6 @@ #include "scene/3d/occluder_instance_3d.h" #include "scene/resources/material.h" -class EditorNode; -struct EditorProgress; class EditorFileDialog; class OccluderInstance3DEditorPlugin : public EditorPlugin { diff --git a/editor/plugins/ot_features_plugin.cpp b/editor/plugins/ot_features_plugin.cpp index 2c6be5179d..719b9ecc7c 100644 --- a/editor/plugins/ot_features_plugin.cpp +++ b/editor/plugins/ot_features_plugin.cpp @@ -30,9 +30,6 @@ #include "ot_features_plugin.h" -#include "editor/editor_node.h" -#include "editor/editor_scale.h" - void OpenTypeFeaturesEditor::_value_changed(double val) { if (setting) { return; diff --git a/editor/plugins/ot_features_plugin.h b/editor/plugins/ot_features_plugin.h index 5eb10c9c08..8c38d888de 100644 --- a/editor/plugins/ot_features_plugin.h +++ b/editor/plugins/ot_features_plugin.h @@ -34,8 +34,6 @@ #include "editor/editor_plugin.h" #include "editor/editor_properties.h" -class EditorNode; - /*************************************************************************/ class OpenTypeFeaturesEditor : public EditorProperty { diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h index 220131c983..926a859f8b 100644 --- a/editor/plugins/path_2d_editor_plugin.h +++ b/editor/plugins/path_2d_editor_plugin.h @@ -35,7 +35,6 @@ #include "scene/2d/path_2d.h" #include "scene/gui/separator.h" -class EditorNode; class CanvasItemEditor; class Path2DEditor : public HBoxContainer { diff --git a/editor/plugins/path_3d_editor_plugin.h b/editor/plugins/path_3d_editor_plugin.h index 97c602360a..3c6ca65437 100644 --- a/editor/plugins/path_3d_editor_plugin.h +++ b/editor/plugins/path_3d_editor_plugin.h @@ -37,8 +37,6 @@ #include "scene/3d/path_3d.h" #include "scene/gui/separator.h" -class EditorNode; - 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 eecb5f9385..e815a9c9f6 100644 --- a/editor/plugins/physical_bone_3d_editor_plugin.cpp +++ b/editor/plugins/physical_bone_3d_editor_plugin.cpp @@ -30,9 +30,7 @@ #include "physical_bone_3d_editor_plugin.h" -#include "editor/editor_node.h" #include "editor/plugins/node_3d_editor_plugin.h" -#include "scene/3d/physics_body_3d.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 75548d902b..4051644b54 100644 --- a/editor/plugins/physical_bone_3d_editor_plugin.h +++ b/editor/plugins/physical_bone_3d_editor_plugin.h @@ -36,8 +36,6 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" -class EditorNode; - class PhysicalBone3DEditor : public Object { GDCLASS(PhysicalBone3DEditor, Object); diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 4c1c11ebff..22b79921bb 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -30,13 +30,11 @@ #include "polygon_2d_editor_plugin.h" -#include "canvas_item_editor_plugin.h" -#include "core/input/input.h" -#include "core/io/file_access.h" +#include "core/input/input_event.h" #include "core/math/geometry_2d.h" -#include "core/os/keyboard.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/plugins/canvas_item_editor_plugin.h" #include "scene/2d/skeleton_2d.h" #include "scene/gui/menu_button.h" #include "scene/gui/scroll_container.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h index 387c3bb12b..0a5def902c 100644 --- a/editor/plugins/polygon_2d_editor_plugin.h +++ b/editor/plugins/polygon_2d_editor_plugin.h @@ -33,11 +33,11 @@ #include "editor/plugins/abstract_polygon_2d_editor.h" -class ViewPanner; -class ScrollContainer; -class Panel; class HSlider; +class Panel; +class ScrollContainer; class SpinBox; +class ViewPanner; class Polygon2DEditor : public AbstractPolygon2DEditor { GDCLASS(Polygon2DEditor, AbstractPolygon2DEditor); diff --git a/editor/plugins/polygon_3d_editor_plugin.h b/editor/plugins/polygon_3d_editor_plugin.h index 537440150a..e92dcaf319 100644 --- a/editor/plugins/polygon_3d_editor_plugin.h +++ b/editor/plugins/polygon_3d_editor_plugin.h @@ -36,7 +36,6 @@ #include "scene/3d/mesh_instance_3d.h" #include "scene/resources/immediate_mesh.h" -class EditorNode; class CanvasItemEditor; class Polygon3DEditor : public HBoxContainer { diff --git a/editor/plugins/replication_editor_plugin.cpp b/editor/plugins/replication_editor_plugin.cpp index aaae6554d7..604cbcd103 100644 --- a/editor/plugins/replication_editor_plugin.cpp +++ b/editor/plugins/replication_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "replication_editor_plugin.h" +#include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/inspector_dock.h" #include "scene/gui/dialogs.h" diff --git a/editor/plugins/replication_editor_plugin.h b/editor/plugins/replication_editor_plugin.h index e7f2ecd151..46274d188c 100644 --- a/editor/plugins/replication_editor_plugin.h +++ b/editor/plugins/replication_editor_plugin.h @@ -31,7 +31,6 @@ #ifndef REPLICATION_EDITOR_PLUGIN_H #define REPLICATION_EDITOR_PLUGIN_H -#include "editor/editor_node.h" #include "editor/editor_plugin.h" #include "scene/resources/scene_replication_config.h" diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h index 087c26e19d..8e81239f1b 100644 --- a/editor/plugins/resource_preloader_editor_plugin.h +++ b/editor/plugins/resource_preloader_editor_plugin.h @@ -36,8 +36,6 @@ #include "scene/gui/tree.h" #include "scene/main/resource_preloader.h" -class EditorNode; -struct EditorProgress; class EditorFileDialog; class ResourcePreloaderEditor : public PanelContainer { diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index 07e818a0c1..a99e269d46 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -47,8 +47,6 @@ #include "scene/main/timer.h" #include "scene/resources/text_file.h" -class EditorNode; -struct EditorProgress; class EditorFileDialog; class EditorSyntaxHighlighter : public SyntaxHighlighter { diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/plugins/skeleton_2d_editor_plugin.h index b6f6f8aaa1..004dac7b05 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.h +++ b/editor/plugins/skeleton_2d_editor_plugin.h @@ -35,8 +35,6 @@ #include "scene/2d/skeleton_2d.h" #include "scene/gui/spin_box.h" -class EditorNode; - class Skeleton2DEditor : public Control { GDCLASS(Skeleton2DEditor, Control); diff --git a/editor/plugins/skeleton_3d_editor_plugin.h b/editor/plugins/skeleton_3d_editor_plugin.h index e1f75a6ab1..2dbb552428 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.h +++ b/editor/plugins/skeleton_3d_editor_plugin.h @@ -39,7 +39,6 @@ #include "scene/3d/skeleton_3d.h" #include "scene/resources/immediate_mesh.h" -class EditorNode; class EditorInspectorPluginSkeleton; class Joint; class PhysicalBone3D; diff --git a/editor/plugins/skeleton_ik_3d_editor_plugin.h b/editor/plugins/skeleton_ik_3d_editor_plugin.h index ec5d3114b0..f71e788232 100644 --- a/editor/plugins/skeleton_ik_3d_editor_plugin.h +++ b/editor/plugins/skeleton_ik_3d_editor_plugin.h @@ -33,7 +33,6 @@ #include "editor/editor_plugin.h" -class EditorNode; class SkeletonIK3D; class SkeletonIK3DEditorPlugin : public EditorPlugin { diff --git a/editor/plugins/sprite_2d_editor_plugin.h b/editor/plugins/sprite_2d_editor_plugin.h index 87241cad63..3e4cc17cdd 100644 --- a/editor/plugins/sprite_2d_editor_plugin.h +++ b/editor/plugins/sprite_2d_editor_plugin.h @@ -35,8 +35,6 @@ #include "scene/2d/sprite_2d.h" #include "scene/gui/spin_box.h" -class EditorNode; - class Sprite2DEditor : public Control { GDCLASS(Sprite2DEditor, Control); diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h index 9d65cafd2a..461c8dd41a 100644 --- a/editor/plugins/sprite_frames_editor_plugin.h +++ b/editor/plugins/sprite_frames_editor_plugin.h @@ -43,8 +43,6 @@ #include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" -class EditorNode; -struct EditorProgress; class EditorFileDialog; class SpriteFramesEditor : public HSplitContainer { diff --git a/editor/plugins/style_box_editor_plugin.cpp b/editor/plugins/style_box_editor_plugin.cpp index f024a8c7d8..a3cbaf527e 100644 --- a/editor/plugins/style_box_editor_plugin.cpp +++ b/editor/plugins/style_box_editor_plugin.cpp @@ -30,7 +30,6 @@ #include "style_box_editor_plugin.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" bool EditorInspectorPluginStyleBox::can_handle(Object *p_object) { diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h index bfec9401d2..bdebebbe1c 100644 --- a/editor/plugins/style_box_editor_plugin.h +++ b/editor/plugins/style_box_editor_plugin.h @@ -37,8 +37,6 @@ #include "scene/gui/texture_rect.h" #include "scene/resources/style_box.h" -class EditorNode; - class StyleBoxPreview : public VBoxContainer { GDCLASS(StyleBoxPreview, VBoxContainer); diff --git a/editor/plugins/sub_viewport_preview_editor_plugin.cpp b/editor/plugins/sub_viewport_preview_editor_plugin.cpp index 93cb51efe3..c8bb0cd56f 100644 --- a/editor/plugins/sub_viewport_preview_editor_plugin.cpp +++ b/editor/plugins/sub_viewport_preview_editor_plugin.cpp @@ -30,8 +30,6 @@ #include "sub_viewport_preview_editor_plugin.h" -#include "editor/editor_node.h" - bool EditorInspectorPluginSubViewportPreview::can_handle(Object *p_object) { return Object::cast_to<SubViewport>(p_object) != nullptr; } diff --git a/editor/plugins/sub_viewport_preview_editor_plugin.h b/editor/plugins/sub_viewport_preview_editor_plugin.h index 6089bcbf41..269553ffb1 100644 --- a/editor/plugins/sub_viewport_preview_editor_plugin.h +++ b/editor/plugins/sub_viewport_preview_editor_plugin.h @@ -35,8 +35,6 @@ #include "editor/plugins/texture_editor_plugin.h" #include "scene/main/viewport.h" -class EditorNode; - class EditorInspectorPluginSubViewportPreview : public EditorInspectorPluginTexture { GDCLASS(EditorInspectorPluginSubViewportPreview, EditorInspectorPluginTexture); diff --git a/editor/plugins/text_control_editor_plugin.h b/editor/plugins/text_control_editor_plugin.h index 607360ec15..1d65073c98 100644 --- a/editor/plugins/text_control_editor_plugin.h +++ b/editor/plugins/text_control_editor_plugin.h @@ -43,8 +43,6 @@ /*************************************************************************/ -class EditorNode; - class TextControlEditor : public HBoxContainer { GDCLASS(TextControlEditor, HBoxContainer); diff --git a/editor/plugins/texture_3d_editor_plugin.cpp b/editor/plugins/texture_3d_editor_plugin.cpp index 7b81269d20..880cbeffba 100644 --- a/editor/plugins/texture_3d_editor_plugin.cpp +++ b/editor/plugins/texture_3d_editor_plugin.cpp @@ -30,11 +30,6 @@ #include "texture_3d_editor_plugin.h" -#include "core/config/project_settings.h" -#include "core/io/resource_loader.h" -#include "editor/editor_node.h" -#include "editor/editor_settings.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 5912b24328..d418032477 100644 --- a/editor/plugins/texture_3d_editor_plugin.h +++ b/editor/plugins/texture_3d_editor_plugin.h @@ -36,8 +36,6 @@ #include "scene/resources/shader.h" #include "scene/resources/texture.h" -class EditorNode; - class Texture3DEditor : public Control { GDCLASS(Texture3DEditor, Control); diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp index ac40b4afb3..17fe4fdc50 100644 --- a/editor/plugins/texture_editor_plugin.cpp +++ b/editor/plugins/texture_editor_plugin.cpp @@ -30,7 +30,6 @@ #include "texture_editor_plugin.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" TextureRect *TexturePreview::get_texture_display() { diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h index 1e2a37b1a3..9beada556c 100644 --- a/editor/plugins/texture_editor_plugin.h +++ b/editor/plugins/texture_editor_plugin.h @@ -34,8 +34,6 @@ #include "editor/editor_plugin.h" #include "scene/resources/texture.h" -class EditorNode; - class TexturePreview : public MarginContainer { GDCLASS(TexturePreview, MarginContainer); diff --git a/editor/plugins/texture_layered_editor_plugin.cpp b/editor/plugins/texture_layered_editor_plugin.cpp index d18d45ff86..22f4cebf2e 100644 --- a/editor/plugins/texture_layered_editor_plugin.cpp +++ b/editor/plugins/texture_layered_editor_plugin.cpp @@ -30,11 +30,6 @@ #include "texture_layered_editor_plugin.h" -#include "core/config/project_settings.h" -#include "core/io/resource_loader.h" -#include "editor/editor_node.h" -#include "editor/editor_settings.h" - void TextureLayeredEditor::gui_input(const Ref<InputEvent> &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 991e81b967..1c59ec4db0 100644 --- a/editor/plugins/texture_layered_editor_plugin.h +++ b/editor/plugins/texture_layered_editor_plugin.h @@ -36,8 +36,6 @@ #include "scene/resources/shader.h" #include "scene/resources/texture.h" -class EditorNode; - class TextureLayeredEditor : public Control { GDCLASS(TextureLayeredEditor, Control); diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h index 3bfc9d3e16..041742c28a 100644 --- a/editor/plugins/texture_region_editor_plugin.h +++ b/editor/plugins/texture_region_editor_plugin.h @@ -39,7 +39,6 @@ #include "scene/resources/style_box.h" #include "scene/resources/texture.h" -class EditorNode; class ViewPanner; class TextureRegionEditor : public VBoxContainer { diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h index ad409bfc11..7c1b0cda3e 100644 --- a/editor/plugins/theme_editor_plugin.h +++ b/editor/plugins/theme_editor_plugin.h @@ -44,7 +44,6 @@ #include "scene/gui/tree.h" #include "scene/resources/theme.h" -class EditorNode; class EditorFileDialog; class ThemeItemImportTree : public VBoxContainer { diff --git a/editor/plugins/theme_editor_preview.h b/editor/plugins/theme_editor_preview.h index ab93198903..48111df399 100644 --- a/editor/plugins/theme_editor_preview.h +++ b/editor/plugins/theme_editor_preview.h @@ -38,8 +38,6 @@ #include "scene/gui/scroll_container.h" #include "scene/resources/theme.h" -class EditorNode; - class ThemeEditorPreview : public VBoxContainer { GDCLASS(ThemeEditorPreview, VBoxContainer); diff --git a/editor/plugins/tiles/atlas_merging_dialog.h b/editor/plugins/tiles/atlas_merging_dialog.h index 6fc1a3b7e0..6cf555247d 100644 --- a/editor/plugins/tiles/atlas_merging_dialog.h +++ b/editor/plugins/tiles/atlas_merging_dialog.h @@ -32,13 +32,11 @@ #define ATLAS_MERGING_DIALOG_H #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/tile_set.h" -class EditorNode; class EditorFileDialog; class AtlasMergingDialog : public ConfirmationDialog { diff --git a/editor/plugins/tiles/tile_map_editor.h b/editor/plugins/tiles/tile_map_editor.h index 49e8cacac8..d09061015f 100644 --- a/editor/plugins/tiles/tile_map_editor.h +++ b/editor/plugins/tiles/tile_map_editor.h @@ -46,7 +46,6 @@ #include "scene/gui/tab_bar.h" #include "scene/gui/tree.h" -class EditorNode; class UndoRedo; class TileMapEditorPlugin : public Object { diff --git a/editor/plugins/tiles/tile_proxies_manager_dialog.h b/editor/plugins/tiles/tile_proxies_manager_dialog.h index 4c8741c660..3f1461391e 100644 --- a/editor/plugins/tiles/tile_proxies_manager_dialog.h +++ b/editor/plugins/tiles/tile_proxies_manager_dialog.h @@ -32,13 +32,10 @@ #define TILE_PROXIES_MANAGER_DIALOG_H #include "editor/editor_properties.h" - #include "scene/2d/tile_map.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" -class EditorNode; - class TileProxiesManagerDialog : public ConfirmationDialog { GDCLASS(TileProxiesManagerDialog, ConfirmationDialog); diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.h b/editor/plugins/tiles/tile_set_atlas_source_editor.h index f0c8367d57..4a90b821f8 100644 --- a/editor/plugins/tiles/tile_set_atlas_source_editor.h +++ b/editor/plugins/tiles/tile_set_atlas_source_editor.h @@ -37,7 +37,6 @@ #include "scene/gui/split_container.h" #include "scene/resources/tile_set.h" -class EditorNode; class TileSet; class TileSetAtlasSourceEditor : public HBoxContainer { diff --git a/editor/plugins/tiles/tile_set_editor.cpp b/editor/plugins/tiles/tile_set_editor.cpp index 9ca50497af..97b342c6a7 100644 --- a/editor/plugins/tiles/tile_set_editor.cpp +++ b/editor/plugins/tiles/tile_set_editor.cpp @@ -33,6 +33,7 @@ #include "tile_data_editors.h" #include "tiles_editor_plugin.h" +#include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" diff --git a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h index bc4e975c8d..8904e8524a 100644 --- a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h +++ b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h @@ -37,7 +37,6 @@ #include "scene/gui/item_list.h" #include "scene/resources/tile_set.h" -class EditorNode; class UndoRedo; class TileSetScenesCollectionSourceEditor : public HBoxContainer { diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h index b00b8f83a4..02beba971b 100644 --- a/editor/plugins/visual_shader_editor_plugin.h +++ b/editor/plugins/visual_shader_editor_plugin.h @@ -35,13 +35,13 @@ #include "editor/plugins/curve_editor_plugin.h" #include "editor/property_editor.h" #include "scene/gui/button.h" +#include "scene/gui/code_edit.h" #include "scene/gui/graph_edit.h" #include "scene/gui/popup.h" +#include "scene/gui/rich_text_label.h" #include "scene/gui/tree.h" #include "scene/resources/visual_shader.h" -class EditorNode; - class VisualShaderNodePlugin : public RefCounted { GDCLASS(VisualShaderNodePlugin, RefCounted); diff --git a/editor/plugins/voxel_gi_editor_plugin.h b/editor/plugins/voxel_gi_editor_plugin.h index fb1e0e05d0..67bd1d5105 100644 --- a/editor/plugins/voxel_gi_editor_plugin.h +++ b/editor/plugins/voxel_gi_editor_plugin.h @@ -35,7 +35,6 @@ #include "scene/3d/voxel_gi.h" #include "scene/resources/material.h" -class EditorNode; class EditorFileDialog; struct EditorProgress; diff --git a/editor/project_export.h b/editor/project_export.h index 0f0f0ed83c..569563ba55 100644 --- a/editor/project_export.h +++ b/editor/project_export.h @@ -52,7 +52,6 @@ #include "scene/gui/tree.h" #include "scene/main/timer.h" -class EditorNode; class EditorFileDialog; class ProjectExportDialog : public ConfirmationDialog { diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h index 9d02fb10bd..c9747795f0 100644 --- a/editor/rename_dialog.h +++ b/editor/rename_dialog.h @@ -37,9 +37,11 @@ #include "core/object/undo_redo.h" #include "editor/scene_tree_editor.h" #include "scene/gui/check_box.h" +#include "scene/gui/check_button.h" #include "scene/gui/dialogs.h" #include "scene/gui/option_button.h" #include "scene/gui/spin_box.h" +#include "scene/gui/tab_container.h" class RenameDialog : public ConfirmationDialog { GDCLASS(RenameDialog, ConfirmationDialog); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 056a154f19..db78546fd3 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -54,6 +54,9 @@ #include "servers/rendering_server.h" #include "modules/modules_enabled.gen.h" // For regex. +#ifdef MODULE_REGEX_ENABLED +#include "editor/rename_dialog.h" +#endif // MODULE_REGEX_ENABLED void SceneTreeDock::_nodes_drag_begin() { if (restore_script_editor_on_drag) { diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index d4fda11e97..2a98c469dc 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -35,7 +35,6 @@ #include "editor/editor_data.h" #include "editor/groups_editor.h" #include "editor/quick_open.h" -#include "editor/rename_dialog.h" #include "editor/reparent_dialog.h" #include "editor/script_create_dialog.h" #include "scene/animation/animation_player.h" @@ -48,8 +47,10 @@ #include "scene_tree_editor.h" #include "modules/modules_enabled.gen.h" // For regex. +#ifdef MODULE_REGEX_ENABLED +class RenameDialog; +#endif // MODULE_REGEX_ENABLED -class EditorNode; class ShaderCreateDialog; class SceneTreeDock : public VBoxContainer { diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index f5c46f883d..c10dd2e2de 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -38,6 +38,7 @@ #include "editor/node_dock.h" #include "editor/plugins/animation_player_editor_plugin.h" #include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/plugins/script_editor_plugin.h" #include "scene/gui/label.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 82305c4073..c60c253a65 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -37,8 +37,8 @@ #include "editor/create_dialog.h" #include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" void ScriptCreateDialog::_notification(int p_what) { switch (p_what) { diff --git a/main/main.cpp b/main/main.cpp index 38e380568d..21199fe227 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -81,6 +81,7 @@ #include "editor/doc_data_class_path.gen.h" #include "editor/doc_tools.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" #include "editor/editor_settings.h" #include "editor/editor_translation.h" #include "editor/progress_dialog.h" diff --git a/modules/gdnative/gdnative_library_editor_plugin.cpp b/modules/gdnative/gdnative_library_editor_plugin.cpp index 2440ef392e..66c8ab7b37 100644 --- a/modules/gdnative/gdnative_library_editor_plugin.cpp +++ b/modules/gdnative/gdnative_library_editor_plugin.cpp @@ -29,7 +29,9 @@ /*************************************************************************/ #ifdef TOOLS_ENABLED + #include "gdnative_library_editor_plugin.h" + #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" diff --git a/modules/gdnative/gdnative_library_editor_plugin.h b/modules/gdnative/gdnative_library_editor_plugin.h index 2e4b483ea7..797695366c 100644 --- a/modules/gdnative/gdnative_library_editor_plugin.h +++ b/modules/gdnative/gdnative_library_editor_plugin.h @@ -39,7 +39,6 @@ #include "scene/gui/menu_button.h" #include "scene/gui/tree.h" -class EditorNode; class EditorFileDialog; class GDNativeLibraryEditor : public Control { @@ -114,5 +113,7 @@ public: GDNativeLibraryEditorPlugin(); }; -#endif + +#endif // TOOLS_ENABLED + #endif // GDNATIVE_LIBRARY_EDITOR_PLUGIN_H diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h index 10e466f096..a25f14becd 100644 --- a/modules/gridmap/grid_map_editor_plugin.h +++ b/modules/gridmap/grid_map_editor_plugin.h @@ -37,7 +37,6 @@ #include "scene/gui/slider.h" #include "scene/gui/spin_box.h" -class EditorNode; class Node3DEditorPlugin; class GridMapEditor : public VBoxContainer { diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp index c0cd18e29d..7c2cb2e260 100644 --- a/modules/mono/godotsharp_dirs.cpp +++ b/modules/mono/godotsharp_dirs.cpp @@ -36,7 +36,7 @@ #ifdef TOOLS_ENABLED #include "core/version.h" -#include "editor/editor_settings.h" +#include "editor/editor_paths.h" #endif #ifdef ANDROID_ENABLED diff --git a/modules/navigation/navigation_mesh_generator.cpp b/modules/navigation/navigation_mesh_generator.cpp index 52d5379e8b..61c3cefc7a 100644 --- a/modules/navigation/navigation_mesh_generator.cpp +++ b/modules/navigation/navigation_mesh_generator.cpp @@ -50,7 +50,6 @@ #ifdef TOOLS_ENABLED #include "editor/editor_node.h" -#include "editor/editor_settings.h" #endif #include "modules/modules_enabled.gen.h" // For csg, gridmap. diff --git a/modules/visual_script/editor/visual_script_property_selector.cpp b/modules/visual_script/editor/visual_script_property_selector.cpp index cf0111ee7c..563c12eec4 100644 --- a/modules/visual_script/editor/visual_script_property_selector.cpp +++ b/modules/visual_script/editor/visual_script_property_selector.cpp @@ -38,7 +38,6 @@ #include "core/os/keyboard.h" #include "editor/doc_tools.h" #include "editor/editor_feature_profile.h" -#include "editor/editor_node.h" #include "editor/editor_scale.h" #include "scene/main/node.h" #include "scene/main/window.h" diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 23b5c5e4e5..aa4b394965 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -32,6 +32,9 @@ #include "export_plugin.h" +#include "core/os/os.h" +#include "editor/editor_settings.h" + void register_android_exporter() { String exe_ext; if (OS::get_singleton()->get_name() == "Windows") { diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 464488967e..2c431028b0 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -30,7 +30,25 @@ #include "export_plugin.h" +#include "gradle_export_util.h" + +#include "core/config/project_settings.h" +#include "core/io/dir_access.h" +#include "core/io/file_access.h" +#include "core/io/image_loader.h" +#include "core/io/json.h" +#include "core/io/marshalls.h" +#include "core/version.h" +#include "drivers/png/png_driver_common.h" +#include "editor/editor_log.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" +#include "editor/editor_settings.h" +#include "main/splash.gen.h" +#include "platform/android/logo.gen.h" +#include "platform/android/run_icon.gen.h" + +#include <string.h> static const char *android_perms[] = { "ACCESS_CHECKIN_PROPERTIES", diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h index c158a273d2..a4eb608b19 100644 --- a/platform/android/export/export_plugin.h +++ b/platform/android/export/export_plugin.h @@ -28,28 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/config/project_settings.h" -#include "core/io/dir_access.h" -#include "core/io/file_access.h" -#include "core/io/image_loader.h" -#include "core/io/json.h" -#include "core/io/marshalls.h" +#include "godot_plugin_config.h" + #include "core/io/zip_io.h" #include "core/os/os.h" -#include "core/templates/safe_refcount.h" -#include "core/version.h" -#include "drivers/png/png_driver_common.h" #include "editor/editor_export.h" -#include "editor/editor_log.h" -#include "editor/editor_settings.h" -#include "main/splash.gen.h" -#include "platform/android/logo.gen.h" -#include "platform/android/run_icon.gen.h" - -#include "godot_plugin_config.h" -#include "gradle_export_util.h" - -#include <string.h> const String SPLASH_CONFIG_XML_CONTENT = R"SPLASH(<?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/platform/javascript/export/export_plugin.cpp b/platform/javascript/export/export_plugin.cpp index d40ba2320a..c7e503732d 100644 --- a/platform/javascript/export/export_plugin.cpp +++ b/platform/javascript/export/export_plugin.cpp @@ -31,7 +31,6 @@ #include "export_plugin.h" #include "core/config/project_settings.h" -#include "editor/editor_node.h" Error EditorExportPlatformJavaScript::_extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa) { FileAccess *src_f = nullptr; diff --git a/platform/javascript/export/export_plugin.h b/platform/javascript/export/export_plugin.h index 8d4307548c..d17fd2f674 100644 --- a/platform/javascript/export/export_plugin.h +++ b/platform/javascript/export/export_plugin.h @@ -37,14 +37,13 @@ #include "core/io/tcp_server.h" #include "core/io/zip_io.h" #include "editor/editor_export.h" +#include "editor/editor_node.h" #include "main/splash.gen.h" #include "platform/javascript/logo.gen.h" #include "platform/javascript/run_icon.gen.h" #include "export_server.h" -class EditorNode; - class EditorExportPlatformJavaScript : public EditorExportPlatform { GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform); diff --git a/platform/javascript/export/export_server.h b/platform/javascript/export/export_server.h index 1380f34ad7..1b908ad9b0 100644 --- a/platform/javascript/export/export_server.h +++ b/platform/javascript/export/export_server.h @@ -36,7 +36,7 @@ #include "core/io/tcp_server.h" #include "core/io/zip_io.h" #include "editor/editor_export.h" -#include "editor/editor_node.h" +#include "editor/editor_paths.h" class EditorHTTPServer : public RefCounted { private: diff --git a/platform/osx/export/codesign.cpp b/platform/osx/export/codesign.cpp index 8d1d147196..1a2ad2bee6 100644 --- a/platform/osx/export/codesign.cpp +++ b/platform/osx/export/codesign.cpp @@ -35,7 +35,9 @@ #include "plist.h" #include "core/os/os.h" +#include "editor/editor_paths.h" #include "editor/editor_settings.h" + #include "modules/modules_enabled.gen.h" // For regex. #include <ctime> diff --git a/platform/osx/export/export_plugin.cpp b/platform/osx/export/export_plugin.cpp index 4d5c0a827a..17861f24d2 100644 --- a/platform/osx/export/export_plugin.cpp +++ b/platform/osx/export/export_plugin.cpp @@ -28,11 +28,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "modules/modules_enabled.gen.h" // For regex. +#include "export_plugin.h" #include "codesign.h" + #include "editor/editor_node.h" -#include "export_plugin.h" +#include "editor/editor_paths.h" + +#include "modules/modules_enabled.gen.h" // For regex. void EditorExportPlatformOSX::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) { if (p_preset->get("texture_format/s3tc")) { diff --git a/platform/uwp/export/app_packager.cpp b/platform/uwp/export/app_packager.cpp index c7b3bc9854..e7978ff74d 100644 --- a/platform/uwp/export/app_packager.cpp +++ b/platform/uwp/export/app_packager.cpp @@ -31,6 +31,7 @@ #include "app_packager.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" String AppxPackager::hash_block(const uint8_t *p_block_data, size_t p_block_len) { unsigned char hash[32]; diff --git a/platform/uwp/export/export_plugin.h b/platform/uwp/export/export_plugin.h index eab958534a..4c2d25e533 100644 --- a/platform/uwp/export/export_plugin.h +++ b/platform/uwp/export/export_plugin.h @@ -41,6 +41,7 @@ #include "core/version.h" #include "editor/editor_export.h" #include "editor/editor_node.h" +#include "editor/editor_paths.h" #include "thirdparty/minizip/unzip.h" #include "thirdparty/minizip/zip.h" diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index 1cbe3adb3c..9297aeea08 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -33,12 +33,7 @@ #include "core/os/keyboard.h" #include "core/string/print_string.h" #include "core/string/translation.h" -#include "line_edit.h" - -#ifdef TOOLS_ENABLED -#include "editor/editor_node.h" -#include "scene/main/window.h" // Only used to check for more modals when dimming the editor. -#endif +#include "scene/gui/line_edit.h" // AcceptDialog |