From 3902cf1924fd9ebb4403753c92a80f4d0fabc2dd Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 10 Dec 2023 18:01:51 +0100 Subject: [PATCH] Moved ScneeStringNames and PropertyUtils into scene/main. --- core/math/a_star.cpp | 2 +- editor/editor_inspector.cpp | 2 +- editor/plugins/animation_tree_editor_plugin.cpp | 2 +- editor/plugins/packed_scene_editor_plugin.cpp | 2 +- editor/scene_tree_dock.cpp | 2 +- editor_modules/editor_code_editor/editor_script_editor.cpp | 2 +- editor_modules/editor_code_editor/script_editor_plugin.cpp | 2 +- modules/gridmap/grid_map.cpp | 2 +- modules/paint/nodes/curve_2d/paint_curve_2d.cpp | 2 +- modules/skeleton_2d/nodes/skeleton_2d.cpp | 2 +- modules/skeleton_3d/nodes/physical_bone.cpp | 2 +- modules/skeleton_3d/nodes/skeleton.cpp | 2 +- scene/2d/animated_sprite.cpp | 2 +- scene/2d/area_2d.cpp | 2 +- scene/2d/camera_2d.cpp | 2 +- scene/2d/collision_object_2d.cpp | 2 +- scene/2d/joints_2d.cpp | 2 +- scene/2d/path_2d.cpp | 2 +- scene/2d/physics_body_2d.cpp | 2 +- scene/2d/remote_transform_2d.cpp | 2 +- scene/2d/sprite.cpp | 2 +- scene/2d/touch_screen_button.cpp | 2 +- scene/2d/visibility_notifier_2d.cpp | 2 +- scene/3d/area.cpp | 2 +- scene/3d/collision_object.cpp | 2 +- scene/3d/label_3d.cpp | 2 +- scene/3d/mesh_instance.cpp | 2 +- scene/3d/path.cpp | 2 +- scene/3d/physics_body.cpp | 2 +- scene/3d/physics_joint.cpp | 2 +- scene/3d/sprite_3d.cpp | 2 +- scene/3d/visibility_notifier.cpp | 2 +- scene/3d/visual_instance.cpp | 2 +- scene/animation/animation.cpp | 2 +- scene/animation/animation_blend_tree.cpp | 2 +- scene/animation/animation_player.cpp | 2 +- scene/animation/animation_tree.cpp | 2 +- scene/animation/scene_tree_tween.cpp | 2 +- scene/gui/base_button.cpp | 2 +- scene/gui/button.cpp | 2 +- scene/gui/container.cpp | 2 +- scene/gui/rich_text_label.cpp | 2 +- scene/gui/texture_button.cpp | 2 +- scene/gui/video_player.cpp | 2 +- scene/main/canvas_item.cpp | 2 +- scene/main/canvas_layer.cpp | 2 +- scene/main/control.cpp | 2 +- scene/main/node.cpp | 2 +- scene/main/node_2d.cpp | 2 +- scene/{ => main}/property_utils.cpp | 0 scene/{ => main}/property_utils.h | 0 scene/{ => main}/scene_string_names.cpp | 0 scene/{ => main}/scene_string_names.h | 0 scene/main/scene_tree.cpp | 2 +- scene/main/spatial.cpp | 2 +- scene/main/viewport.cpp | 2 +- scene/register_scene_types.cpp | 2 +- scene/resources/material/material.cpp | 2 +- scene/resources/packed_scene.cpp | 2 +- scene/resources/shader.cpp | 2 +- scene/resources/world_3d.cpp | 2 +- 61 files changed, 57 insertions(+), 57 deletions(-) rename scene/{ => main}/property_utils.cpp (100%) rename scene/{ => main}/property_utils.h (100%) rename scene/{ => main}/scene_string_names.cpp (100%) rename scene/{ => main}/scene_string_names.h (100%) diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index 7765faf07..1ef66d7ca 100644 --- a/core/math/a_star.cpp +++ b/core/math/a_star.cpp @@ -32,7 +32,7 @@ #include "core/math/geometry.h" #include "core/object/script_language.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" int AStar::get_available_point_id() const { if (points.has(last_free_id)) { diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index a88158ff5..99063e3a3 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -62,7 +62,7 @@ #include "scene/gui/scroll_bar.h" #include "scene/main/node.h" #include "scene/main/scene_tree.h" -#include "scene/property_utils.h" +#include "scene/main/property_utils.h" #include "scene/resources/font/font.h" #include "scene/resources/packed_scene.h" #include "scene/resources/style_box.h" diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index 9bb5a4ead..fd68c26ad 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -37,7 +37,7 @@ #include "editor/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "core/object/class_db.h" #include "core/error/error_macros.h" #include "core/containers/list.h" diff --git a/editor/plugins/packed_scene_editor_plugin.cpp b/editor/plugins/packed_scene_editor_plugin.cpp index be0dc7a05..041ee1f02 100644 --- a/editor/plugins/packed_scene_editor_plugin.cpp +++ b/editor/plugins/packed_scene_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "editor/editor_node.h" #include "scene/gui/button.h" #include "scene/resources/packed_scene.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void PackedSceneEditor::_on_open_scene_pressed() { // Using deferred call because changing scene updates the Inspector and thus destroys this plugin. diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 576743975..138807d86 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -91,7 +91,7 @@ #include "scene/main/node.h" #include "scene/main/scene_tree.h" #include "scene/main/viewport.h" -#include "scene/property_utils.h" +#include "scene/main/property_utils.h" #include "scene/animation/animation.h" #include "scene/resources/packed_scene.h" #include "scene/resources/texture.h" diff --git a/editor_modules/editor_code_editor/editor_script_editor.cpp b/editor_modules/editor_code_editor/editor_script_editor.cpp index 004aa86f8..065318e81 100644 --- a/editor_modules/editor_code_editor/editor_script_editor.cpp +++ b/editor_modules/editor_code_editor/editor_script_editor.cpp @@ -89,7 +89,7 @@ #include "scene/main/viewport.h" #include "scene/resources/text_file.h" #include "scene/resources/texture.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "editor_script_editor_quick_open.h" #include "editor_script_text_editor.h" diff --git a/editor_modules/editor_code_editor/script_editor_plugin.cpp b/editor_modules/editor_code_editor/script_editor_plugin.cpp index 11489f587..382ad9b79 100644 --- a/editor_modules/editor_code_editor/script_editor_plugin.cpp +++ b/editor_modules/editor_code_editor/script_editor_plugin.cpp @@ -88,7 +88,7 @@ #include "scene/main/viewport.h" #include "scene/resources/text_file.h" #include "scene/resources/texture.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "editor_script_editor_quick_open.h" #include "editor_script_text_editor.h" diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index a9a596cea..f0ff9aab1 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -37,7 +37,7 @@ #include "scene/resources/physics_material.h" #include "scene/resources/mesh/primitive_meshes.h" #include "scene/resources/mesh/surface_tool.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/navigation_server.h" #include "servers/rendering_server.h" diff --git a/modules/paint/nodes/curve_2d/paint_curve_2d.cpp b/modules/paint/nodes/curve_2d/paint_curve_2d.cpp index 49ac15af3..667f61028 100644 --- a/modules/paint/nodes/curve_2d/paint_curve_2d.cpp +++ b/modules/paint/nodes/curve_2d/paint_curve_2d.cpp @@ -32,7 +32,7 @@ #include "core/config/engine.h" #include "scene/resources/curve.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED #include "editor/editor_scale.h" diff --git a/modules/skeleton_2d/nodes/skeleton_2d.cpp b/modules/skeleton_2d/nodes/skeleton_2d.cpp index 912314b9e..a35ae704f 100644 --- a/modules/skeleton_2d/nodes/skeleton_2d.cpp +++ b/modules/skeleton_2d/nodes/skeleton_2d.cpp @@ -33,7 +33,7 @@ #include "../resources/skeleton_modification_2d.h" #include "../resources/skeleton_modification_stack_2d.h" #include "core/config/engine.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED #include "editor/editor_data.h" diff --git a/modules/skeleton_3d/nodes/physical_bone.cpp b/modules/skeleton_3d/nodes/physical_bone.cpp index ae711abd6..77161ef12 100644 --- a/modules/skeleton_3d/nodes/physical_bone.cpp +++ b/modules/skeleton_3d/nodes/physical_bone.cpp @@ -38,7 +38,7 @@ #include "core/config/project_settings.h" #include "core/containers/rid.h" #include "scene/resources/physics_material.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "skeleton.h" #ifdef TOOLS_ENABLED diff --git a/modules/skeleton_3d/nodes/skeleton.cpp b/modules/skeleton_3d/nodes/skeleton.cpp index 60680621f..a74f79cba 100644 --- a/modules/skeleton_3d/nodes/skeleton.cpp +++ b/modules/skeleton_3d/nodes/skeleton.cpp @@ -39,7 +39,7 @@ #include "core/config/project_settings.h" #include "physical_bone.h" #include "scene/resources/mesh/surface_tool.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void SkinReference::_skin_changed() { if (skeleton_node) { diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp index 5d3890520..df9135e39 100644 --- a/scene/2d/animated_sprite.cpp +++ b/scene/2d/animated_sprite.cpp @@ -32,7 +32,7 @@ #include "core/os/os.h" #include "scene/resources/texture.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index b5c6c0391..76d521b42 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -30,7 +30,7 @@ #include "area_2d.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/audio_server.h" #include "servers/physics_2d_server.h" diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 4b83cd758..0095225ec 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -33,7 +33,7 @@ #include "core/config/engine.h" #include "core/math/math_funcs.h" #include "scene/main/viewport.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering_server.h" void Camera2D::_update_scroll() { diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index 60b5e7794..1784d4e65 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -31,7 +31,7 @@ #include "collision_object_2d.h" #include "scene/resources/world_2d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/physics_2d_server.h" void CollisionObject2D::_notification(int p_what) { diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp index 4333e9a9b..d32238c92 100644 --- a/scene/2d/joints_2d.cpp +++ b/scene/2d/joints_2d.cpp @@ -32,7 +32,7 @@ #include "core/config/engine.h" #include "physics_body_2d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/physics_2d_server.h" void Joint2D::_disconnect_signals() { diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index 85234097c..b7fda2e78 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -32,7 +32,7 @@ #include "core/config/engine.h" #include "scene/resources/curve.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED #include "editor/editor_scale.h" diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index c8896ffdf..6086aae11 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -39,7 +39,7 @@ #include "core/config/project_settings.h" #include "core/containers/rid.h" #include "scene/resources/physics_material.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/physics_2d_server.h" void PhysicsBody2D::_notification(int p_what) { diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp index 727c556d4..78e07f233 100644 --- a/scene/2d/remote_transform_2d.cpp +++ b/scene/2d/remote_transform_2d.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "remote_transform_2d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void RemoteTransform2D::_update_cache() { cache = 0; diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index 995dbda4e..5cab72fce 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -33,7 +33,7 @@ #include "core/os/os.h" #include "scene/main/viewport.h" #include "scene/resources/texture.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED Dictionary Sprite::_edit_get_state() const { diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp index b6e754a7a..e0e1a300a 100644 --- a/scene/2d/touch_screen_button.cpp +++ b/scene/2d/touch_screen_button.cpp @@ -36,7 +36,7 @@ #include "scene/resources/bit_map.h" #include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "scene/resources/texture.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void TouchScreenButton::set_texture(const Ref &p_texture) { if (texture == p_texture) { diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp index c45d3bcde..a390b2016 100644 --- a/scene/2d/visibility_notifier_2d.cpp +++ b/scene/2d/visibility_notifier_2d.cpp @@ -37,7 +37,7 @@ #include "scene/main/viewport.h" #include "scene/main/world.h" #include "scene/resources/world_2d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED Rect2 VisibilityNotifier2D::_edit_get_rect() const { diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index dd8927824..c594b74cf 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -30,7 +30,7 @@ #include "area.h" #include "scene/resources/shapes/shape.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/audio_server.h" #include "servers/physics_server.h" diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index f86bc43d3..086c86ae4 100644 --- a/scene/3d/collision_object.cpp +++ b/scene/3d/collision_object.cpp @@ -34,7 +34,7 @@ #include "mesh_instance.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/physics_server.h" void CollisionObject::_notification(int p_what) { diff --git a/scene/3d/label_3d.cpp b/scene/3d/label_3d.cpp index 4e2f052fe..729f58bb3 100644 --- a/scene/3d/label_3d.cpp +++ b/scene/3d/label_3d.cpp @@ -33,7 +33,7 @@ #include "core/core_string_names.h" #include "scene/resources/mesh/primitive_meshes.h" #include "scene/resources/theme.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void Label3D::_bind_methods() { ClassDB::bind_method(D_METHOD("set_horizontal_alignment", "alignment"), &Label3D::set_horizontal_alignment); diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index 44d029bdb..5b818aee2 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -36,7 +36,7 @@ #include "physics_body.h" #include "scene/resources/material/material.h" #include "scene/resources/mesh/mesh.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering/rendering_server_globals.h" #include "modules/modules_enabled.gen.h" diff --git a/scene/3d/path.cpp b/scene/3d/path.cpp index 3d8ec067c..c6eefe73b 100644 --- a/scene/3d/path.cpp +++ b/scene/3d/path.cpp @@ -34,7 +34,7 @@ #include "scene/resources/curve.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering_server.h" Path::Path() { diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 269705665..25513da23 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -38,7 +38,7 @@ #include "core/object/method_bind_ext.gen.inc" #include "core/object/object.h" #include "scene/resources/physics_material.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" //#include "skeleton.h" #ifdef TOOLS_ENABLED diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp index 4b3349efc..b8f3b74e2 100644 --- a/scene/3d/physics_joint.cpp +++ b/scene/3d/physics_joint.cpp @@ -32,7 +32,7 @@ #include "scene/3d/physics_body.h" #include "scene/resources/shapes/shape.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void Joint::_disconnect_signals() { Node *node_a = get_node_or_null(a); diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 9cad6cc6d..09f85eaa5 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -32,7 +32,7 @@ #include "core/core_string_names.h" #include "core/math/triangle_mesh.h" #include "scene/2d/animated_sprite.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp index 15b3daad9..76f9e1d77 100644 --- a/scene/3d/visibility_notifier.cpp +++ b/scene/3d/visibility_notifier.cpp @@ -37,7 +37,7 @@ #include "scene/animation/animation_tree.h" #include "scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void VisibilityNotifier::_enter_camera(Camera *p_camera) { ERR_FAIL_COND(cameras.has(p_camera)); diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index fc8850092..92006c25e 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -32,7 +32,7 @@ #include "scene/resources/material/material.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering_server.h" //#include "skeleton.h" diff --git a/scene/animation/animation.cpp b/scene/animation/animation.cpp index 544132f5e..2022ce9b1 100644 --- a/scene/animation/animation.cpp +++ b/scene/animation/animation.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "animation.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "core/math/geometry.h" diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp index 8007ebc83..1973d4019 100644 --- a/scene/animation/animation_blend_tree.cpp +++ b/scene/animation/animation_blend_tree.cpp @@ -31,7 +31,7 @@ #include "animation_blend_tree.h" #include "scene/animation/animation_player.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void AnimationNodeAnimation::set_animation(const StringName &p_name) { animation = p_name; diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 028e7d527..1949d986f 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -35,7 +35,7 @@ #include "scene/main/node_2d.h" #include "scene/main/spatial.h" #include "scene/animation/animation.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/audio/audio_stream.h" #ifdef MODULE_SKELETON_3D_ENABLED diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index 090dc0c0e..151d209a6 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -35,7 +35,7 @@ #include "core/config/engine.h" #include "core/object/method_bind_ext.gen.inc" #include "scene/main/spatial.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/audio/audio_stream.h" #ifdef MODULE_SKELETON_3D_ENABLED diff --git a/scene/animation/scene_tree_tween.cpp b/scene/animation/scene_tree_tween.cpp index e3b50e521..21b87ffb4 100644 --- a/scene/animation/scene_tree_tween.cpp +++ b/scene/animation/scene_tree_tween.cpp @@ -33,7 +33,7 @@ #include "core/object/method_bind_ext.gen.inc" #include "scene/animation/tween.h" #include "scene/main/node.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void Tweener::set_tween(Ref p_tween) { tween = p_tween; diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index c033bdeca..ac65cb9e8 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -33,7 +33,7 @@ #include "core/input/shortcut.h" #include "core/os/keyboard.h" #include "scene/main/viewport.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void BaseButton::_unpress_group() { if (!button_group.is_valid()) { diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 663f066c1..7857670be 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -32,7 +32,7 @@ #include "core/string/translation.h" #include "servers/rendering_server.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" Size2 Button::get_minimum_size() const { Size2 minsize = get_theme_font("font")->total_size_of_lines(xl_text.split("\n")); diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index a91726392..ccab48368 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -30,7 +30,7 @@ #include "container.h" #include "core/object/message_queue.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void Container::_child_minsize_changed() { //Size2 ms = get_combined_minimum_size(); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index b07467739..c2fb997ee 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -35,7 +35,7 @@ #include "core/os/os.h" #include "label.h" #include "scene/gui/scroll_bar.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED #include "editor/editor_scale.h" diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp index eab0469c7..356c10ea5 100644 --- a/scene/gui/texture_button.cpp +++ b/scene/gui/texture_button.cpp @@ -32,7 +32,7 @@ #include "core/typedefs.h" #include "scene/resources/bit_map.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp index 77c18144c..8c8c8c306 100644 --- a/scene/gui/video_player.cpp +++ b/scene/gui/video_player.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "video_player.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "core/os/os.h" #include "servers/audio_server.h" diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index 7c6229762..41a63d593 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -40,7 +40,7 @@ #include "scene/resources/texture.h" #include "scene/resources/world_2d.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering/rendering_server_constants.h" #include "servers/rendering/rendering_server_raster.h" #include "servers/rendering_server.h" diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp index f88ee7bcb..08f3ab529 100644 --- a/scene/main/canvas_layer.cpp +++ b/scene/main/canvas_layer.cpp @@ -31,7 +31,7 @@ #include "canvas_layer.h" #include "scene/main/canvas_item.h" #include "scene/resources/world_2d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "viewport.h" void CanvasLayer::set_layer(int p_xform) { diff --git a/scene/main/control.cpp b/scene/main/control.cpp index b45c2a496..9fa5f9bdb 100644 --- a/scene/main/control.cpp +++ b/scene/main/control.cpp @@ -42,7 +42,7 @@ #include "scene/main/node.h" #include "scene/main/timer.h" #include "scene/main/viewport.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering_server.h" #ifdef TOOLS_ENABLED diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 5bd777fa4..d3a74b046 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -38,7 +38,7 @@ #include "process_group.h" #include "scene/animation/scene_tree_tween.h" #include "scene/resources/packed_scene.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "viewport.h" #include "world.h" diff --git a/scene/main/node_2d.cpp b/scene/main/node_2d.cpp index ba0ab76aa..5222364a4 100644 --- a/scene/main/node_2d.cpp +++ b/scene/main/node_2d.cpp @@ -33,7 +33,7 @@ #include "core/object/message_queue.h" #include "scene/main/control.h" #include "scene/main/viewport.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering_server.h" #ifdef TOOLS_ENABLED diff --git a/scene/property_utils.cpp b/scene/main/property_utils.cpp similarity index 100% rename from scene/property_utils.cpp rename to scene/main/property_utils.cpp diff --git a/scene/property_utils.h b/scene/main/property_utils.h similarity index 100% rename from scene/property_utils.h rename to scene/main/property_utils.h diff --git a/scene/scene_string_names.cpp b/scene/main/scene_string_names.cpp similarity index 100% rename from scene/scene_string_names.cpp rename to scene/main/scene_string_names.cpp diff --git a/scene/scene_string_names.h b/scene/main/scene_string_names.h similarity index 100% rename from scene/scene_string_names.h rename to scene/main/scene_string_names.h diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index cb0663202..114b7fab2 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -50,7 +50,7 @@ #include "scene/resources/material/material.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/packed_scene.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/audio_server.h" #include "servers/navigation_server.h" #include "servers/physics_2d_server.h" diff --git a/scene/main/spatial.cpp b/scene/main/spatial.cpp index 88b5029f6..8f19d0569 100644 --- a/scene/main/spatial.cpp +++ b/scene/main/spatial.cpp @@ -36,7 +36,7 @@ #include "scene/main/scene_tree.h" #include "scene/main/world.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering_server_callbacks.h" /* diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index fdadaeced..f846844d1 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -55,7 +55,7 @@ #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_2d.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/physics_2d_server.h" void ViewportTexture::setup_local_to_scene() { diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index b01da72b1..0b91312c0 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -183,7 +183,7 @@ #include "scene/resources/video_stream.h" #include "scene/resources/world_2d.h" #include "scene/resources/world_3d.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #ifndef _3D_DISABLED #include "scene/3d/area.h" diff --git a/scene/resources/material/material.cpp b/scene/resources/material/material.cpp index b2844e24e..4ab18d9d9 100644 --- a/scene/resources/material/material.cpp +++ b/scene/resources/material/material.cpp @@ -40,7 +40,7 @@ #include "editor/editor_settings.h" #endif -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" void Material::set_next_pass(const Ref &p_pass) { for (Ref pass_child = p_pass; pass_child != nullptr; pass_child = pass_child->get_next_pass()) { diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 0b18380fe..ecb034a6f 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -40,7 +40,7 @@ #include "scene/main/control.h" #include "core/input/shortcut.h" #include "scene/main/instance_placeholder.h" -#include "scene/property_utils.h" +#include "scene/main/property_utils.h" #define PACKED_SCENE_VERSION 2 diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index 890781196..db60febea 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -30,7 +30,7 @@ #include "shader.h" #include "core/os/file_access.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/rendering/shader_language.h" #include "servers/rendering_server.h" #include "texture.h" diff --git a/scene/resources/world_3d.cpp b/scene/resources/world_3d.cpp index d7a31e4a8..7a20cb357 100644 --- a/scene/resources/world_3d.cpp +++ b/scene/resources/world_3d.cpp @@ -35,7 +35,7 @@ #include "core/math/projection.h" #include "scene/3d/camera.h" #include "scene/3d/visibility_notifier.h" -#include "scene/scene_string_names.h" +#include "scene/main/scene_string_names.h" #include "servers/navigation_server.h" struct SpatialIndexer {