Skip to content

Commit

Permalink
Moved CanvasItem, Control, Node2D and Spatial under scene/main.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Relintai
Relintai committed Dec 10, 2023
1 parent 0dfba6c commit 9df5649
Show file tree
Hide file tree
Showing 272 changed files with 309 additions and 309 deletions.
2 changes: 1 addition & 1 deletion core/variant/variant.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "core/string/print_string.h"
#include "core/object/resource.h"
#include "core/variant/variant_parser.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/main/node.h"

String Variant::get_type_name(Variant::Type p_type) {
Expand Down
2 changes: 1 addition & 1 deletion editor/animation_bezier_editor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#include "core/object/undo_redo.h"
#include "editor/animation_track_editor.h"
#include "editor/editor_settings.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/option_button.h"
#include "scene/gui/popup_menu.h"
#include "scene/gui/range.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/animation_bezier_editor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/

#include "scene/gui/control.h"
#include "scene/main/control.h"

#include "core/containers/rb_map.h"
#include "core/math/rect2.h"
Expand Down
4 changes: 2 additions & 2 deletions editor/animation_track_editor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
#include "editor/scene_tree_editor.h"
#include "editor_node.h"
#include "editor_scale.h"
#include "scene/2d/canvas_item.h"
#include "scene/3d/spatial.h"
#include "scene/main/canvas_item.h"
#include "scene/main/spatial.h"
#include "scene/animation/animation_player.h"
#include "scene/gui/button.h"
#include "scene/gui/check_box.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/animation_track_editor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "core/object/reference.h"
#include "scene/gui/box_container.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/range.h"

#include "scene/gui/slider.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/connections_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include "scene/gui/button.h"
#include "scene/gui/check_box.h"
#include "scene/gui/check_button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/margin_container.h"
Expand Down
4 changes: 2 additions & 2 deletions editor/create_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
#include "editor_node.h"
#include "editor_scale.h"
#include "editor_settings.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/popup.h"
#include "scene/gui/rich_text_label.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/dependency_editor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include "editor/editor_settings.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/item_list.h"
#include "scene/gui/label.h"
#include "scene/gui/popup_menu.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_about.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "core/variant/variant.h"
#include "editor/editor_scale.h"
#include "scene/gui/box_container.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/item_list.h"
#include "scene/gui/label.h"
#include "scene/gui/link_button.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_audio_buses.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include "editor_node.h"
#include "editor_scale.h"
#include "filesystem_dock.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/button.h"
#include "scene/gui/label.h"
#include "scene/gui/menu_button.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_audio_buses.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/*************************************************************************/

#include "editor_plugin.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/panel_container.h"
#include "scene/gui/box_container.h"

Expand Down
2 changes: 1 addition & 1 deletion editor/editor_autoload_settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#include "core/containers/vector.h"
#include "editor/editor_file_dialog.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/tree.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_dir_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "core/os/dir_access.h"
#include "core/os/memory.h"
#include "core/variant/variant.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/tree.h"
#include "scene/main/node.h"

Expand Down
2 changes: 1 addition & 1 deletion editor/editor_file_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include "scene/gui/base_button.h"
#include "scene/gui/button.h"
#include "scene/gui/center_container.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/item_list.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
Expand Down
4 changes: 2 additions & 2 deletions editor/editor_help.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
#include "editor_node.h"
#include "editor_scale.h"
#include "editor_settings.h"
#include "scene/2d/canvas_item.h"
#include "scene/gui/control.h"
#include "scene/main/canvas_item.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/scroll_bar.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_help_search.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "editor/editor_settings.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/option_button.h"
#include "scene/gui/popup.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_inspector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include "editor_scale.h"
#include "editor_settings.h"
#include "multi_node_edit.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/box_container.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_inspector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "core/object/reference.h"
#include "scene/gui/container.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/scroll_container.h"

#include "core/containers/list.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_layouts_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include "core/string/ustring.h"
#include "core/variant/variant.h"
#include "core/containers/vector.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"

void EditorLayoutsDialog::_line_gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventKey> k = p_event;
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_log.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "editor_node.h"
#include "editor_scale.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/rich_text_label.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_network_profiler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include "core/string/ustring.h"
#include "core/variant/variant.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/tree.h"
#include "scene/main/node.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_node.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/check_box.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/file_dialog.h"
#include "scene/gui/label.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_node.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include "core/variant/dictionary.h"
#include "core/variant/variant.h"
#include "editor/editor_data.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"

#include "scene/resources/texture.h"
#include "scene/resources/theme.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_path.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include "core/variant/variant.h"
#include "editor/editor_data.h"
#include "scene/gui/box_container.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/margin_container.h"
#include "scene/gui/popup_menu.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#include "scene/3d/camera.h"
#include "scene/gui/box_container.h"
#include "scene/gui/container.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/popup_menu.h"
#include "scene/gui/split_container.h"
#include "scene/gui/tab_container.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_plugin_settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "editor_node.h"
#include "editor_scale.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/tree.h"
#include "scene/main/node.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_profiler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "core/os/memory.h"
#include "core/variant/variant.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/option_button.h"
#include "scene/gui/spin_box.h"
Expand Down
4 changes: 2 additions & 2 deletions editor/editor_properties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
#include "editor_node.h"
#include "editor_properties_array_dict.h"
#include "editor_scale.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/check_box.h"
#include "scene/gui/color_picker.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/grid_container.h"
#include "scene/gui/label.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_properties_array_dict.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include "editor_properties.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/panel_container.h"
#include "scene/gui/popup_menu.h"
Expand Down
4 changes: 2 additions & 2 deletions editor/editor_resource_picker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
#include "editor_scale.h"
#include "editor_settings.h"
#include "filesystem_dock.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/popup_menu.h"
#include "scene/gui/tab_container.h"
#include "scene/gui/texture_rect.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_resource_preview.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "core/os/os.h"
#include "core/object/script_language.h"
#include "core/typedefs.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "servers/rendering_server.h"

bool EditorResourcePreviewGenerator::handles(const String &p_type) const {
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_sectioned_inspector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "core/containers/vector.h"
#include "editor/editor_inspector.h"
#include "scene/gui/box_container.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/tree.h"

Expand Down
4 changes: 2 additions & 2 deletions editor/editor_spin_slider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
#include "core/os/memory.h"
#include "core/typedefs.h"
#include "core/variant/variant.h"
#include "scene/2d/canvas_item.h"
#include "scene/gui/control.h"
#include "scene/main/canvas_item.h"
#include "scene/main/control.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/popup_menu.h"
#include "scene/gui/texture_rect.h"
Expand Down
4 changes: 2 additions & 2 deletions editor/editor_sub_scene.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
#include "core/string/string_name.h"
#include "core/variant/variant.h"
#include "editor/editor_file_dialog.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/tree.h"
#include "scene/main/node.h"
Expand Down
4 changes: 2 additions & 2 deletions editor/export_template_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
#include "editor_node.h"
#include "editor_scale.h"
#include "progress_dialog.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/file_dialog.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/filesystem_dock.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#include "editor_settings.h"
#include "import_dock.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/item_list.h"
#include "scene/gui/label.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/find_in_files.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include "core/string/print_string.h"
#include "core/object/reference.h"
#include "core/typedefs.h"
#include "scene/2d/canvas_item.h"
#include "scene/main/canvas_item.h"
#include "scene/resources/font/font.h"

const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found";
Expand Down
2 changes: 1 addition & 1 deletion editor/find_in_files.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/*************************************************************************/

#include "scene/gui/dialogs.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/main/node.h"

#include "core/containers/hash_map.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/groups_editor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "core/variant/variant.h"
#include "editor/scene_tree_dock.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/tool_button.h"
#include "scene/gui/tree.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/import_defaults_editor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "editor/editor_inspector.h"
#include "scene/gui/button.h"
#include "scene/gui/center_container.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/label.h"
#include "scene/gui/option_button.h"

Expand Down
2 changes: 1 addition & 1 deletion editor/import_dock.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#include "editor/editor_inspector.h"
#include "editor/editor_settings.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"
#include "scene/main/control.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/label.h"
#include "scene/gui/menu_button.h"
Expand Down
Loading

0 comments on commit 9df5649

Please sign in to comment.