diff --git a/core/SCsub b/core/SCsub index 4cd2c7832..04c033100 100644 --- a/core/SCsub +++ b/core/SCsub @@ -181,6 +181,7 @@ env.CommandNoCache( # Chain load SCsubs SConscript("os/SCsub") SConscript("math/SCsub") +SConscript("string/SCsub") SConscript("containers/SCsub") SConscript("variant/SCsub") SConscript("crypto/SCsub") diff --git a/core/bind/logger_bind.h b/core/bind/logger_bind.h index 1901d5134..94443d3a5 100644 --- a/core/bind/logger_bind.h +++ b/core/bind/logger_bind.h @@ -5,7 +5,7 @@ #include "core/log/logger_backend.h" #include "core/object/reference.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class String; diff --git a/core/containers/hash_map.h b/core/containers/hash_map.h index bc9ccde71..0ecb7cfdf 100644 --- a/core/containers/hash_map.h +++ b/core/containers/hash_map.h @@ -35,7 +35,7 @@ #include "core/containers/list.h" #include "core/math/math_funcs.h" #include "core/os/memory.h" -#include "core/ustring.h" +#include "core/string/ustring.h" /** * @class HashMap diff --git a/core/containers/hashfuncs.h b/core/containers/hashfuncs.h index bdadf1910..75d7980dd 100644 --- a/core/containers/hashfuncs.h +++ b/core/containers/hashfuncs.h @@ -42,9 +42,9 @@ #include "core/math/vector4.h" #include "core/math/vector4i.h" #include "core/object_id.h" -#include "core/node_path.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/rid.h" #include "core/typedefs.h" diff --git a/core/containers/pool_vector.h b/core/containers/pool_vector.h index 7266933c0..951b6b6e9 100644 --- a/core/containers/pool_vector.h +++ b/core/containers/pool_vector.h @@ -35,7 +35,7 @@ #include "core/os/rw_lock.h" #include "core/pool_allocator.h" #include "core/safe_refcount.h" -#include "core/ustring.h" +#include "core/string/ustring.h" struct MemoryPool { //avoid accessing these directly, must be public for template access diff --git a/core/core_string_names.h b/core/core_string_names.h index ec37148e0..6924cdbdd 100644 --- a/core/core_string_names.h +++ b/core/core_string_names.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/string_name.h" +#include "core/string/string_name.h" class CoreStringNames { friend void register_core_types(); diff --git a/core/engine.h b/core/engine.h index f14746c52..1cc73e061 100644 --- a/core/engine.h +++ b/core/engine.h @@ -32,7 +32,7 @@ #include "core/containers/list.h" #include "core/os/main_loop.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class Engine { diff --git a/core/error_macros.cpp b/core/error_macros.cpp index 71a38c021..a26edea9a 100644 --- a/core/error_macros.cpp +++ b/core/error_macros.cpp @@ -31,7 +31,7 @@ #include "error_macros.h" #include "core/io/logger.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "os/os.h" static ErrorHandlerList *error_handler_list = nullptr; diff --git a/core/global_constants.h b/core/global_constants.h index cb7f56712..26381787a 100644 --- a/core/global_constants.h +++ b/core/global_constants.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/string_name.h" +#include "core/string/string_name.h" class GlobalConstants { public: diff --git a/core/image.cpp b/core/image.cpp index 463198fff..cfa5757c5 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -35,7 +35,7 @@ #include "core/io/image_loader.h" #include "core/io/resource_loader.h" #include "core/math/math_funcs.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "thirdparty/misc/hq2x.h" diff --git a/core/io/file_access_compressed.cpp b/core/io/file_access_compressed.cpp index a632ff28f..252c2e477 100644 --- a/core/io/file_access_compressed.cpp +++ b/core/io/file_access_compressed.cpp @@ -30,7 +30,7 @@ #include "file_access_compressed.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_mode, uint32_t p_block_size) { magic = p_magic.ascii().get_data(); diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index 936382e9e..5e0259357 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -31,7 +31,7 @@ #include "file_access_encrypted.h" #include "core/crypto/crypto_core.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/variant/variant.h" #include diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h index fc7e54360..0625c8994 100644 --- a/core/io/file_access_pack.h +++ b/core/io/file_access_pack.h @@ -34,7 +34,7 @@ #include "core/containers/map.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/containers/set.h" #include "core/containers/hashfuncs.h" diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp index 597adf861..27df650da 100644 --- a/core/io/image_loader.cpp +++ b/core/io/image_loader.cpp @@ -30,7 +30,7 @@ #include "image_loader.h" -#include "core/print_string.h" +#include "core/string/print_string.h" bool ImageFormatLoader::recognize(const String &p_extension) const { List extensions; diff --git a/core/io/image_loader.h b/core/io/image_loader.h index 401e1fac3..98ff09a5c 100644 --- a/core/io/image_loader.h +++ b/core/io/image_loader.h @@ -34,7 +34,7 @@ #include "core/io/resource_loader.h" #include "core/containers/list.h" #include "core/os/file_access.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class ImageLoader; diff --git a/core/io/ip_address.h b/core/io/ip_address.h index 3b08404df..b55806185 100644 --- a/core/io/ip_address.h +++ b/core/io/ip_address.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ustring.h" +#include "core/string/ustring.h" struct IP_Address { private: diff --git a/core/io/json.cpp b/core/io/json.cpp index 4bdffa6e8..35f2fc649 100644 --- a/core/io/json.cpp +++ b/core/io/json.cpp @@ -30,7 +30,7 @@ #include "json.h" -#include "core/print_string.h" +#include "core/string/print_string.h" const char *JSON::tk_name[TK_MAX] = { "'{'", diff --git a/core/io/logger.cpp b/core/io/logger.cpp index 9e267a36c..311136024 100644 --- a/core/io/logger.cpp +++ b/core/io/logger.cpp @@ -32,7 +32,7 @@ #include "core/os/dir_access.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" // va_copy was defined in the C99, but not in C++ standards before C++11. diff --git a/core/io/logger.h b/core/io/logger.h index 10787b582..c3e033346 100644 --- a/core/io/logger.h +++ b/core/io/logger.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/os/file_access.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index fcdfd8427..4e635b55e 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -31,7 +31,7 @@ #include "marshalls.h" #include "core/os/keyboard.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/reference.h" #include diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index ad7a3ac84..c8f0ce9c7 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -33,10 +33,9 @@ #include "core/io/resource_importer.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/path_remap.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "core/variant/variant_parser.h" Ref ResourceLoader::loader[ResourceLoader::MAX_LOADERS]; diff --git a/core/io/translation_loader_po.cpp b/core/io/translation_loader_po.cpp index 080c196d6..31ab4d089 100644 --- a/core/io/translation_loader_po.cpp +++ b/core/io/translation_loader_po.cpp @@ -31,7 +31,7 @@ #include "translation_loader_po.h" #include "core/os/file_access.h" -#include "core/translation.h" +#include "core/string/translation.h" RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error) { enum Status { diff --git a/core/io/translation_loader_po.h b/core/io/translation_loader_po.h index be571bf67..1b006d3cb 100644 --- a/core/io/translation_loader_po.h +++ b/core/io/translation_loader_po.h @@ -32,7 +32,7 @@ #include "core/io/resource_loader.h" #include "core/os/file_access.h" -#include "core/translation.h" +#include "core/string/translation.h" class TranslationLoaderPO : public ResourceFormatLoader { public: diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp index e4e3f5f3f..de36c960d 100644 --- a/core/io/xml_parser.cpp +++ b/core/io/xml_parser.cpp @@ -30,7 +30,7 @@ #include "xml_parser.h" -#include "core/print_string.h" +#include "core/string/print_string.h" //#define DEBUG_XML diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h index da0be6ee2..3139e794f 100644 --- a/core/io/xml_parser.h +++ b/core/io/xml_parser.h @@ -32,7 +32,7 @@ #include "core/os/file_access.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" /* diff --git a/core/log/logger.cpp b/core/log/logger.cpp index fb1f51e53..d9efa8dcf 100644 --- a/core/log/logger.cpp +++ b/core/log/logger.cpp @@ -1,7 +1,7 @@ #include "logger.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/typedefs.h" void PLogger::log_trace(const String &str) { diff --git a/core/log/logger.h b/core/log/logger.h index 3f7bf03f4..55e7f5132 100644 --- a/core/log/logger.h +++ b/core/log/logger.h @@ -4,7 +4,7 @@ #include "core/object/reference.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "logger_backend.h" class String; diff --git a/core/log/logger_backend.cpp b/core/log/logger_backend.cpp index 9c574663d..e970a6a6c 100644 --- a/core/log/logger_backend.cpp +++ b/core/log/logger_backend.cpp @@ -1,7 +1,7 @@ #include "logger_backend.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void LoggerBackend::log_trace(const String &str) { call("_log_trace", str); diff --git a/core/log/logger_backend.h b/core/log/logger_backend.h index 9ec856a56..e70e76f4a 100644 --- a/core/log/logger_backend.h +++ b/core/log/logger_backend.h @@ -1,7 +1,7 @@ #ifndef LOGGER_BACKEND_H #define LOGGER_BACKEND_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/object/reference.h" diff --git a/core/math/aabb.cpp b/core/math/aabb.cpp index 91e6f89b9..7e140f738 100644 --- a/core/math/aabb.cpp +++ b/core/math/aabb.cpp @@ -31,7 +31,7 @@ #include "aabb.h" #include "core/variant/variant.h" -#include "core/print_string.h" +#include "core/string/print_string.h" real_t AABB::get_volume() const { return size.x * size.y * size.z; diff --git a/core/math/basis.cpp b/core/math/basis.cpp index 392208f24..7adfc8f9b 100644 --- a/core/math/basis.cpp +++ b/core/math/basis.cpp @@ -31,7 +31,7 @@ #include "basis.h" #include "core/math/math_funcs.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #define cofac(row1, col1, row2, col2) \ (rows[row1][col1] * rows[row2][col2] - rows[row1][col2] * rows[row2][col1]) diff --git a/core/math/bsp_tree.cpp b/core/math/bsp_tree.cpp index a96cdd8d5..768711dda 100644 --- a/core/math/bsp_tree.cpp +++ b/core/math/bsp_tree.cpp @@ -31,7 +31,7 @@ #include "bsp_tree.h" #include "core/error_macros.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void BSP_Tree::from_aabb(const AABB &p_aabb) { planes.clear(); diff --git a/core/math/bvh_tree.h b/core/math/bvh_tree.h index 9e700c390..fb09a68cd 100644 --- a/core/math/bvh_tree.h +++ b/core/math/bvh_tree.h @@ -44,7 +44,7 @@ #include "core/math/geometry.h" #include "core/math/vector3.h" #include "core/containers/pooled_list.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include #define BVHABB_CLASS BVH_ABB diff --git a/core/math/color.cpp b/core/math/color.cpp index 4ce322b55..f83cd9064 100644 --- a/core/math/color.cpp +++ b/core/math/color.cpp @@ -33,7 +33,7 @@ #include "core/math/color_names.inc" #include "core/containers/map.h" #include "core/math/math_funcs.h" -#include "core/print_string.h" +#include "core/string/print_string.h" uint32_t Color::to_argb32() const { uint32_t c = (uint8_t)Math::round(a * 255); diff --git a/core/math/color.h b/core/math/color.h index 9c5f4e82b..dfcd0b956 100644 --- a/core/math/color.h +++ b/core/math/color.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/math/math_funcs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" struct _NO_DISCARD_CLASS_ Color { union { diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp index 2a86d34cf..88c3f1587 100644 --- a/core/math/geometry.cpp +++ b/core/math/geometry.cpp @@ -31,7 +31,7 @@ #include "geometry.h" #include "core/containers/local_vector.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "thirdparty/misc/clipper.hpp" #include "thirdparty/misc/triangulator.h" diff --git a/core/math/geometry.h b/core/math/geometry.h index 8f9ef26dc..c22b11825 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -38,7 +38,7 @@ #include "core/math/vector2i.h" #include "core/object/object.h" #include "core/containers/pool_vector.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/containers/vector.h" class Geometry { diff --git a/core/math/octree_definition.inc b/core/math/octree_definition.inc index 448c4f2c7..26faef7ce 100644 --- a/core/math/octree_definition.inc +++ b/core/math/octree_definition.inc @@ -38,7 +38,7 @@ #include "core/math/geometry.h" #include "core/math/vector3.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/variant/variant.h" typedef uint32_t OctreeElementID; diff --git a/core/math/projection.cpp b/core/math/projection.cpp index db10c8852..17322e3a3 100644 --- a/core/math/projection.cpp +++ b/core/math/projection.cpp @@ -36,7 +36,7 @@ #include "core/math/plane.h" #include "core/math/rect2.h" #include "core/math/transform.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/variant/variant.h" float Projection::determinant() const { diff --git a/core/math/quaternion.cpp b/core/math/quaternion.cpp index d8e7bec34..1b221b159 100644 --- a/core/math/quaternion.cpp +++ b/core/math/quaternion.cpp @@ -31,7 +31,7 @@ #include "quaternion.h" #include "core/math/basis.h" -#include "core/print_string.h" +#include "core/string/print_string.h" real_t Quaternion::angle_to(const Quaternion &p_to) const { real_t d = dot(p_to); diff --git a/core/math/quaternion.h b/core/math/quaternion.h index e0e229c22..71d05a814 100644 --- a/core/math/quaternion.h +++ b/core/math/quaternion.h @@ -33,7 +33,7 @@ #include "core/math/math_defs.h" #include "core/math/math_funcs.h" #include "core/math/vector3.h" -#include "core/ustring.h" +#include "core/string/ustring.h" struct _NO_DISCARD_CLASS_ Quaternion { union { diff --git a/core/math/transform.cpp b/core/math/transform.cpp index 2c00bc991..d80975fd2 100644 --- a/core/math/transform.cpp +++ b/core/math/transform.cpp @@ -31,7 +31,7 @@ #include "transform.h" #include "core/math/math_funcs.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void Transform::invert() { basis.transpose(); diff --git a/core/math/vector2.cpp b/core/math/vector2.cpp index cad257631..ce4912335 100644 --- a/core/math/vector2.cpp +++ b/core/math/vector2.cpp @@ -30,7 +30,7 @@ #include "vector2.h" -#include "core/ustring.h" +#include "core/string/ustring.h" real_t Vector2::angle() const { return Math::atan2(y, x); diff --git a/core/math/vector2i.cpp b/core/math/vector2i.cpp index 1851ee314..607e194d8 100644 --- a/core/math/vector2i.cpp +++ b/core/math/vector2i.cpp @@ -30,7 +30,7 @@ #include "vector2i.h" -#include "core/ustring.h" +#include "core/string/ustring.h" Vector2i Vector2i::clamp(const Vector2i &p_min, const Vector2i &p_max) const { return Vector2i( diff --git a/core/math/vector3.h b/core/math/vector3.h index 9139f1c7f..fed062843 100644 --- a/core/math/vector3.h +++ b/core/math/vector3.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/math/math_funcs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" struct Basis; diff --git a/core/math/vector3i.cpp b/core/math/vector3i.cpp index 72ca346b2..1d3deaaeb 100644 --- a/core/math/vector3i.cpp +++ b/core/math/vector3i.cpp @@ -31,7 +31,7 @@ #include "vector3i.h" #include "core/math/vector3.h" -#include "core/ustring.h" +#include "core/string/ustring.h" void Vector3i::set_axis(const int p_axis, const int32_t p_value) { ERR_FAIL_INDEX(p_axis, 3); diff --git a/core/math/vector4.cpp b/core/math/vector4.cpp index aaa39cda9..b01da7932 100644 --- a/core/math/vector4.cpp +++ b/core/math/vector4.cpp @@ -31,7 +31,7 @@ #include "vector4.h" #include "core/math/basis.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void Vector4::set_axis(const int p_axis, const real_t p_value) { ERR_FAIL_INDEX(p_axis, 4); diff --git a/core/math/vector4.h b/core/math/vector4.h index c83d6a9bb..10065523e 100644 --- a/core/math/vector4.h +++ b/core/math/vector4.h @@ -33,7 +33,7 @@ #include "core/math/math_defs.h" #include "core/math/math_funcs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" struct _NO_DISCARD_CLASS_ Vector4 { enum Axis { diff --git a/core/math/vector4i.cpp b/core/math/vector4i.cpp index c7aedd98b..a5e3d6f24 100644 --- a/core/math/vector4i.cpp +++ b/core/math/vector4i.cpp @@ -31,7 +31,7 @@ #include "vector4i.h" #include "core/math/vector4.h" -#include "core/ustring.h" +#include "core/string/ustring.h" void Vector4i::set_axis(const int p_axis, const int32_t p_value) { ERR_FAIL_INDEX(p_axis, 4); diff --git a/core/object/class_db.h b/core/object/class_db.h index b08221426..ceea2ac01 100644 --- a/core/object/class_db.h +++ b/core/object/class_db.h @@ -32,7 +32,7 @@ #include "core/object/method_bind.h" #include "core/object/object.h" -#include "core/print_string.h" +#include "core/string/print_string.h" /** To bind more then 6 parameters include this: * #include "core/object/method_bind_ext.gen.inc" diff --git a/core/object/object.cpp b/core/object/object.cpp index 100f7f7e1..3ec65e3ce 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -35,10 +35,10 @@ #include "core/object/message_queue.h" #include "core/object_rc.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/resource.h" #include "core/object/script_language.h" -#include "core/translation.h" +#include "core/string/translation.h" #ifdef DEBUG_ENABLED diff --git a/core/os/dir_access.h b/core/os/dir_access.h index 3475a9f79..955454a4f 100644 --- a/core/os/dir_access.h +++ b/core/os/dir_access.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" //@ TODO, excellent candidate for THREAD_SAFE MACRO, should go through all these and add THREAD_SAFE where it applies class DirAccess { diff --git a/core/os/file_access.h b/core/os/file_access.h index 42df24c12..19b99289f 100644 --- a/core/os/file_access.h +++ b/core/os/file_access.h @@ -33,7 +33,7 @@ #include "core/math/math_defs.h" #include "core/os/memory.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" /** * Multi-Platform abstraction for accessing to files. diff --git a/core/os/input_event.h b/core/os/input_event.h index 1da6d43ff..2ea6a1204 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -33,7 +33,7 @@ #include "core/math/transform_2d.h" #include "core/object/resource.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" /** * Input Event classes. These are used in the main loop. diff --git a/core/os/keyboard.h b/core/os/keyboard.h index 963ccbefe..412072242 100644 --- a/core/os/keyboard.h +++ b/core/os/keyboard.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ustring.h" +#include "core/string/ustring.h" /* Special Key: diff --git a/core/os/os.h b/core/os/os.h index d6f09dfb4..25bf3dfea 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -35,7 +35,7 @@ #include "core/io/logger.h" #include "core/containers/list.h" #include "core/os/main_loop.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include diff --git a/core/path_remap.cpp b/core/path_remap.cpp deleted file mode 100644 index 851cab94c..000000000 --- a/core/path_remap.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/*************************************************************************/ -/* path_remap.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ - -#include "path_remap.h" diff --git a/core/path_remap.h b/core/path_remap.h deleted file mode 100644 index 8dd67048d..000000000 --- a/core/path_remap.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef PATH_REMAP_H -#define PATH_REMAP_H -/*************************************************************************/ -/* path_remap.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ - -#endif // PATH_REMAP_H diff --git a/core/pool_allocator.cpp b/core/pool_allocator.cpp index e4e86d320..e6501ae6a 100644 --- a/core/pool_allocator.cpp +++ b/core/pool_allocator.cpp @@ -33,7 +33,7 @@ #include "core/error_macros.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index 124033331..9438ce988 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -32,7 +32,7 @@ #include "core/bind/core_bind.h" #include "core/object/class_db.h" -#include "core/compressed_translation.h" +#include "core/string/compressed_translation.h" #include "core/core_string_names.h" #include "core/crypto/aes_context.h" #include "core/crypto/crypto.h" @@ -69,9 +69,8 @@ #include "core/os/main_loop.h" #include "core/os/time.h" #include "core/containers/packed_data_container.h" -#include "core/path_remap.h" #include "core/project_settings.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "core/object/undo_redo.h" #include "core/bind/logger_bind.h" diff --git a/core/rid_handle.cpp b/core/rid_handle.cpp index 72cfe74e4..7d126fb60 100644 --- a/core/rid_handle.cpp +++ b/core/rid_handle.cpp @@ -32,8 +32,8 @@ #ifdef RID_HANDLES_ENABLED #include "core/os/memory.h" -#include "core/print_string.h" -#include "core/ustring.h" +#include "core/string/print_string.h" +#include "core/string/ustring.h" // This define will flag up an error when get() or getptr() is called with a NULL object. // These calls should more correctly be made as get_or_null(). diff --git a/core/string/SCsub b/core/string/SCsub new file mode 100644 index 000000000..3217166f1 --- /dev/null +++ b/core/string/SCsub @@ -0,0 +1,7 @@ +#!/usr/bin/env python + +Import("env") + +env_string = env.Clone() + +env_string.add_source_files(env.core_sources, "*.cpp") diff --git a/core/char_range.inc b/core/string/char_range.inc similarity index 100% rename from core/char_range.inc rename to core/string/char_range.inc diff --git a/core/char_utils.h b/core/string/char_utils.h similarity index 100% rename from core/char_utils.h rename to core/string/char_utils.h diff --git a/core/compressed_translation.cpp b/core/string/compressed_translation.cpp similarity index 100% rename from core/compressed_translation.cpp rename to core/string/compressed_translation.cpp diff --git a/core/compressed_translation.h b/core/string/compressed_translation.h similarity index 98% rename from core/compressed_translation.h rename to core/string/compressed_translation.h index 5acde8651..88cbb8b3b 100644 --- a/core/compressed_translation.h +++ b/core/string/compressed_translation.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/translation.h" +#include "core/string/translation.h" class PHashTranslation : public Translation { GDCLASS(PHashTranslation, Translation); diff --git a/core/node_path.cpp b/core/string/node_path.cpp similarity index 99% rename from core/node_path.cpp rename to core/string/node_path.cpp index 018c8d703..2430b867e 100644 --- a/core/node_path.cpp +++ b/core/string/node_path.cpp @@ -30,7 +30,7 @@ #include "node_path.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void NodePath::_update_hash_cache() const { uint32_t h = data->absolute ? 1 : 0; diff --git a/core/node_path.h b/core/string/node_path.h similarity index 98% rename from core/node_path.h rename to core/string/node_path.h index 37c7490a3..d83228765 100644 --- a/core/node_path.h +++ b/core/string/node_path.h @@ -30,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" class NodePath { struct Data { diff --git a/core/print_string.cpp b/core/string/print_string.cpp similarity index 100% rename from core/print_string.cpp rename to core/string/print_string.cpp diff --git a/core/print_string.h b/core/string/print_string.h similarity index 98% rename from core/print_string.h rename to core/string/print_string.h index 4cd966b05..7247c1987 100644 --- a/core/print_string.h +++ b/core/string/print_string.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ustring.h" +#include "core/string/ustring.h" extern void (*_print_func)(String); diff --git a/core/string_buffer.h b/core/string/string_buffer.h similarity index 99% rename from core/string_buffer.h rename to core/string/string_buffer.h index 82d3f5c9a..3638eb7f3 100644 --- a/core/string_buffer.h +++ b/core/string/string_buffer.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ustring.h" +#include "core/string/ustring.h" template class StringBuffer { diff --git a/core/string_builder.cpp b/core/string/string_builder.cpp similarity index 100% rename from core/string_builder.cpp rename to core/string/string_builder.cpp diff --git a/core/string_builder.h b/core/string/string_builder.h similarity index 99% rename from core/string_builder.h rename to core/string/string_builder.h index 55866111a..c68eba164 100644 --- a/core/string_builder.h +++ b/core/string/string_builder.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" diff --git a/core/string_name.cpp b/core/string/string_name.cpp similarity index 99% rename from core/string_name.cpp rename to core/string/string_name.cpp index 06835db71..69b26233a 100644 --- a/core/string_name.cpp +++ b/core/string/string_name.cpp @@ -31,7 +31,7 @@ #include "string_name.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" StaticCString StaticCString::create(const char *p_ptr) { StaticCString scs; diff --git a/core/string_name.h b/core/string/string_name.h similarity index 99% rename from core/string_name.h rename to core/string/string_name.h index 4a11f3052..1727ee057 100644 --- a/core/string_name.h +++ b/core/string/string_name.h @@ -32,7 +32,7 @@ #include "core/os/mutex.h" #include "core/safe_refcount.h" -#include "core/ustring.h" +#include "core/string/ustring.h" struct StaticCString { const char *ptr; diff --git a/core/translation.cpp b/core/string/translation.cpp similarity index 100% rename from core/translation.cpp rename to core/string/translation.cpp diff --git a/core/translation.h b/core/string/translation.h similarity index 100% rename from core/translation.h rename to core/string/translation.h diff --git a/core/ucaps.h b/core/string/ucaps.h similarity index 100% rename from core/ucaps.h rename to core/string/ucaps.h diff --git a/core/ustring.cpp b/core/string/ustring.cpp similarity index 99% rename from core/ustring.cpp rename to core/string/ustring.cpp index f4caf46f5..407fd34ad 100644 --- a/core/ustring.cpp +++ b/core/string/ustring.cpp @@ -38,9 +38,9 @@ #include "core/crypto/crypto_core.h" #include "core/math/math_funcs.h" #include "core/os/memory.h" -#include "core/print_string.h" -#include "core/translation.h" -#include "core/ucaps.h" +#include "core/string/print_string.h" +#include "core/string/translation.h" +#include "core/string/ucaps.h" #include "core/variant/variant.h" #include "core/version_generated.gen.h" diff --git a/core/ustring.h b/core/string/ustring.h similarity index 99% rename from core/ustring.h rename to core/string/ustring.h index 70af3e16c..da6de0223 100644 --- a/core/ustring.h +++ b/core/string/ustring.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/variant/array.h" -#include "core/char_utils.h" +#include "core/string/char_utils.h" #include "core/containers/cowdata.h" #include "core/typedefs.h" #include "core/containers/vector.h" diff --git a/core/variant/dictionary.h b/core/variant/dictionary.h index ba79e9823..3cc3a03b2 100644 --- a/core/variant/dictionary.h +++ b/core/variant/dictionary.h @@ -32,7 +32,7 @@ #include "core/variant/array.h" #include "core/containers/list.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Variant; diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp index 2ddb63df4..37e67ac20 100644 --- a/core/variant/variant.cpp +++ b/core/variant/variant.cpp @@ -34,7 +34,7 @@ #include "core/io/marshalls.h" #include "core/math/math_funcs.h" #include "core/object_rc.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/resource.h" #include "core/variant/variant_parser.h" #include "scene/gui/control.h" diff --git a/core/variant/variant.h b/core/variant/variant.h index 87d86758f..0c452c023 100644 --- a/core/variant/variant.h +++ b/core/variant/variant.h @@ -46,12 +46,12 @@ #include "core/math/vector3i.h" #include "core/math/vector4.h" #include "core/math/vector4i.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object_id.h" #include "core/containers/pool_vector.h" #include "core/object/ref_ptr.h" #include "core/rid.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Object; class ObjectRC; diff --git a/core/variant/variant_parser.cpp b/core/variant/variant_parser.cpp index 90695af88..8959049a3 100644 --- a/core/variant/variant_parser.cpp +++ b/core/variant/variant_parser.cpp @@ -33,7 +33,7 @@ #include "core/io/resource_loader.h" #include "core/os/input_event.h" #include "core/os/keyboard.h" -#include "core/string_buffer.h" +#include "core/string/string_buffer.h" CharType VariantParser::StreamFile::get_char() { return f->get_8(); diff --git a/drivers/alsamidi/midi_driver_alsamidi.cpp b/drivers/alsamidi/midi_driver_alsamidi.cpp index ba9287b18..8ae16cf65 100644 --- a/drivers/alsamidi/midi_driver_alsamidi.cpp +++ b/drivers/alsamidi/midi_driver_alsamidi.cpp @@ -33,7 +33,7 @@ #include "midi_driver_alsamidi.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include diff --git a/drivers/coremidi/midi_driver_coremidi.cpp b/drivers/coremidi/midi_driver_coremidi.cpp index fc0834fda..eb13f4022 100644 --- a/drivers/coremidi/midi_driver_coremidi.cpp +++ b/drivers/coremidi/midi_driver_coremidi.cpp @@ -32,7 +32,7 @@ #include "midi_driver_coremidi.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include #include diff --git a/drivers/dummy/texture_loader_dummy.cpp b/drivers/dummy/texture_loader_dummy.cpp index 6f47d06f0..9faec6571 100644 --- a/drivers/dummy/texture_loader_dummy.cpp +++ b/drivers/dummy/texture_loader_dummy.cpp @@ -31,7 +31,7 @@ #include "texture_loader_dummy.h" #include "core/os/file_access.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index 7a56edf7c..6b80a23d4 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -32,8 +32,8 @@ #include "core/os/os.h" #include "core/project_settings.h" -#include "core/string_buffer.h" -#include "core/string_builder.h" +#include "core/string/string_buffer.h" +#include "core/string/string_builder.h" #define SL ShaderLanguage diff --git a/drivers/gles2/shader_compiler_gles2.h b/drivers/gles2/shader_compiler_gles2.h index 95c47179b..e8e3c81a5 100644 --- a/drivers/gles2/shader_compiler_gles2.h +++ b/drivers/gles2/shader_compiler_gles2.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/pair.h" -#include "core/string_builder.h" +#include "core/string/string_builder.h" #include "servers/visual/shader_language.h" #include "servers/visual/shader_types.h" #include "servers/visual_server.h" diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp index a605f81a3..656a23486 100644 --- a/drivers/gles2/shader_gles2.cpp +++ b/drivers/gles2/shader_gles2.cpp @@ -31,9 +31,9 @@ #include "shader_gles2.h" #include "core/os/memory.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" -#include "core/string_builder.h" +#include "core/string/string_builder.h" #include "rasterizer_gles2.h" #include "rasterizer_storage_gles2.h" diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index b8bebd5c2..72c4dcc0f 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -31,7 +31,7 @@ #include "image_loader_png.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "drivers/png/png_driver_common.h" #include diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index 14f08a181..89dc81400 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -34,7 +34,7 @@ #include "core/containers/list.h" #include "core/os/memory.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include #include diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index 21618db84..21ffd504b 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -33,7 +33,7 @@ #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED) #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include #include diff --git a/drivers/unix/syslog_logger.cpp b/drivers/unix/syslog_logger.cpp index b11c87c67..0e1a1a89a 100644 --- a/drivers/unix/syslog_logger.cpp +++ b/drivers/unix/syslog_logger.cpp @@ -31,7 +31,7 @@ #ifdef UNIX_ENABLED #include "syslog_logger.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include void SyslogLogger::logv(const char *p_format, va_list p_list, bool p_err) { diff --git a/drivers/unix/thread_posix.cpp b/drivers/unix/thread_posix.cpp index a512aad28..cb5f261e6 100644 --- a/drivers/unix/thread_posix.cpp +++ b/drivers/unix/thread_posix.cpp @@ -33,7 +33,7 @@ #include "thread_posix.h" #include "core/os/thread.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #ifdef PTHREAD_BSD_SET_NAME #include diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 49c6d3984..9586b8497 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -33,7 +33,7 @@ #include "dir_access_windows.h" #include "core/os/memory.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include #include diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp index 4802afe5f..72349f053 100644 --- a/drivers/windows/file_access_windows.cpp +++ b/drivers/windows/file_access_windows.cpp @@ -33,7 +33,7 @@ #include "file_access_windows.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include // _SH_DENYNO #include diff --git a/drivers/winmidi/midi_driver_winmidi.cpp b/drivers/winmidi/midi_driver_winmidi.cpp index c44e93a01..8b3e23643 100644 --- a/drivers/winmidi/midi_driver_winmidi.cpp +++ b/drivers/winmidi/midi_driver_winmidi.cpp @@ -32,7 +32,7 @@ #include "midi_driver_winmidi.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void MIDIDriverWinMidi::read(HMIDIIN hMidiIn, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { if (wMsg == MIM_DATA) { diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index ceb701733..99bd00a2a 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -40,11 +40,11 @@ #include "core/math/math_defs.h" #include "core/math/math_funcs.h" #include "core/math/transform_2d.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/pair.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "editor/animation_track_editor.h" diff --git a/editor/animation_bezier_editor.h b/editor/animation_bezier_editor.h index 6e275e2c7..c8303a851 100644 --- a/editor/animation_bezier_editor.h +++ b/editor/animation_bezier_editor.h @@ -38,7 +38,7 @@ #include "core/object/object.h" #include "core/object/reference.h" #include "core/containers/set.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 502f5faf0..342943441 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -50,7 +50,7 @@ #include "core/object/resource.h" #include "core/object/script_language.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "editor/animation_bezier_editor.h" diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index c148bf025..9f69e6a5f 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -42,9 +42,9 @@ #include "core/containers/map.h" #include "core/math/rect2.h" #include "core/math/vector2.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" #include "scene/resources/animation.h" diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index 30b7eb2cd..aa2f2e9b8 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -43,10 +43,10 @@ #include "core/io/resource_loader.h" #include "core/containers/list.h" #include "core/math/math_funcs.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "core/containers/vector.h" diff --git a/editor/animation_track_editor_plugins.h b/editor/animation_track_editor_plugins.h index 4189d00b8..b322c0f4a 100644 --- a/editor/animation_track_editor_plugins.h +++ b/editor/animation_track_editor_plugins.h @@ -37,7 +37,7 @@ #include "core/object/object.h" #include "core/object_id.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "scene/resources/texture.h" diff --git a/editor/array_property_edit.h b/editor/array_property_edit.h index bb6605ace..15701af37 100644 --- a/editor/array_property_edit.h +++ b/editor/array_property_edit.h @@ -36,8 +36,8 @@ #include "core/object/object.h" #include "core/object_id.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Node; diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 5e8858793..d0c0fa007 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -41,7 +41,7 @@ #include "core/os/memory.h" #include "core/object/resource.h" #include "core/object/script_language.h" -#include "core/string_builder.h" +#include "core/string/string_builder.h" #include "core/typedefs.h" #include "core/containers/vector.h" #include "editor/editor_scale.h" diff --git a/editor/code_editor.h b/editor/code_editor.h index 51c00bb10..b2b6f1365 100644 --- a/editor/code_editor.h +++ b/editor/code_editor.h @@ -37,7 +37,7 @@ #include "core/math/math_defs.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Button; diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h index 337a6927d..4829d8059 100644 --- a/editor/connections_dialog.h +++ b/editor/connections_dialog.h @@ -40,10 +40,10 @@ #include "core/object/undo_redo.h" #include "core/containers/map.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class PopupMenu; diff --git a/editor/create_dialog.h b/editor/create_dialog.h index eed139b94..63079e46b 100644 --- a/editor/create_dialog.h +++ b/editor/create_dialog.h @@ -39,8 +39,8 @@ #include "core/object/reference.h" #include "core/object/resource.h" #include "core/containers/set.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 3a6f9a909..b2dfb66d9 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -44,10 +44,10 @@ #include "core/os/dir_access.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/reference.h" #include "core/object/resource.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/variant/variant.h" #include "editor/editor_file_dialog.h" diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h index 4626f6aa0..80a65a02d 100644 --- a/editor/dependency_editor.h +++ b/editor/dependency_editor.h @@ -36,7 +36,7 @@ #include "core/containers/list.h" #include "core/containers/map.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class EditorFileDialog; diff --git a/editor/dictionary_property_edit.h b/editor/dictionary_property_edit.h index eb7ee1609..815757f94 100644 --- a/editor/dictionary_property_edit.h +++ b/editor/dictionary_property_edit.h @@ -36,8 +36,8 @@ #include "core/object/object.h" #include "core/object_id.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Node; diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index a68354f7a..e134e47db 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -36,7 +36,7 @@ #include "core/os/dir_access.h" #include "core/project_settings.h" #include "core/object/script_language.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "core/version.h" #include "scene/resources/theme.h" #include "core/io/xml_parser.h" @@ -48,9 +48,9 @@ #include "core/os/file_access.h" #include "core/os/memory.h" #include "core/pair.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/variant/variant.h" diff --git a/editor/doc/doc_data.h b/editor/doc/doc_data.h index fb67ad210..a7600c666 100644 --- a/editor/doc/doc_data.h +++ b/editor/doc/doc_data.h @@ -34,7 +34,7 @@ #include "core/variant/variant.h" #include "core/object/reference.h" #include "core/error_list.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class XMLParser; diff --git a/editor/editor_about.h b/editor/editor_about.h index 65d17be78..3e12ff152 100644 --- a/editor/editor_about.h +++ b/editor/editor_about.h @@ -34,7 +34,7 @@ #include "core/containers/list.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class LinkButton; class RichTextLabel; diff --git a/editor/editor_atlas_packer.cpp b/editor/editor_atlas_packer.cpp index c55437272..a2607a323 100644 --- a/editor/editor_atlas_packer.cpp +++ b/editor/editor_atlas_packer.cpp @@ -32,7 +32,7 @@ #include "core/math/rect2.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/resources/bit_map.h" void EditorAtlasPacker::_plot_triangle(Ref p_bitmap, Vector2i *vertices) { diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index af7286809..cb8310238 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -49,7 +49,7 @@ #include "core/math/rect2.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/object/undo_redo.h" #include "editor/editor_file_dialog.h" #include "editor/editor_settings.h" diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h index 386361b98..2120fb34f 100644 --- a/editor/editor_audio_buses.h +++ b/editor/editor_audio_buses.h @@ -43,7 +43,7 @@ #include "core/object/object.h" #include "core/object/reference.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "scene/resources/texture.h" diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index 61f1dcea9..d1fac2514 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -50,7 +50,7 @@ #include "core/object/reference.h" #include "core/object/resource.h" #include "core/object/script_language.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "core/containers/vector.h" diff --git a/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h index d96d7eb97..24e3b0adf 100644 --- a/editor/editor_autoload_settings.h +++ b/editor/editor_autoload_settings.h @@ -35,7 +35,7 @@ #include "core/containers/list.h" #include "core/math/vector2.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Button; diff --git a/editor/editor_data.h b/editor/editor_data.h index 15176ec40..eecb68ecd 100644 --- a/editor/editor_data.h +++ b/editor/editor_data.h @@ -42,14 +42,14 @@ #include "core/variant/dictionary.h" #include "core/containers/hash_map.h" #include "core/containers/map.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object_id.h" #include "core/object/reference.h" #include "core/object/script_language.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_dir_dialog.h b/editor/editor_dir_dialog.h index ab9495ef5..fe271bad0 100644 --- a/editor/editor_dir_dialog.h +++ b/editor/editor_dir_dialog.h @@ -35,7 +35,7 @@ #include "core/os/dir_access.h" #include "core/object/object.h" #include "core/containers/set.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Button; class EditorFileSystemDirectory; diff --git a/editor/editor_export.h b/editor/editor_export.h index 6f9a2ddbc..8f0d41c84 100644 --- a/editor/editor_export.h +++ b/editor/editor_export.h @@ -44,9 +44,9 @@ #include "core/os/dir_access.h" #include "core/containers/pool_vector.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h index 64727f86f..d425c80e8 100644 --- a/editor/editor_file_dialog.h +++ b/editor/editor_file_dialog.h @@ -40,7 +40,7 @@ #include "core/object/method_bind.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 62f773945..e8a8da9cf 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -47,7 +47,7 @@ #include "core/io/config_file.h" #include "core/os/dir_access.h" #include "core/os/memory.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/reference.h" #include "core/object/resource.h" #include "core/object/script_language.h" diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h index 113f2d403..bfdf963b0 100644 --- a/editor/editor_file_system.h +++ b/editor/editor_file_system.h @@ -42,8 +42,8 @@ #include "core/containers/hash_map.h" #include "core/containers/list.h" #include "core/containers/map.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class FileAccess; diff --git a/editor/editor_folding.cpp b/editor/editor_folding.cpp index 466a50587..4839a51c2 100644 --- a/editor/editor_folding.cpp +++ b/editor/editor_folding.cpp @@ -38,7 +38,7 @@ #include "core/error_macros.h" #include "core/io/config_file.h" #include "core/containers/list.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" #include "core/object/reference.h" #include "core/variant/variant.h" diff --git a/editor/editor_folding.h b/editor/editor_folding.h index ab42df855..cff3b36d6 100644 --- a/editor/editor_folding.h +++ b/editor/editor_folding.h @@ -35,7 +35,7 @@ #include "core/containers/pool_vector.h" #include "core/object/resource.h" #include "core/containers/set.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Array; class Node; diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index fe2f99e9d..e9d2e0bdb 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -36,7 +36,7 @@ #include "editor_settings.h" #include "scene/resources/dynamic_font.h" #include "core/os/memory.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "scene/resources/font.h" #include "scene/resources/theme.h" diff --git a/editor/editor_help.h b/editor/editor_help.h index c51b747be..4da42ce65 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -41,7 +41,7 @@ #include "core/containers/map.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h index 98805cb4a..a89232746 100644 --- a/editor/editor_help_search.h +++ b/editor/editor_help_search.h @@ -36,7 +36,7 @@ #include "core/math/color.h" #include "core/containers/map.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/containers/ordered_hash_map.h" diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index af9bcc00c..9839446ea 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -45,8 +45,8 @@ #include "core/object/resource.h" #include "core/containers/set.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp index f74dfefe2..6c7600a8c 100644 --- a/editor/editor_layouts_dialog.cpp +++ b/editor/editor_layouts_dialog.cpp @@ -42,7 +42,7 @@ #include "core/math/math_defs.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" #include "scene/gui/control.h" diff --git a/editor/editor_log.h b/editor/editor_log.h index cc679ca22..43cc5e59e 100644 --- a/editor/editor_log.h +++ b/editor/editor_log.h @@ -35,7 +35,7 @@ #include "core/os/thread.h" #include "core/error_macros.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Button; class Label; diff --git a/editor/editor_network_profiler.cpp b/editor/editor_network_profiler.cpp index 0065232a6..405f4da79 100644 --- a/editor/editor_network_profiler.cpp +++ b/editor/editor_network_profiler.cpp @@ -38,7 +38,7 @@ #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "scene/gui/button.h" #include "scene/gui/control.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 6e4b42af1..892d14ad1 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -55,10 +55,10 @@ #include "core/os/memory.h" #include "core/os/os.h" #include "core/containers/pool_vector.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "core/object/script_language.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "core/object/undo_redo.h" #include "core/version.h" #include "core/version_generated.gen.h" diff --git a/editor/editor_node.h b/editor/editor_node.h index e69084f5e..26be191b1 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -46,18 +46,18 @@ #include "core/containers/list.h" #include "core/containers/map.h" #include "core/math/rect2.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/mutex.h" #include "core/os/os.h" #include "core/os/thread.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/reference.h" #include "core/object/resource.h" #include "core/safe_refcount.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" #include "editor/editor_data.h" diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index 9ab73d3e9..f1f46b6b9 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -40,8 +40,8 @@ #include "core/os/memory.h" #include "core/object/reference.h" #include "core/object/resource.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "editor/editor_data.h" #include "scene/gui/box_container.h" diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index 751019eb9..03461f6b4 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -47,7 +47,7 @@ #include "core/os/memory.h" #include "core/object/reference.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_plugin_settings.h b/editor/editor_plugin_settings.h index e0eaa479b..21a92cd5c 100644 --- a/editor/editor_plugin_settings.h +++ b/editor/editor_plugin_settings.h @@ -33,7 +33,7 @@ #include "scene/gui/box_container.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class Button; diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h index 17568f523..c4fbd75f6 100644 --- a/editor/editor_profiler.h +++ b/editor/editor_profiler.h @@ -38,9 +38,9 @@ #include "core/containers/pool_vector.h" #include "core/object/reference.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/resources/texture.h" diff --git a/editor/editor_properties.h b/editor/editor_properties.h index 899c17022..05d57b146 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -36,12 +36,12 @@ #include "core/math/vector2.h" #include "core/math/vector3.h" #include "core/math/vector4.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" #include "core/object/reference.h" #include "core/object/resource.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h index 2a07d9031..de4153b08 100644 --- a/editor/editor_properties_array_dict.h +++ b/editor/editor_properties_array_dict.h @@ -37,8 +37,8 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object_id.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Button; diff --git a/editor/editor_property_name_processor.h b/editor/editor_property_name_processor.h index d6bba8195..59e0007d6 100644 --- a/editor/editor_property_name_processor.h +++ b/editor/editor_property_name_processor.h @@ -34,7 +34,7 @@ #include "core/containers/map.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class EditorPropertyNameProcessor : public Node { GDCLASS(EditorPropertyNameProcessor, Node); diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 071e62a17..26936a481 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -49,7 +49,7 @@ #include "core/pair.h" #include "core/object/ref_ptr.h" #include "core/object/script_language.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "editor/editor_data.h" #include "editor/editor_file_dialog.h" diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h index 58d1a7eb5..2be2dc17a 100644 --- a/editor/editor_resource_picker.h +++ b/editor/editor_resource_picker.h @@ -40,7 +40,7 @@ #include "core/object/reference.h" #include "core/object/resource.h" #include "core/containers/set.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index 68ef57a5e..e157deb55 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -43,8 +43,8 @@ #include "core/object_id.h" #include "core/os/mutex.h" #include "core/object/resource.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_run.h b/editor/editor_run.h index 1c69b9415..c8f310380 100644 --- a/editor/editor_run.h +++ b/editor/editor_run.h @@ -34,7 +34,7 @@ #include "core/error_list.h" #include "core/containers/list.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class EditorRun { public: diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index a602beff6..4a386b319 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -36,7 +36,7 @@ #include "core/os/memory.h" #include "core/object/reference.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "editor_export.h" #include "editor_node.h" diff --git a/editor/editor_run_script.cpp b/editor/editor_run_script.cpp index a9d670731..9c5278526 100644 --- a/editor/editor_run_script.cpp +++ b/editor/editor_run_script.cpp @@ -34,7 +34,7 @@ #include "core/object/class_db.h" #include "core/error_macros.h" #include "core/object/script_language.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "editor/editor_plugin.h" diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp index 033b3fbb6..f40b91df9 100644 --- a/editor/editor_sectioned_inspector.cpp +++ b/editor/editor_sectioned_inspector.cpp @@ -36,7 +36,7 @@ #include "core/containers/list.h" #include "core/math/vector2.h" #include "core/os/memory.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_sectioned_inspector.h b/editor/editor_sectioned_inspector.h index a011b6125..90327bcb0 100644 --- a/editor/editor_sectioned_inspector.h +++ b/editor/editor_sectioned_inspector.h @@ -35,7 +35,7 @@ #include "core/containers/map.h" #include "core/object/object.h" #include "core/object_id.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class SectionedInspectorFilter; class EditorInspector; diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 9702701a6..97d2ef1b7 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -51,10 +51,10 @@ #include "core/os/main_loop.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "core/containers/set.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "core/typedefs.h" #include "core/version_generated.gen.h" #include "editor/editor_translation.h" diff --git a/editor/editor_settings.h b/editor/editor_settings.h index e1d8dcd48..2e933c342 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -37,13 +37,13 @@ #include "core/object/object.h" #include "core/io/config_file.h" #include "core/os/thread_safe.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "core/containers/hash_map.h" #include "core/containers/list.h" #include "core/containers/map.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_spin_slider.h b/editor/editor_spin_slider.h index baa74fd4a..1f509ba8f 100644 --- a/editor/editor_spin_slider.h +++ b/editor/editor_spin_slider.h @@ -36,7 +36,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class InputEvent; class LineEdit; diff --git a/editor/editor_sub_scene.cpp b/editor/editor_sub_scene.cpp index f8fa8e301..32d6d9bd3 100644 --- a/editor/editor_sub_scene.cpp +++ b/editor/editor_sub_scene.cpp @@ -37,7 +37,7 @@ #include "core/io/resource_loader.h" #include "core/os/memory.h" #include "core/object/reference.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/variant/variant.h" #include "editor/editor_file_dialog.h" #include "scene/2d/canvas_item.h" diff --git a/editor/editor_sub_scene.h b/editor/editor_sub_scene.h index 319057c9b..d8979780a 100644 --- a/editor/editor_sub_scene.h +++ b/editor/editor_sub_scene.h @@ -34,7 +34,7 @@ #include "core/containers/list.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class EditorFileDialog; class LineEdit; diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index e84644a63..7a09ca2c0 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -47,9 +47,9 @@ #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "scene/resources/font.h" #include "scene/resources/style_box.h" diff --git a/editor/editor_translation.cpp b/editor/editor_translation.cpp index beaa63690..9f9255789 100644 --- a/editor/editor_translation.cpp +++ b/editor/editor_translation.cpp @@ -38,7 +38,7 @@ #include "core/error_macros.h" #include "core/os/memory.h" #include "core/object/reference.h" -#include "core/translation.h" +#include "core/string/translation.h" Vector get_editor_locales() { Vector locales; diff --git a/editor/editor_translation.h b/editor/editor_translation.h index b25b0eb03..3107f437c 100644 --- a/editor/editor_translation.h +++ b/editor/editor_translation.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" Vector get_editor_locales(); diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h index d9bff08b0..298a5ed7c 100644 --- a/editor/export_template_manager.h +++ b/editor/export_template_manager.h @@ -34,7 +34,7 @@ #include "core/error_list.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class ExportTemplateVersion; diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 6ae166291..0b787bbf2 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -54,7 +54,7 @@ #include "core/io/resource_saver.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/resource.h" #include "core/typedefs.h" #include "editor/create_dialog.h" diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index dd5650af0..c71744c95 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -42,8 +42,8 @@ #include "core/object/object.h" #include "core/object/reference.h" #include "core/containers/set.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp index 1c48daaf0..f0fe972be 100644 --- a/editor/find_in_files.cpp +++ b/editor/find_in_files.cpp @@ -55,7 +55,7 @@ #include "core/os/file_access.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/reference.h" #include "core/typedefs.h" #include "scene/2d/canvas_item.h" diff --git a/editor/find_in_files.h b/editor/find_in_files.h index bdc2f474b..9e2ecb874 100644 --- a/editor/find_in_files.h +++ b/editor/find_in_files.h @@ -38,7 +38,7 @@ #include "core/containers/map.h" #include "core/object/object.h" #include "core/containers/set.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index 190e6a8aa..1d455f06c 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -39,11 +39,11 @@ #include "core/object/class_db.h" #include "core/containers/list.h" #include "core/math/vector2.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/memory.h" #include "core/os/os.h" #include "core/object/reference.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/scene_tree_dock.h" diff --git a/editor/groups_editor.h b/editor/groups_editor.h index d7b22cb4b..657cdaa33 100644 --- a/editor/groups_editor.h +++ b/editor/groups_editor.h @@ -34,7 +34,7 @@ #include "scene/gui/dialogs.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Button; class Label; diff --git a/editor/import/resource_importer_csv_translation.cpp b/editor/import/resource_importer_csv_translation.cpp index 2b3bf09f8..87bdaa499 100644 --- a/editor/import/resource_importer_csv_translation.cpp +++ b/editor/import/resource_importer_csv_translation.cpp @@ -30,10 +30,10 @@ #include "resource_importer_csv_translation.h" -#include "core/compressed_translation.h" +#include "core/string/compressed_translation.h" #include "core/io/resource_saver.h" #include "core/os/file_access.h" -#include "core/translation.h" +#include "core/string/translation.h" String ResourceImporterCSVTranslation::get_importer_name() const { return "csv_translation"; diff --git a/editor/import_defaults_editor.cpp b/editor/import_defaults_editor.cpp index 1213c5649..f8d71d50b 100644 --- a/editor/import_defaults_editor.cpp +++ b/editor/import_defaults_editor.cpp @@ -38,9 +38,9 @@ #include "core/os/memory.h" #include "core/project_settings.h" #include "core/object/reference.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" #include "editor/editor_inspector.h" diff --git a/editor/import_dock.h b/editor/import_dock.h index feb51585b..c2fea0000 100644 --- a/editor/import_dock.h +++ b/editor/import_dock.h @@ -37,8 +37,8 @@ #include "core/containers/map.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class ImportDockParameters; diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index b707c7c26..a59acb6bc 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -39,7 +39,7 @@ #include "core/object_id.h" #include "core/os/memory.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "editor/animation_track_editor.h" diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index 7fe00aec2..b046608cd 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -35,7 +35,7 @@ #include "core/object/object.h" #include "core/object/reference.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class EditorNode; diff --git a/editor/multi_node_edit.h b/editor/multi_node_edit.h index 6103da641..18a70934d 100644 --- a/editor/multi_node_edit.h +++ b/editor/multi_node_edit.h @@ -32,8 +32,8 @@ #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class MultiNodeEdit : public Reference { diff --git a/editor/node_dock.cpp b/editor/node_dock.cpp index d7302e935..3ad105912 100644 --- a/editor/node_dock.cpp +++ b/editor/node_dock.cpp @@ -35,7 +35,7 @@ #include "core/object/class_db.h" #include "core/math/vector2.h" #include "core/os/memory.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "editor/connections_dialog.h" #include "editor/groups_editor.h" #include "scene/gui/control.h" diff --git a/editor/plugin_config_dialog.h b/editor/plugin_config_dialog.h index 0fbb2be8b..ca9203542 100644 --- a/editor/plugin_config_dialog.h +++ b/editor/plugin_config_dialog.h @@ -32,7 +32,7 @@ #include "scene/gui/dialogs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class CheckBox; class LineEdit; diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h index 11f9954ad..869b65e35 100644 --- a/editor/plugins/abstract_polygon_2d_editor.h +++ b/editor/plugins/abstract_polygon_2d_editor.h @@ -33,7 +33,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h index ca261aacf..ca2be6137 100644 --- a/editor/plugins/animation_blend_space_1d_editor.h +++ b/editor/plugins/animation_blend_space_1d_editor.h @@ -35,8 +35,8 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class Button; diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/plugins/animation_blend_space_2d_editor.h index d28541485..937bd3063 100644 --- a/editor/plugins/animation_blend_space_2d_editor.h +++ b/editor/plugins/animation_blend_space_2d_editor.h @@ -35,8 +35,8 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class Button; diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index 097b515a5..41b4fd223 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -37,7 +37,7 @@ #include "core/containers/hash_map.h" #include "core/io/resource_loader.h" #include "core/containers/list.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/memory.h" #include "core/containers/set.h" #include "core/typedefs.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h index 29c4365af..0df3f68b7 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.h +++ b/editor/plugins/animation_blend_tree_editor_plugin.h @@ -38,8 +38,8 @@ #include "core/object/object.h" #include "core/object/reference.h" #include "core/object/script_language.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 82f7cd1a0..5535f2833 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -56,7 +56,7 @@ #include "core/os/memory.h" #include "core/object/resource.h" #include "core/rid_handle.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "core/variant/variant.h" diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h index ffe8dc3ef..e665fb696 100644 --- a/editor/plugins/animation_player_editor_plugin.h +++ b/editor/plugins/animation_player_editor_plugin.h @@ -38,7 +38,7 @@ #include "core/object/object.h" #include "core/object/reference.h" #include "core/rid.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class AnimationTrackEditor; diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h index 6a15aa3bf..05354da96 100644 --- a/editor/plugins/animation_state_machine_editor.h +++ b/editor/plugins/animation_state_machine_editor.h @@ -37,8 +37,8 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class EditorFileDialog; diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index a2129902d..56f4cbb80 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -43,7 +43,7 @@ #include "core/containers/list.h" #include "core/math/vector2.h" #include "core/os/memory.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/variant/variant.h" #include "editor/editor_node.h" #include "scene/animation/animation_tree.h" diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h index 98e1393ad..e6a45366a 100644 --- a/editor/plugins/animation_tree_editor_plugin.h +++ b/editor/plugins/animation_tree_editor_plugin.h @@ -36,7 +36,7 @@ #include "core/object/object.h" #include "core/object_id.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class AnimationNode; diff --git a/editor/plugins/audio_stream_editor_plugin.h b/editor/plugins/audio_stream_editor_plugin.h index bd2866134..e6398ea3b 100644 --- a/editor/plugins/audio_stream_editor_plugin.h +++ b/editor/plugins/audio_stream_editor_plugin.h @@ -37,7 +37,7 @@ #include "core/object/object.h" #include "core/object_id.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class AudioStream; class AudioStreamPlayer; diff --git a/editor/plugins/camera_editor_plugin.h b/editor/plugins/camera_editor_plugin.h index fbe1f8f53..f2ae457f2 100644 --- a/editor/plugins/camera_editor_plugin.h +++ b/editor/plugins/camera_editor_plugin.h @@ -34,7 +34,7 @@ #include "editor/editor_plugin.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Button; class EditorNode; diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 95c950a9d..9d31f5083 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -60,13 +60,13 @@ #include "core/io/resource_loader.h" #include "core/math/geometry.h" #include "core/math/math_funcs.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" #include "core/object/resource.h" #include "core/rid.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/object/undo_redo.h" #include "editor/animation_track_editor.h" #include "editor/editor_data.h" diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 15330be41..c60330909 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -45,7 +45,7 @@ #include "core/object_id.h" #include "core/object/reference.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/editor/plugins/collision_polygon_2d_editor_plugin.cpp index 4520385fa..14d3e5242 100644 --- a/editor/plugins/collision_polygon_2d_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_2d_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "collision_polygon_2d_editor_plugin.h" #include "core/os/memory.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/2d/collision_polygon_2d.h" #include "scene/main/node.h" diff --git a/editor/plugins/collision_polygon_editor_plugin.h b/editor/plugins/collision_polygon_editor_plugin.h index 3c206620c..67410f587 100644 --- a/editor/plugins/collision_polygon_editor_plugin.h +++ b/editor/plugins/collision_polygon_editor_plugin.h @@ -36,7 +36,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class CanvasItemEditor; diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h index a497d74fe..ddb1b68e1 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/editor/plugins/collision_shape_2d_editor_plugin.h @@ -37,7 +37,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.h b/editor/plugins/cpu_particles_2d_editor_plugin.h index 047cb35e0..2ad2f3fa3 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.h +++ b/editor/plugins/cpu_particles_2d_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/editor_plugin.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class CPUParticles2D; class CheckBox; diff --git a/editor/plugins/cpu_particles_editor_plugin.h b/editor/plugins/cpu_particles_editor_plugin.h index 7ed813b76..03f8cb0ec 100644 --- a/editor/plugins/cpu_particles_editor_plugin.h +++ b/editor/plugins/cpu_particles_editor_plugin.h @@ -32,7 +32,7 @@ #include "editor/plugins/particles_editor_plugin.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class CPUParticles; class EditorNode; diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 1e4c1d72d..81b5bcd10 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -44,7 +44,7 @@ #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/object/resource.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "core/variant/variant.h" diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h index 829b3dbbd..4fabd21c5 100644 --- a/editor/plugins/curve_editor_plugin.h +++ b/editor/plugins/curve_editor_plugin.h @@ -38,7 +38,7 @@ #include "core/math/vector2.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "editor/editor_inspector.h" #include "scene/gui/control.h" diff --git a/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h index 7074a54ac..63340ffe3 100644 --- a/editor/plugins/editor_preview_plugins.h +++ b/editor/plugins/editor_preview_plugins.h @@ -38,7 +38,7 @@ #include "core/object/reference.h" #include "core/object/resource.h" #include "core/rid.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Image; diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h index a25446547..c56eff69e 100644 --- a/editor/plugins/gradient_editor_plugin.h +++ b/editor/plugins/gradient_editor_plugin.h @@ -37,7 +37,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Gradient; class EditorNode; diff --git a/editor/plugins/item_list_editor_plugin.h b/editor/plugins/item_list_editor_plugin.h index a71698cc6..78f5f941e 100644 --- a/editor/plugins/item_list_editor_plugin.h +++ b/editor/plugins/item_list_editor_plugin.h @@ -40,8 +40,8 @@ #include "scene/gui/popup_menu.h" #include "core/containers/list.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/light_occluder_2d_editor_plugin.cpp b/editor/plugins/light_occluder_2d_editor_plugin.cpp index f1ff120e1..9da3d8692 100644 --- a/editor/plugins/light_occluder_2d_editor_plugin.cpp +++ b/editor/plugins/light_occluder_2d_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "core/os/memory.h" #include "core/containers/pool_vector.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/2d/light_occluder_2d.h" #include "scene/main/node.h" diff --git a/editor/plugins/line_2d_editor_plugin.cpp b/editor/plugins/line_2d_editor_plugin.cpp index 1578966c2..065fc8bab 100644 --- a/editor/plugins/line_2d_editor_plugin.cpp +++ b/editor/plugins/line_2d_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "core/os/memory.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/2d/line_2d.h" #include "scene/2d/node_2d.h" #include "scene/main/node.h" diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index 9808b2533..5c83c48d5 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -40,7 +40,7 @@ #include "scene/resources/material.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/resources/environment.h" diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index cdb061329..1cad6a91a 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -36,7 +36,7 @@ #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/resources/material.h" #include "scene/resources/mesh.h" diff --git a/editor/plugins/mesh_instance_editor_plugin.h b/editor/plugins/mesh_instance_editor_plugin.h index 5efb5b533..b1581c2bc 100644 --- a/editor/plugins/mesh_instance_editor_plugin.h +++ b/editor/plugins/mesh_instance_editor_plugin.h @@ -35,7 +35,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h index 12748a403..8f64e743e 100644 --- a/editor/plugins/multimesh_editor_plugin.h +++ b/editor/plugins/multimesh_editor_plugin.h @@ -33,9 +33,9 @@ #include "scene/gui/control.h" #include "editor/editor_plugin.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class AcceptDialog; class ConfirmationDialog; diff --git a/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp index ed764f38f..a319baace 100644 --- a/editor/plugins/navigation_polygon_editor_plugin.cpp +++ b/editor/plugins/navigation_polygon_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/2d/navigation_polygon.h" #include "scene/main/node.h" diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp index 7f6fe72f9..7ed73eab6 100644 --- a/editor/plugins/particles_editor_plugin.cpp +++ b/editor/plugins/particles_editor_plugin.cpp @@ -44,7 +44,7 @@ #include "core/math/vector3.h" #include "core/os/memory.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" diff --git a/editor/plugins/particles_editor_plugin.h b/editor/plugins/particles_editor_plugin.h index 084d10c36..8f15c55aa 100644 --- a/editor/plugins/particles_editor_plugin.h +++ b/editor/plugins/particles_editor_plugin.h @@ -34,7 +34,7 @@ #include "editor/editor_plugin.h" #include "core/math/face3.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" #include "core/containers/pool_vector.h" diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h index 10d1598dd..a149ac311 100644 --- a/editor/plugins/path_2d_editor_plugin.h +++ b/editor/plugins/path_2d_editor_plugin.h @@ -36,7 +36,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class CanvasItemEditor; diff --git a/editor/plugins/path_editor_plugin.h b/editor/plugins/path_editor_plugin.h index 96bb14d7a..474bec841 100644 --- a/editor/plugins/path_editor_plugin.h +++ b/editor/plugins/path_editor_plugin.h @@ -38,7 +38,7 @@ #include "core/math/vector3.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Camera; diff --git a/editor/plugins/physical_bone_plugin.h b/editor/plugins/physical_bone_plugin.h index 67cbdfa97..b19d3a0b0 100644 --- a/editor/plugins/physical_bone_plugin.h +++ b/editor/plugins/physical_bone_plugin.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "editor/editor_plugin.h" class PhysicalBone; diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 739973970..872e05f78 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -43,13 +43,13 @@ #include "core/math/math_funcs.h" #include "core/math/rect2.h" #include "core/math/transform_2d.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "scene/2d/canvas_item.h" #include "scene/2d/polygon_2d.h" diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp index 2498eb4f7..89332fb4f 100644 --- a/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/editor/plugins/resource_preloader_editor_plugin.cpp @@ -39,7 +39,7 @@ #include "core/containers/list.h" #include "core/os/memory.h" #include "core/object/resource.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/object/undo_redo.h" #include "core/containers/vector.h" #include "editor/editor_file_dialog.h" diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h index d5694bbf8..c59b64e5b 100644 --- a/editor/plugins/resource_preloader_editor_plugin.h +++ b/editor/plugins/resource_preloader_editor_plugin.h @@ -37,7 +37,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/room_manager_editor_plugin.cpp b/editor/plugins/room_manager_editor_plugin.cpp index f20912cec..b6640cd59 100644 --- a/editor/plugins/room_manager_editor_plugin.cpp +++ b/editor/plugins/room_manager_editor_plugin.cpp @@ -41,7 +41,7 @@ #include "core/os/memory.h" #include "core/containers/pool_vector.h" #include "core/object/reference.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/object/undo_redo.h" #include "editor/editor_node.h" #include "editor/plugins/spatial_editor_plugin.h" diff --git a/editor/plugins/room_manager_editor_plugin.h b/editor/plugins/room_manager_editor_plugin.h index a069530ae..a32f7f203 100644 --- a/editor/plugins/room_manager_editor_plugin.h +++ b/editor/plugins/room_manager_editor_plugin.h @@ -34,7 +34,7 @@ #include "scene/resources/material.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class EditorNode; class Occluder; diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp index d7d33cee9..df18dcc8a 100644 --- a/editor/plugins/root_motion_editor_plugin.cpp +++ b/editor/plugins/root_motion_editor_plugin.cpp @@ -40,7 +40,7 @@ #include "core/os/memory.h" #include "core/object/reference.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "scene/animation/animation_player.h" #include "scene/animation/animation_tree.h" diff --git a/editor/plugins/root_motion_editor_plugin.h b/editor/plugins/root_motion_editor_plugin.h index 26e595eab..9613989be 100644 --- a/editor/plugins/root_motion_editor_plugin.h +++ b/editor/plugins/root_motion_editor_plugin.h @@ -32,9 +32,9 @@ #include "editor/editor_inspector.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Button; diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index cf0dfccab..a87606648 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -62,7 +62,7 @@ #include "core/os/main_loop.h" #include "core/os/memory.h" #include "core/pair.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/object/undo_redo.h" #include "core/version_generated.gen.h" #include "editor/editor_data.h" diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index f84757cca..a0cf0daf7 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -47,7 +47,7 @@ #include "core/object/resource.h" #include "core/containers/set.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 7145b7406..107a34ff1 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -39,7 +39,7 @@ #include "core/math/expression.h" #include "core/math/math_defs.h" #include "core/math/transform_2d.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/file_access.h" #include "core/os/input.h" #include "core/os/input_event.h" @@ -48,7 +48,7 @@ #include "core/project_settings.h" #include "core/object/script_language.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h index c9754d6d8..aacea9ee1 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/plugins/script_text_editor.h @@ -42,7 +42,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "editor/code_editor.h" diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index cff1b2a4a..530e47308 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -45,7 +45,7 @@ #include "core/os/main_loop.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/variant/variant.h" #include "core/containers/vector.h" #include "core/version_generated.gen.h" diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h index 87b089ebf..c3d86cb14 100644 --- a/editor/plugins/shader_editor_plugin.h +++ b/editor/plugins/shader_editor_plugin.h @@ -40,7 +40,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Button; class ConfirmationDialog; diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/plugins/skeleton_2d_editor_plugin.h index 9cf1a19a1..44da4dd89 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.h +++ b/editor/plugins/skeleton_2d_editor_plugin.h @@ -34,7 +34,7 @@ #include "scene/gui/control.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class AcceptDialog; class EditorNode; diff --git a/editor/plugins/skeleton_ik_editor_plugin.h b/editor/plugins/skeleton_ik_editor_plugin.h index e42e8e9e1..c1123fd6a 100644 --- a/editor/plugins/skeleton_ik_editor_plugin.h +++ b/editor/plugins/skeleton_ik_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/editor_plugin.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class SkeletonIK; class Button; diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 566558d05..2b819e2c8 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -41,7 +41,7 @@ #include "core/math/math_funcs.h" #include "core/math/plane.h" #include "core/math/rect2.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/input.h" #include "core/os/input_event.h" #include "core/os/keyboard.h" @@ -52,7 +52,7 @@ #include "core/rid_handle.h" #include "core/object/script_language.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/object/undo_redo.h" #include "editor/animation_track_editor.h" #include "editor/editor_data.h" diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 18f51bf40..e26010761 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -55,7 +55,7 @@ #include "core/object/resource.h" #include "core/rid.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" #include "editor/editor_scale.h" diff --git a/editor/plugins/sprite_editor_plugin.h b/editor/plugins/sprite_editor_plugin.h index ca8c617b6..c7a25d9ae 100644 --- a/editor/plugins/sprite_editor_plugin.h +++ b/editor/plugins/sprite_editor_plugin.h @@ -35,7 +35,7 @@ #include "core/math/vector2.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h index 0ede20f99..ccd177ec7 100644 --- a/editor/plugins/sprite_frames_editor_plugin.h +++ b/editor/plugins/sprite_frames_editor_plugin.h @@ -38,8 +38,8 @@ #include "core/containers/pool_vector.h" #include "core/object/reference.h" #include "core/containers/set.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class AcceptDialog; diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h index 7b174d27f..88a822ee8 100644 --- a/editor/plugins/style_box_editor_plugin.h +++ b/editor/plugins/style_box_editor_plugin.h @@ -36,7 +36,7 @@ #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class Control; diff --git a/editor/plugins/text_editor.h b/editor/plugins/text_editor.h index b3ad606b7..064925df2 100644 --- a/editor/plugins/text_editor.h +++ b/editor/plugins/text_editor.h @@ -38,7 +38,7 @@ #include "core/object/object.h" #include "core/object/reference.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" #include "editor/code_editor.h" diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h index 8783a9a5b..210e23979 100644 --- a/editor/plugins/texture_editor_plugin.h +++ b/editor/plugins/texture_editor_plugin.h @@ -37,7 +37,7 @@ #include "scene/resources/texture.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class EditorNode; class Label; diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 1cc55d969..bcdae8258 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -44,7 +44,7 @@ #include "core/os/input_event.h" #include "core/os/main_loop.h" #include "core/os/memory.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "core/variant/variant.h" diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h index 802d3112d..35dbccfae 100644 --- a/editor/plugins/texture_region_editor_plugin.h +++ b/editor/plugins/texture_region_editor_plugin.h @@ -44,7 +44,7 @@ #include "core/object/object.h" #include "core/object/reference.h" #include "core/rid.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Button; diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h index 946d3b8a1..f79e84c3a 100644 --- a/editor/plugins/theme_editor_plugin.h +++ b/editor/plugins/theme_editor_plugin.h @@ -44,8 +44,8 @@ #include "core/containers/ordered_hash_map.h" #include "core/object/reference.h" #include "core/object/resource.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class Button; diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp index b9898932a..719e236aa 100644 --- a/editor/plugins/theme_editor_preview.cpp +++ b/editor/plugins/theme_editor_preview.cpp @@ -41,7 +41,7 @@ #include "core/math/vector2.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/variant/variant.h" #include "editor/editor_node.h" diff --git a/editor/plugins/theme_editor_preview.h b/editor/plugins/theme_editor_preview.h index c3e9a6841..aed419acc 100644 --- a/editor/plugins/theme_editor_preview.h +++ b/editor/plugins/theme_editor_preview.h @@ -35,7 +35,7 @@ #include "core/math/color.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/resources/theme.h" #include "scene/resources/font.h" diff --git a/editor/plugins/viewport_preview_editor_plugin.h b/editor/plugins/viewport_preview_editor_plugin.h index 23ed674b7..e068f7ec2 100644 --- a/editor/plugins/viewport_preview_editor_plugin.h +++ b/editor/plugins/viewport_preview_editor_plugin.h @@ -34,7 +34,7 @@ #include "editor/plugins/texture_editor_plugin.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class EditorNode; diff --git a/editor/progress_dialog.h b/editor/progress_dialog.h index cc94856fe..804395ef8 100644 --- a/editor/progress_dialog.h +++ b/editor/progress_dialog.h @@ -35,7 +35,7 @@ #include "core/containers/map.h" #include "core/os/thread_safe.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Button; class Label; diff --git a/editor/project_export.h b/editor/project_export.h index c1570e4c5..6f522aed5 100644 --- a/editor/project_export.h +++ b/editor/project_export.h @@ -36,8 +36,8 @@ #include "core/os/dir_access.h" #include "core/os/thread.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class EditorNode; diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index ff2c2afb3..bc7c6da36 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -50,11 +50,11 @@ #include "core/os/memory.h" #include "core/os/os.h" #include "core/containers/pool_vector.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "core/containers/set.h" #include "core/containers/sort_array.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "core/typedefs.h" #include "core/containers/vector.h" #include "core/version.h" diff --git a/editor/project_manager.h b/editor/project_manager.h index 74a0afade..387515bb5 100644 --- a/editor/project_manager.h +++ b/editor/project_manager.h @@ -36,7 +36,7 @@ #include "core/containers/list.h" #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class ProjectDialog; diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index d69603989..394f432d3 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -33,7 +33,7 @@ #include "core/input_map.h" #include "core/os/keyboard.h" #include "core/project_settings.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "editor/editor_export.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index 045555851..ca8496096 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -35,7 +35,7 @@ #include "core/math/vector2.h" #include "core/os/input_event.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 68678ebee..9860c03d9 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -60,7 +60,7 @@ #include "core/rid.h" #include "core/object/script_language.h" #include "core/containers/set.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "editor/array_property_edit.h" #include "editor/create_dialog.h" diff --git a/editor/property_editor.h b/editor/property_editor.h index e724fb61e..f18ffdcc6 100644 --- a/editor/property_editor.h +++ b/editor/property_editor.h @@ -35,8 +35,8 @@ #include "core/containers/list.h" #include "core/math/math_defs.h" -#include "core/node_path.h" -#include "core/ustring.h" +#include "core/string/node_path.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 4b0c05264..06d8072b8 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -40,7 +40,7 @@ #include "core/os/keyboard.h" #include "core/os/memory.h" #include "core/object/script_language.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "editor/doc/doc_data.h" #include "editor/editor_help.h" diff --git a/editor/property_selector.h b/editor/property_selector.h index e8c88398d..45b3655c8 100644 --- a/editor/property_selector.h +++ b/editor/property_selector.h @@ -34,7 +34,7 @@ #include "core/object_id.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/quick_open.h b/editor/quick_open.h index 1597d8d36..b22c08eb8 100644 --- a/editor/quick_open.h +++ b/editor/quick_open.h @@ -34,8 +34,8 @@ #include "core/pair.h" #include "core/object/reference.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class EditorFileSystemDirectory; diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index 8ddd4e17c..7470e5cf3 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -37,7 +37,7 @@ #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/object/reference.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_data.h" diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h index 944d9ea65..9dcbe236b 100644 --- a/editor/rename_dialog.h +++ b/editor/rename_dialog.h @@ -36,10 +36,10 @@ #include "core/error_macros.h" #include "core/containers/list.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" #include "core/pair.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/gui/dialogs.h" diff --git a/editor/reparent_dialog.cpp b/editor/reparent_dialog.cpp index 41ba9ce8b..64a63dc9e 100644 --- a/editor/reparent_dialog.cpp +++ b/editor/reparent_dialog.cpp @@ -33,7 +33,7 @@ #include "scene/gui/box_container.h" #include "core/object/class_db.h" #include "core/os/memory.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "editor/scene_tree_editor.h" #include "scene/2d/canvas_item.h" diff --git a/editor/run_settings_dialog.h b/editor/run_settings_dialog.h index 643d936b4..c4d48a8f0 100644 --- a/editor/run_settings_dialog.h +++ b/editor/run_settings_dialog.h @@ -32,7 +32,7 @@ #include "scene/gui/dialogs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class LineEdit; class OptionButton; diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index a1e75f03b..d61f79c62 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -47,7 +47,7 @@ #include "core/project_settings.h" #include "core/object/ref_ptr.h" #include "core/object/script_language.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "core/variant/variant.h" diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index 1dcce841d..63a5325e9 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -35,12 +35,12 @@ #include "core/containers/hash_map.h" #include "core/containers/list.h" #include "core/containers/map.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object_id.h" #include "core/object/reference.h" #include "core/object/resource.h" #include "core/containers/set.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "modules/modules_enabled.gen.h" // For regex. diff --git a/editor/scene_tree_editor.h b/editor/scene_tree_editor.h index 831d19906..399ff902c 100644 --- a/editor/scene_tree_editor.h +++ b/editor/scene_tree_editor.h @@ -35,11 +35,11 @@ #include "core/containers/list.h" #include "core/math/vector2.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object_id.h" #include "core/containers/set.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index bfed78583..df79e0eec 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -43,7 +43,7 @@ #include "core/object/reference.h" #include "core/object/resource.h" #include "core/object/script_language.h" -#include "core/string_builder.h" +#include "core/string/string_builder.h" #include "core/typedefs.h" #include "core/variant/variant.h" #include "editor/create_dialog.h" diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h index b3c6ccae5..6ea0c908b 100644 --- a/editor/script_create_dialog.h +++ b/editor/script_create_dialog.h @@ -34,7 +34,7 @@ #include "core/containers/map.h" #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class CreateDialog; diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 5fadf1a9f..ec7044e47 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -50,12 +50,12 @@ #include "core/os/file_access.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/object/ref_ptr.h" #include "core/object/script_language.h" #include "core/typedefs.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/version.h" #include "editor/editor_data.h" #include "editor/editor_file_dialog.h" diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h index d82419c97..c630b68dd 100644 --- a/editor/script_editor_debugger.h +++ b/editor/script_editor_debugger.h @@ -37,14 +37,14 @@ #include "core/containers/list.h" #include "core/containers/map.h" #include "core/math/vector2.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/object.h" #include "core/object_id.h" #include "core/object/reference.h" #include "core/object/resource.h" #include "core/containers/set.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/settings_config_dialog.h b/editor/settings_config_dialog.h index 2b32a0df2..e221e5eb8 100644 --- a/editor/settings_config_dialog.h +++ b/editor/settings_config_dialog.h @@ -34,7 +34,7 @@ #include "core/object/object.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class Control; class InputEvent; diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 123371e9e..f2ce93891 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -45,7 +45,7 @@ #include "core/math/rect2.h" #include "core/math/transform.h" #include "core/math/triangle_mesh.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" #include "core/rid.h" diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h index c7b2940db..784b6cf65 100644 --- a/editor/spatial_editor_gizmos.h +++ b/editor/spatial_editor_gizmos.h @@ -41,7 +41,7 @@ #include "core/containers/ordered_hash_map.h" #include "core/containers/pool_vector.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/main/main.cpp b/main/main.cpp index 8d926a35b..7db914600 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -46,7 +46,7 @@ #include "core/register_core_types.h" #include "core/script_debugger_local.h" #include "core/object/script_language.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "core/version.h" #include "drivers/register_driver_types.h" #include "main/app_icon.gen.h" diff --git a/main/tests/test_basis.cpp b/main/tests/test_basis.cpp index dd9d56180..dbef64587 100644 --- a/main/tests/test_basis.cpp +++ b/main/tests/test_basis.cpp @@ -32,7 +32,7 @@ #include "core/math/random_number_generator.h" #include "core/os/os.h" -#include "core/ustring.h" +#include "core/string/ustring.h" namespace TestBasis { diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp index 7dca44d43..86767d676 100644 --- a/main/tests/test_gui.cpp +++ b/main/tests/test_gui.cpp @@ -34,7 +34,7 @@ #include "core/io/image_loader.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "scene/2d/sprite.h" #include "scene/gui/button.h" #include "scene/gui/control.h" diff --git a/main/tests/test_main.h b/main/tests/test_main.h index 48a5a04d1..03b4b27cf 100644 --- a/main/tests/test_main.h +++ b/main/tests/test_main.h @@ -32,7 +32,7 @@ #include "core/containers/list.h" #include "core/os/main_loop.h" -#include "core/ustring.h" +#include "core/string/ustring.h" const char **tests_get_names(); MainLoop *test_main(String p_test, const List &p_args); diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp index 76b50baea..5c9479f21 100644 --- a/main/tests/test_math.cpp +++ b/main/tests/test_math.cpp @@ -37,8 +37,8 @@ #include "core/os/file_access.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/print_string.h" -#include "core/ustring.h" +#include "core/string/print_string.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vmap.h" #include "scene/main/node.h" diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp index 7bca7b696..d3c0565be 100644 --- a/main/tests/test_physics.cpp +++ b/main/tests/test_physics.cpp @@ -35,7 +35,7 @@ #include "core/math/math_funcs.h" #include "core/os/main_loop.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "servers/physics_server.h" #include "servers/visual_server.h" diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp index ca5743187..66283022f 100644 --- a/main/tests/test_physics_2d.cpp +++ b/main/tests/test_physics_2d.cpp @@ -33,7 +33,7 @@ #include "core/containers/map.h" #include "core/os/main_loop.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "scene/resources/texture.h" #include "servers/physics_2d_server.h" #include "servers/visual_server.h" diff --git a/main/tests/test_render.cpp b/main/tests/test_render.cpp index 710a2ccf5..d92e0078d 100644 --- a/main/tests/test_render.cpp +++ b/main/tests/test_render.cpp @@ -35,7 +35,7 @@ #include "core/os/keyboard.h" #include "core/os/main_loop.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "servers/visual_server.h" #define OBJECT_COUNT 50 diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp index e14098ed5..ee2b2aa2d 100644 --- a/main/tests/test_shader_lang.cpp +++ b/main/tests/test_shader_lang.cpp @@ -34,7 +34,7 @@ #include "core/os/main_loop.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "scene/gui/control.h" #include "scene/gui/shortcut.h" #include "scene/gui/text_edit.h" diff --git a/main/tests/test_string.cpp.old b/main/tests/test_string.cpp.old index 64fd211d2..2b6781b90 100644 --- a/main/tests/test_string.cpp.old +++ b/main/tests/test_string.cpp.old @@ -32,7 +32,7 @@ #include "core/io/ip_address.h" #include "core/os/os.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "modules/modules_enabled.gen.h" // For regex. #ifdef MODULE_REGEX_ENABLED diff --git a/main/tests/test_string.h b/main/tests/test_string.h index bcc03b2a9..0837116aa 100644 --- a/main/tests/test_string.h +++ b/main/tests/test_string.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/os/main_loop.h" -#include "core/ustring.h" +#include "core/string/ustring.h" namespace TestString { diff --git a/main/tests/test_transform.cpp b/main/tests/test_transform.cpp index 9984d1340..4593301f1 100644 --- a/main/tests/test_transform.cpp +++ b/main/tests/test_transform.cpp @@ -34,7 +34,7 @@ #include "core/math/transform.h" #include "core/math/vector3.h" #include "core/os/os.h" -#include "core/ustring.h" +#include "core/string/ustring.h" // #define PANDEMONIUM_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED diff --git a/main/tests/test_xml_parser.h b/main/tests/test_xml_parser.h index ddda4e060..eead7116a 100644 --- a/main/tests/test_xml_parser.h +++ b/main/tests/test_xml_parser.h @@ -34,7 +34,7 @@ #include "core/io/xml_parser.h" #include "core/os/main_loop.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" namespace TestXMLParser { diff --git a/modules/cscript/cscript_function.h b/modules/cscript/cscript_function.h index 15382e075..cda3205eb 100644 --- a/modules/cscript/cscript_function.h +++ b/modules/cscript/cscript_function.h @@ -35,7 +35,7 @@ #include "core/object/reference.h" #include "core/object/script_language.h" #include "core/containers/self_list.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/variant/variant.h" class CScriptInstance; diff --git a/modules/cscript/cscript_parser.cpp b/modules/cscript/cscript_parser.cpp index 9b8174b99..2a2786e14 100644 --- a/modules/cscript/cscript_parser.cpp +++ b/modules/cscript/cscript_parser.cpp @@ -34,7 +34,7 @@ #include "core/engine.h" #include "core/io/resource_loader.h" #include "core/os/file_access.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "core/object/reference.h" #include "core/object/script_language.h" diff --git a/modules/cscript/cscript_tokenizer.cpp b/modules/cscript/cscript_tokenizer.cpp index f9d0d9746..fa8175712 100644 --- a/modules/cscript/cscript_tokenizer.cpp +++ b/modules/cscript/cscript_tokenizer.cpp @@ -32,7 +32,7 @@ #include "core/io/marshalls.h" #include "core/containers/map.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "cscript_functions.h" const char *CScriptTokenizer::token_names[TK_MAX] = { diff --git a/modules/cscript/cscript_tokenizer.h b/modules/cscript/cscript_tokenizer.h index 6c119d02d..25d12e942 100644 --- a/modules/cscript/cscript_tokenizer.h +++ b/modules/cscript/cscript_tokenizer.h @@ -31,8 +31,8 @@ /*************************************************************************/ #include "core/pair.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vmap.h" #include "cscript_functions.h" diff --git a/modules/cvtt/image_compress_cvtt.cpp b/modules/cvtt/image_compress_cvtt.cpp index a32c01a10..d47367f18 100644 --- a/modules/cvtt/image_compress_cvtt.cpp +++ b/modules/cvtt/image_compress_cvtt.cpp @@ -32,7 +32,7 @@ #include "core/os/os.h" #include "core/os/thread.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/safe_refcount.h" #include diff --git a/modules/database/database.h b/modules/database/database.h index 2d133c92e..86f448a49 100644 --- a/modules/database/database.h +++ b/modules/database/database.h @@ -1,7 +1,7 @@ #ifndef DATABASE_H #define DATABASE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/database/database_connection.h b/modules/database/database_connection.h index 76faaf21b..9db136245 100644 --- a/modules/database/database_connection.h +++ b/modules/database/database_connection.h @@ -1,7 +1,7 @@ #ifndef DATABASE_CONNECTION_H #define DATABASE_CONNECTION_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/database/database_manager.h b/modules/database/database_manager.h index 109978adc..ec56a6303 100644 --- a/modules/database/database_manager.h +++ b/modules/database/database_manager.h @@ -2,7 +2,7 @@ #define DATABASE_MANAGER_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/object/object.h" diff --git a/modules/database/database_single_threaded.h b/modules/database/database_single_threaded.h index 5eb757f7d..7688e067d 100644 --- a/modules/database/database_single_threaded.h +++ b/modules/database/database_single_threaded.h @@ -1,7 +1,7 @@ #ifndef DATABASE_SINGLE_THREADED_H #define DATABASE_SINGLE_THREADED_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "database.h" diff --git a/modules/database/query_builder.h b/modules/database/query_builder.h index 153cdb755..ada7ed0c8 100644 --- a/modules/database/query_builder.h +++ b/modules/database/query_builder.h @@ -1,7 +1,7 @@ #ifndef QUERY_BUILDER_H #define QUERY_BUILDER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/database/query_result.h b/modules/database/query_result.h index acf61c9d5..13353b029 100644 --- a/modules/database/query_result.h +++ b/modules/database/query_result.h @@ -1,7 +1,7 @@ #ifndef QUERY_RESULT_H #define QUERY_RESULT_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/database/table_builder.cpp b/modules/database/table_builder.cpp index 87f6249d7..b604e0d8c 100644 --- a/modules/database/table_builder.cpp +++ b/modules/database/table_builder.cpp @@ -1,6 +1,6 @@ #include "table_builder.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "query_result.h" String TableBuilder::get_result() { diff --git a/modules/database/table_builder.h b/modules/database/table_builder.h index 03addfbde..c0b8c6406 100644 --- a/modules/database/table_builder.h +++ b/modules/database/table_builder.h @@ -1,7 +1,7 @@ #ifndef TABLE_BUILDER_H #define TABLE_BUILDER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/database_sqlite/sqlite3_connection.cpp b/modules/database_sqlite/sqlite3_connection.cpp index a629904d1..d1063ebc7 100644 --- a/modules/database_sqlite/sqlite3_connection.cpp +++ b/modules/database_sqlite/sqlite3_connection.cpp @@ -1,7 +1,7 @@ #include "sqlite3_connection.h" -#include "core/print_string.h" -#include "core/ustring.h" +#include "core/string/print_string.h" +#include "core/string/ustring.h" #include "sqlite3_query_builder.h" #include "sqlite3_query_result.h" #include "sqlite3_table_builder.h" diff --git a/modules/database_sqlite/sqlite3_query_builder.h b/modules/database_sqlite/sqlite3_query_builder.h index 21d170fc7..b2e66373c 100644 --- a/modules/database_sqlite/sqlite3_query_builder.h +++ b/modules/database_sqlite/sqlite3_query_builder.h @@ -1,7 +1,7 @@ #ifndef SQLITE3_QUERY_BUILDER_H #define SQLITE3_QUERY_BUILDER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../database/query_builder.h" diff --git a/modules/database_sqlite/sqlite3_query_result.cpp b/modules/database_sqlite/sqlite3_query_result.cpp index 005d9f83c..1b0a2b113 100644 --- a/modules/database_sqlite/sqlite3_query_result.cpp +++ b/modules/database_sqlite/sqlite3_query_result.cpp @@ -1,8 +1,8 @@ #include "sqlite3_query_result.h" #include "./sqlite/sqlite3.h" -#include "core/print_string.h" -#include "core/ustring.h" +#include "core/string/print_string.h" +#include "core/string/ustring.h" #include bool Sqlite3QueryResult::next_row() { diff --git a/modules/database_sqlite/sqlite3_query_result.h b/modules/database_sqlite/sqlite3_query_result.h index 9f2f50fdf..b31786f37 100644 --- a/modules/database_sqlite/sqlite3_query_result.h +++ b/modules/database_sqlite/sqlite3_query_result.h @@ -1,7 +1,7 @@ #ifndef SQLITE3_QUERY_RESULT_H #define SQLITE3_QUERY_RESULT_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "../database/query_result.h" diff --git a/modules/database_sqlite/sqlite3_table_builder.h b/modules/database_sqlite/sqlite3_table_builder.h index a4211ba21..e1c44ed7c 100644 --- a/modules/database_sqlite/sqlite3_table_builder.h +++ b/modules/database_sqlite/sqlite3_table_builder.h @@ -1,7 +1,7 @@ #ifndef SQLITE3_TABLE_BUILDER_H #define SQLITE3_TABLE_BUILDER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../database/table_builder.h" diff --git a/modules/entity_spell_system/data/items/craft_recipe.h b/modules/entity_spell_system/data/items/craft_recipe.h index 809fbc2f3..ba6048593 100644 --- a/modules/entity_spell_system/data/items/craft_recipe.h +++ b/modules/entity_spell_system/data/items/craft_recipe.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "item_template.h" diff --git a/modules/entity_spell_system/data/items/model_visual_entry.h b/modules/entity_spell_system/data/items/model_visual_entry.h index cb45eacd8..ccbd55aad 100644 --- a/modules/entity_spell_system/data/items/model_visual_entry.h +++ b/modules/entity_spell_system/data/items/model_visual_entry.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/math/color.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/data/species/entity_species_data.h b/modules/entity_spell_system/data/species/entity_species_data.h index 165fdb329..62b0b699e 100644 --- a/modules/entity_spell_system/data/species/entity_species_data.h +++ b/modules/entity_spell_system/data/species/entity_species_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "../../entity_enums.h" diff --git a/modules/entity_spell_system/data/species/species_model_data.cpp b/modules/entity_spell_system/data/species/species_model_data.cpp index 654e4fe4a..f478489c5 100644 --- a/modules/entity_spell_system/data/species/species_model_data.cpp +++ b/modules/entity_spell_system/data/species/species_model_data.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "../../defines.h" #include "../../singletons/ess.h" -#include "core/ustring.h" +#include "core/string/ustring.h" int SpeciesModelData::get_id() { return _id; diff --git a/modules/entity_spell_system/data/species/species_model_data.h b/modules/entity_spell_system/data/species/species_model_data.h index 81bd8578b..125ea2750 100644 --- a/modules/entity_spell_system/data/species/species_model_data.h +++ b/modules/entity_spell_system/data/species/species_model_data.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/math/color.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/resources/packed_scene.h" diff --git a/modules/entity_spell_system/database/ess_resource_db.h b/modules/entity_spell_system/database/ess_resource_db.h index 9bbc54834..630e3a715 100644 --- a/modules/entity_spell_system/database/ess_resource_db.h +++ b/modules/entity_spell_system/database/ess_resource_db.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/bind/core_bind.h" #include "core/containers/hash_map.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/database/ess_resource_db_folders.h b/modules/entity_spell_system/database/ess_resource_db_folders.h index f1ff99936..133c0f0b4 100644 --- a/modules/entity_spell_system/database/ess_resource_db_folders.h +++ b/modules/entity_spell_system/database/ess_resource_db_folders.h @@ -26,7 +26,7 @@ SOFTWARE. #include "core/bind/core_bind.h" #include "core/engine.h" #include "core/containers/hash_map.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/database/ess_resource_db_map.h b/modules/entity_spell_system/database/ess_resource_db_map.h index fd2979f12..820f07282 100644 --- a/modules/entity_spell_system/database/ess_resource_db_map.h +++ b/modules/entity_spell_system/database/ess_resource_db_map.h @@ -28,7 +28,7 @@ SOFTWARE. #include "core/bind/core_bind.h" #include "core/engine.h" #include "core/containers/hash_map.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h b/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h index df33f674a..072131402 100644 --- a/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h +++ b/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/entities/data/character_spec.h b/modules/entity_spell_system/entities/data/character_spec.h index 2c3d8489e..237f1c34a 100644 --- a/modules/entity_spell_system/entities/data/character_spec.h +++ b/modules/entity_spell_system/entities/data/character_spec.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class Spell; diff --git a/modules/entity_spell_system/entities/data/entity_class_data.h b/modules/entity_spell_system/entities/data/entity_class_data.h index e89f1e754..c6c647204 100644 --- a/modules/entity_spell_system/entities/data/entity_class_data.h +++ b/modules/entity_spell_system/entities/data/entity_class_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/math/math_funcs.h" diff --git a/modules/entity_spell_system/entities/data/entity_data.h b/modules/entity_spell_system/entities/data/entity_data.h index 8caaf818d..9c29c037c 100644 --- a/modules/entity_spell_system/entities/data/entity_data.h +++ b/modules/entity_spell_system/entities/data/entity_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/entities/entity.h b/modules/entity_spell_system/entities/entity.h index 5260b4f14..5d03c35e9 100644 --- a/modules/entity_spell_system/entities/entity.h +++ b/modules/entity_spell_system/entities/entity.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/io/networked_multiplayer_peer.h" diff --git a/modules/entity_spell_system/entities/skills/entity_skill_data.h b/modules/entity_spell_system/entities/skills/entity_skill_data.h index 222c7e349..b4cb31ea9 100644 --- a/modules/entity_spell_system/entities/skills/entity_skill_data.h +++ b/modules/entity_spell_system/entities/skills/entity_skill_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class EntitySkillData : public Resource { GDCLASS(EntitySkillData, Resource); diff --git a/modules/entity_spell_system/entity_enums.h b/modules/entity_spell_system/entity_enums.h index c593399c0..9ad6ece97 100644 --- a/modules/entity_spell_system/entity_enums.h +++ b/modules/entity_spell_system/entity_enums.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class EntityEnums : public Object { GDCLASS(EntityEnums, Object); diff --git a/modules/entity_spell_system/item_enums.h b/modules/entity_spell_system/item_enums.h index b2182859c..3d0dd4389 100644 --- a/modules/entity_spell_system/item_enums.h +++ b/modules/entity_spell_system/item_enums.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class ItemEnums : public Object { GDCLASS(ItemEnums, Object); diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h b/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h index 1ed3ef5e0..17cf10398 100644 --- a/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h +++ b/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/variant/dictionary.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "action_bar_entry.h" diff --git a/modules/entity_spell_system/profiles/class_profile.h b/modules/entity_spell_system/profiles/class_profile.h index b90377b18..2970d67be 100644 --- a/modules/entity_spell_system/profiles/class_profile.h +++ b/modules/entity_spell_system/profiles/class_profile.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/dictionary.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "actionbar/action_bar_profile.h" #include "input/input_profile.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile.cpp b/modules/entity_spell_system/profiles/input/input_profile.cpp index 7d57e7b49..9b1c8fd6e 100644 --- a/modules/entity_spell_system/profiles/input/input_profile.cpp +++ b/modules/entity_spell_system/profiles/input/input_profile.cpp @@ -23,7 +23,7 @@ SOFTWARE. #include "input_profile.h" #include "core/project_settings.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../class_profile.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile.h b/modules/entity_spell_system/profiles/input/input_profile.h index 39ec73232..6192082a8 100644 --- a/modules/entity_spell_system/profiles/input/input_profile.h +++ b/modules/entity_spell_system/profiles/input/input_profile.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class ClassProfile; diff --git a/modules/entity_spell_system/profiles/input/input_profile_modifier.h b/modules/entity_spell_system/profiles/input/input_profile_modifier.h index 38cf319d1..f14cffcf7 100644 --- a/modules/entity_spell_system/profiles/input/input_profile_modifier.h +++ b/modules/entity_spell_system/profiles/input/input_profile_modifier.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "input_profile_modifier_entry.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h b/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h index f58c6e248..331194a6b 100644 --- a/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h +++ b/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class InputProfileModifierEntry : public Reference { GDCLASS(InputProfileModifierEntry, Reference); diff --git a/modules/entity_spell_system/profiles/player_profile.h b/modules/entity_spell_system/profiles/player_profile.h index 20c36807e..0ec832afd 100644 --- a/modules/entity_spell_system/profiles/player_profile.h +++ b/modules/entity_spell_system/profiles/player_profile.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/dictionary.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "class_profile.h" diff --git a/modules/entity_spell_system/singletons/ess.h b/modules/entity_spell_system/singletons/ess.h index 9a15b36e1..c46c79699 100644 --- a/modules/entity_spell_system/singletons/ess.h +++ b/modules/entity_spell_system/singletons/ess.h @@ -26,7 +26,7 @@ SOFTWARE. #include "core/engine.h" #include "core/object/object.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/skeleton/character_skeleton_2d.h b/modules/entity_spell_system/skeleton/character_skeleton_2d.h index 8451df446..4f569269d 100644 --- a/modules/entity_spell_system/skeleton/character_skeleton_2d.h +++ b/modules/entity_spell_system/skeleton/character_skeleton_2d.h @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/node_path.h" -#include "core/ustring.h" +#include "core/string/node_path.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/2d/node_2d.h" diff --git a/modules/entity_spell_system/skeleton/character_skeleton_3d.h b/modules/entity_spell_system/skeleton/character_skeleton_3d.h index b3c303057..0665199b5 100644 --- a/modules/entity_spell_system/skeleton/character_skeleton_3d.h +++ b/modules/entity_spell_system/skeleton/character_skeleton_3d.h @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/node_path.h" -#include "core/ustring.h" +#include "core/string/node_path.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/skeleton/entity_skeleton_data.h b/modules/entity_spell_system/skeleton/entity_skeleton_data.h index 898a9d46e..a1a954208 100644 --- a/modules/entity_spell_system/skeleton/entity_skeleton_data.h +++ b/modules/entity_spell_system/skeleton/entity_skeleton_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class CharacterSkeletonVisualEntry; diff --git a/modules/entity_spell_system/utility/entity_create_info.h b/modules/entity_spell_system/utility/entity_create_info.h index b80ec99a8..b751c1992 100644 --- a/modules/entity_spell_system/utility/entity_create_info.h +++ b/modules/entity_spell_system/utility/entity_create_info.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../entity_enums.h" diff --git a/modules/etc/image_compress_etc.cpp b/modules/etc/image_compress_etc.cpp index 5d1bd0e3c..a84cb04ce 100644 --- a/modules/etc/image_compress_etc.cpp +++ b/modules/etc/image_compress_etc.cpp @@ -32,7 +32,7 @@ #include "core/image.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include #include diff --git a/modules/fastnoise/noise.h b/modules/fastnoise/noise.h index 0ffd0db61..25bc345f8 100644 --- a/modules/fastnoise/noise.h +++ b/modules/fastnoise/noise.h @@ -2,7 +2,7 @@ #define FASTNOISE_NOISE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "lib/FastNoise.h" diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index 819cde4d7..49ad9d28e 100644 --- a/modules/gdscript/gdscript_function.h +++ b/modules/gdscript/gdscript_function.h @@ -35,7 +35,7 @@ #include "core/object/reference.h" #include "core/object/script_language.h" #include "core/containers/self_list.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/variant/variant.h" class GDScriptInstance; diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 7bec88628..184bf30bd 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -34,7 +34,7 @@ #include "core/engine.h" #include "core/io/resource_loader.h" #include "core/os/file_access.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "core/object/reference.h" #include "core/object/script_language.h" diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index b337c9fbb..d9b9c2058 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -32,7 +32,7 @@ #include "core/io/marshalls.h" #include "core/containers/map.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "gdscript_functions.h" const char *GDScriptTokenizer::token_names[TK_MAX] = { diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h index ff88c4791..697f9de46 100644 --- a/modules/gdscript/gdscript_tokenizer.h +++ b/modules/gdscript/gdscript_tokenizer.h @@ -31,8 +31,8 @@ /*************************************************************************/ #include "core/pair.h" -#include "core/string_name.h" -#include "core/ustring.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vmap.h" #include "gdscript_functions.h" diff --git a/modules/hdr/image_loader_hdr.cpp b/modules/hdr/image_loader_hdr.cpp index 57f708146..a0ac365ad 100644 --- a/modules/hdr/image_loader_hdr.cpp +++ b/modules/hdr/image_loader_hdr.cpp @@ -31,7 +31,7 @@ #include "image_loader_hdr.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" Error ImageLoaderHDR::load_image(Ref p_image, FileAccess *f, bool p_force_linear, float p_scale) { String header = f->get_token(); diff --git a/modules/jpg/image_loader_jpegd.cpp b/modules/jpg/image_loader_jpegd.cpp index 0e4b53d3e..a1ff16814 100644 --- a/modules/jpg/image_loader_jpegd.cpp +++ b/modules/jpg/image_loader_jpegd.cpp @@ -31,7 +31,7 @@ #include "image_loader_jpegd.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include #include diff --git a/modules/material_maker/editor/mat_maker_gd_editor.h b/modules/material_maker/editor/mat_maker_gd_editor.h index ce95e36b3..0dc91e0a6 100644 --- a/modules/material_maker/editor/mat_maker_gd_editor.h +++ b/modules/material_maker/editor/mat_maker_gd_editor.h @@ -2,10 +2,10 @@ #define MAT_MAKER_GD_EDITOR_H #include "core/math/vector2.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/reference.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "modules/material_maker/editor/mm_create_name_popup.h" diff --git a/modules/material_maker/editor/mm_create_name_popup.h b/modules/material_maker/editor/mm_create_name_popup.h index a28ca5852..1f4520718 100644 --- a/modules/material_maker/editor/mm_create_name_popup.h +++ b/modules/material_maker/editor/mm_create_name_popup.h @@ -2,10 +2,10 @@ #define MM_CREATE_NAME_POPUP_H #include "core/math/vector2.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "core/object/reference.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/gui/dialogs.h" diff --git a/modules/material_maker/editor/mm_graph_node.h b/modules/material_maker/editor/mm_graph_node.h index 188490351..48111dcf4 100644 --- a/modules/material_maker/editor/mm_graph_node.h +++ b/modules/material_maker/editor/mm_graph_node.h @@ -4,7 +4,7 @@ #include "core/math/vector2.h" #include "core/object/reference.h" #include "core/object/undo_redo.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/gui/graph_node.h" diff --git a/modules/material_maker/editor/widgets/file_dialog/left_panel.h b/modules/material_maker/editor/widgets/file_dialog/left_panel.h index 9b2c2ba2c..ce7612bc2 100644 --- a/modules/material_maker/editor/widgets/file_dialog/left_panel.h +++ b/modules/material_maker/editor/widgets/file_dialog/left_panel.h @@ -3,7 +3,7 @@ #include "core/variant/array.h" #include "core/os/input_event.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/gui/box_container.h" diff --git a/modules/material_maker/editor/widgets/file_dialog/mat_maker_file_dialog.h b/modules/material_maker/editor/widgets/file_dialog/mat_maker_file_dialog.h index f94072330..b5138338f 100644 --- a/modules/material_maker/editor/widgets/file_dialog/mat_maker_file_dialog.h +++ b/modules/material_maker/editor/widgets/file_dialog/mat_maker_file_dialog.h @@ -1,7 +1,7 @@ #ifndef MAT_MAKER_FILE_DIALOG_H #define MAT_MAKER_FILE_DIALOG_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "scene/gui/file_dialog.h" diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.cpp b/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.cpp index e1ff1bc34..333bc46fd 100644 --- a/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.cpp +++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.cpp @@ -1,6 +1,6 @@ #include "gradient_cursor.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "gradient_editor.h" #include "scene/gui/label.h" diff --git a/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.h b/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.h index 6c1248ab4..c5a531503 100644 --- a/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.h +++ b/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.h @@ -2,7 +2,7 @@ #define IMAGE_PICKER_BUTTON_H #include "core/variant/array.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/gui/texture_button.h" diff --git a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h index 3d5038f15..15af345d4 100644 --- a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h +++ b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/pool_vector.h" #include "core/math/vector3.h" #include "core/object/reference.h" diff --git a/modules/mesh_data_resource/plugin/mdr_import_plugin_base.h b/modules/mesh_data_resource/plugin/mdr_import_plugin_base.h index 1148e33e6..06cf207b9 100644 --- a/modules/mesh_data_resource/plugin/mdr_import_plugin_base.h +++ b/modules/mesh_data_resource/plugin/mdr_import_plugin_base.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../mesh_data_resource_collection.h" #include "core/io/resource_saver.h" diff --git a/modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h b/modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h index 314bcdc40..34b605d5e 100644 --- a/modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h +++ b/modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../plugin/mdr_import_plugin_base.h" diff --git a/modules/mesh_data_resource/plugin_gltf/editor_plugin_gltf_mdr.h b/modules/mesh_data_resource/plugin_gltf/editor_plugin_gltf_mdr.h index 58f9fc628..25ea9ea2f 100644 --- a/modules/mesh_data_resource/plugin_gltf/editor_plugin_gltf_mdr.h +++ b/modules/mesh_data_resource/plugin_gltf/editor_plugin_gltf_mdr.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/ustring.h" +#include "core/string/ustring.h" #include "editor/editor_plugin.h" diff --git a/modules/mesh_utils/simplify.h b/modules/mesh_utils/simplify.h index b77f5bbab..19ef3cacc 100644 --- a/modules/mesh_utils/simplify.h +++ b/modules/mesh_utils/simplify.h @@ -15,7 +15,7 @@ // 5/2016: Chris Rorden created minimal version for OSX/Linux/Windows compile #include "core/variant/array.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/network_synchronizer/bit_array.cpp b/modules/network_synchronizer/bit_array.cpp index 9600d7dd8..7607a2ac9 100644 --- a/modules/network_synchronizer/bit_array.cpp +++ b/modules/network_synchronizer/bit_array.cpp @@ -35,7 +35,7 @@ #include "bit_array.h" #include "core/math/math_funcs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" BitArray::BitArray(uint32_t p_initial_size_in_bit) { resize_in_bits(p_initial_size_in_bit); diff --git a/modules/network_synchronizer/interpolator.cpp b/modules/network_synchronizer/interpolator.cpp index 0ba29a13d..9996d4c21 100644 --- a/modules/network_synchronizer/interpolator.cpp +++ b/modules/network_synchronizer/interpolator.cpp @@ -36,7 +36,7 @@ #include "interpolator.h" -#include "core/ustring.h" +#include "core/string/ustring.h" void Interpolator::_bind_methods() { ClassDB::bind_method(D_METHOD("register_variable", "default", "fallback"), &Interpolator::register_variable); diff --git a/modules/paint/actions/pencil_action.cpp b/modules/paint/actions/pencil_action.cpp index ae9110e83..f255df0f7 100644 --- a/modules/paint/actions/pencil_action.cpp +++ b/modules/paint/actions/pencil_action.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "../paint_canvas.h" #include "../paint_canvas_layer.h" #include "../paint_utilities.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void PencilAction::do_action(PaintCanvas *canvas, const Array &data) { PaintAction::do_action(canvas, data); diff --git a/modules/paint/bush_prefabs.cpp b/modules/paint/bush_prefabs.cpp index 15c15ea1a..48b54087a 100644 --- a/modules/paint/bush_prefabs.cpp +++ b/modules/paint/bush_prefabs.cpp @@ -23,7 +23,7 @@ SOFTWARE. */ #include "bush_prefabs.h" -#include "core/print_string.h" +#include "core/string/print_string.h" /* const list = [ diff --git a/modules/plugin_refresher/plugin_refresher.h b/modules/plugin_refresher/plugin_refresher.h index 9847085b6..3e2e5282b 100644 --- a/modules/plugin_refresher/plugin_refresher.h +++ b/modules/plugin_refresher/plugin_refresher.h @@ -2,7 +2,7 @@ #define PLUGIN_REFRESHER_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/regex/regex.h b/modules/regex/regex.h index 8ac3bdc1b..857ffb6f2 100644 --- a/modules/regex/regex.h +++ b/modules/regex/regex.h @@ -34,7 +34,7 @@ #include "core/variant/dictionary.h" #include "core/containers/map.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" class RegExMatch : public Reference { diff --git a/modules/svg/image_loader_svg.h b/modules/svg/image_loader_svg.h index a32e0f65b..fb32bb039 100644 --- a/modules/svg/image_loader_svg.h +++ b/modules/svg/image_loader_svg.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/io/image_loader.h" -#include "core/ustring.h" +#include "core/string/ustring.h" /** @author Daniel Ramirez diff --git a/modules/terraman/areas/terrain_world_area.h b/modules/terraman/areas/terrain_world_area.h index 909538458..0bace085f 100644 --- a/modules/terraman/areas/terrain_world_area.h +++ b/modules/terraman/areas/terrain_world_area.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/math/aabb.h" diff --git a/modules/terraman/world/default/terrain_chunk_default.h b/modules/terraman/world/default/terrain_chunk_default.h index de7a00d4c..bcc1999c0 100644 --- a/modules/terraman/world/default/terrain_chunk_default.h +++ b/modules/terraman/world/default/terrain_chunk_default.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../terrain_chunk.h" diff --git a/modules/terraman/world/terrain_chunk.h b/modules/terraman/world/terrain_chunk.h index 37700d73f..53a51c073 100644 --- a/modules/terraman/world/terrain_chunk.h +++ b/modules/terraman/world/terrain_chunk.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../defines.h" diff --git a/modules/terraman_2d/areas/terrain_2d_world_area.h b/modules/terraman_2d/areas/terrain_2d_world_area.h index c0dece401..4295247d8 100644 --- a/modules/terraman_2d/areas/terrain_2d_world_area.h +++ b/modules/terraman_2d/areas/terrain_2d_world_area.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/math/aabb.h" diff --git a/modules/terraman_2d/world/default/terrain_2d_chunk_default.h b/modules/terraman_2d/world/default/terrain_2d_chunk_default.h index 2dbc0c08e..c5005dd39 100644 --- a/modules/terraman_2d/world/default/terrain_2d_chunk_default.h +++ b/modules/terraman_2d/world/default/terrain_2d_chunk_default.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../terrain_2d_chunk.h" diff --git a/modules/terraman_2d/world/terrain_2d_chunk.h b/modules/terraman_2d/world/terrain_2d_chunk.h index 936979334..43c09a1f3 100644 --- a/modules/terraman_2d/world/terrain_2d_chunk.h +++ b/modules/terraman_2d/world/terrain_2d_chunk.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../defines.h" diff --git a/modules/text_editor/text_editor_preview.h b/modules/text_editor/text_editor_preview.h index a8f40d7e2..059545032 100644 --- a/modules/text_editor/text_editor_preview.h +++ b/modules/text_editor/text_editor_preview.h @@ -1,7 +1,7 @@ #ifndef TEXT_EDITOR_PREVIEW_H #define TEXT_EDITOR_PREVIEW_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/gui/dialogs.h" diff --git a/modules/text_editor/text_editor_vanilla_editor.h b/modules/text_editor/text_editor_vanilla_editor.h index 7a12a2bf7..6c083c68e 100644 --- a/modules/text_editor/text_editor_vanilla_editor.h +++ b/modules/text_editor/text_editor_vanilla_editor.h @@ -3,7 +3,7 @@ #include "core/os/os.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "scene/gui/box_container.h" diff --git a/modules/text_editor/text_file_editor.h b/modules/text_editor/text_file_editor.h index f514349f7..680b5fab2 100644 --- a/modules/text_editor/text_file_editor.h +++ b/modules/text_editor/text_file_editor.h @@ -2,7 +2,7 @@ #define TEXT_FILE_EDITOR_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/texture_packer/texture_packer.h b/modules/texture_packer/texture_packer.h index 64db281e1..a9c0a33ac 100644 --- a/modules/texture_packer/texture_packer.h +++ b/modules/texture_packer/texture_packer.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/math/color.h" #include "core/image.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/resources/texture.h" diff --git a/modules/texture_packer/texture_resource/editor_plugin_packer_image_resource.h b/modules/texture_packer/texture_resource/editor_plugin_packer_image_resource.h index 2d6192b91..deab9f614 100644 --- a/modules/texture_packer/texture_resource/editor_plugin_packer_image_resource.h +++ b/modules/texture_packer/texture_resource/editor_plugin_packer_image_resource.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/ustring.h" +#include "core/string/ustring.h" #include "editor/editor_plugin.h" diff --git a/modules/texture_packer/texture_resource/packer_image_resource_importer.h b/modules/texture_packer/texture_resource/packer_image_resource_importer.h index b8a34b00f..a4f7d217b 100644 --- a/modules/texture_packer/texture_resource/packer_image_resource_importer.h +++ b/modules/texture_packer/texture_resource/packer_image_resource_importer.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/image.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/io/resource_saver.h" #include "editor/import/editor_import_plugin.h" diff --git a/modules/tga/image_loader_tga.cpp b/modules/tga/image_loader_tga.cpp index 6edd75733..5a18d1224 100644 --- a/modules/tga/image_loader_tga.cpp +++ b/modules/tga/image_loader_tga.cpp @@ -33,7 +33,7 @@ #include "core/error_macros.h" #include "core/io/file_access_memory.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t p_pixel_size, uint8_t *p_uncompressed_buffer, size_t p_output_size, size_t p_input_size) { Error error; diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp index e3bb5778c..404e4e089 100644 --- a/modules/tinyexr/image_loader_tinyexr.cpp +++ b/modules/tinyexr/image_loader_tinyexr.cpp @@ -31,7 +31,7 @@ #include "image_loader_tinyexr.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include // Should come before including tinyexr. diff --git a/modules/ui_extensions/input_map_editor.cpp b/modules/ui_extensions/input_map_editor.cpp index b18cec1ed..f5d23c6ee 100644 --- a/modules/ui_extensions/input_map_editor.cpp +++ b/modules/ui_extensions/input_map_editor.cpp @@ -32,8 +32,8 @@ #include "core/global_constants.h" #include "core/project_settings.h" -#include "core/translation.h" -#include "core/ustring.h" +#include "core/string/translation.h" +#include "core/string/ustring.h" #include "core/os/keyboard.h" #include "editor/editor_export.h" diff --git a/modules/users/managers/user_manager.h b/modules/users/managers/user_manager.h index e824c59dc..132485bdc 100644 --- a/modules/users/managers/user_manager.h +++ b/modules/users/managers/user_manager.h @@ -2,7 +2,7 @@ #define USER_MANAGER_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "scene/main/node.h" diff --git a/modules/users/managers/user_manager_db.h b/modules/users/managers/user_manager_db.h index 355723369..c44faf333 100644 --- a/modules/users/managers/user_manager_db.h +++ b/modules/users/managers/user_manager_db.h @@ -3,7 +3,7 @@ #include "core/os/rw_lock.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_manager.h" diff --git a/modules/users/managers/user_manager_file.h b/modules/users/managers/user_manager_file.h index d390ef933..f98208ca5 100644 --- a/modules/users/managers/user_manager_file.h +++ b/modules/users/managers/user_manager_file.h @@ -3,7 +3,7 @@ #include "core/os/rw_lock.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_manager.h" diff --git a/modules/users/managers/user_manager_static.h b/modules/users/managers/user_manager_static.h index d1de94a22..904f6f192 100644 --- a/modules/users/managers/user_manager_static.h +++ b/modules/users/managers/user_manager_static.h @@ -3,7 +3,7 @@ #include "core/os/rw_lock.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_manager.h" diff --git a/modules/users/singleton/user_db.h b/modules/users/singleton/user_db.h index 763c11ea6..5844ce96f 100644 --- a/modules/users/singleton/user_db.h +++ b/modules/users/singleton/user_db.h @@ -3,7 +3,7 @@ #include "core/os/rw_lock.h" #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/object/object.h" diff --git a/modules/users/users/user.h b/modules/users/users/user.h index 4acf54bb9..ff613cf1e 100644 --- a/modules/users/users/user.h +++ b/modules/users/users/user.h @@ -2,7 +2,7 @@ #define USER_H #include "core/os/rw_lock.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/resource.h" diff --git a/modules/users/users/user_module.h b/modules/users/users/user_module.h index c30954418..1cde86abc 100644 --- a/modules/users/users/user_module.h +++ b/modules/users/users/user_module.h @@ -2,7 +2,7 @@ #define USER_MODULE_H #include "core/os/rw_lock.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/resource.h" diff --git a/modules/users/web/middleware/user_session_setup_web_server_middleware.h b/modules/users/web/middleware/user_session_setup_web_server_middleware.h index 88d10d05f..041cac7e2 100644 --- a/modules/users/web/middleware/user_session_setup_web_server_middleware.h +++ b/modules/users/web/middleware/user_session_setup_web_server_middleware.h @@ -2,7 +2,7 @@ #define USER_SESSION_SETUP_WEB_SERVER_MIDDLEWARE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "modules/web/http/web_server_middleware.h" diff --git a/modules/users/web/web_nodes/user_controller.h b/modules/users/web/web_nodes/user_controller.h index 54c9429ce..972fbd8b3 100644 --- a/modules/users/web/web_nodes/user_controller.h +++ b/modules/users/web/web_nodes/user_controller.h @@ -2,7 +2,7 @@ #define USER_CONTROLLER_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "modules/web/http/web_node.h" diff --git a/modules/users/web/web_nodes/user_delete_web_page.h b/modules/users/web/web_nodes/user_delete_web_page.h index 5ebe8c7ae..e6576c1c8 100644 --- a/modules/users/web/web_nodes/user_delete_web_page.h +++ b/modules/users/web/web_nodes/user_delete_web_page.h @@ -2,7 +2,7 @@ #define USER_DELETE_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_web_page.h" diff --git a/modules/users/web/web_nodes/user_login_web_page.h b/modules/users/web/web_nodes/user_login_web_page.h index d9b3c9072..58e5739c0 100644 --- a/modules/users/web/web_nodes/user_login_web_page.h +++ b/modules/users/web/web_nodes/user_login_web_page.h @@ -2,7 +2,7 @@ #define USER_LOGIN_REQUEST_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_web_page.h" diff --git a/modules/users/web/web_nodes/user_logout_web_page.h b/modules/users/web/web_nodes/user_logout_web_page.h index 41f027e09..7e2b34238 100644 --- a/modules/users/web/web_nodes/user_logout_web_page.h +++ b/modules/users/web/web_nodes/user_logout_web_page.h @@ -2,7 +2,7 @@ #define USER_LOGOUT_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_web_page.h" diff --git a/modules/users/web/web_nodes/user_password_reset_web_page.h b/modules/users/web/web_nodes/user_password_reset_web_page.h index 5801e4828..833aa6170 100644 --- a/modules/users/web/web_nodes/user_password_reset_web_page.h +++ b/modules/users/web/web_nodes/user_password_reset_web_page.h @@ -2,7 +2,7 @@ #define USER_PASSWORD_RESET_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_web_page.h" diff --git a/modules/users/web/web_nodes/user_register_web_page.h b/modules/users/web/web_nodes/user_register_web_page.h index be277916a..4b55a7201 100644 --- a/modules/users/web/web_nodes/user_register_web_page.h +++ b/modules/users/web/web_nodes/user_register_web_page.h @@ -2,7 +2,7 @@ #define USER_REGISTER_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_web_page.h" diff --git a/modules/users/web/web_nodes/user_settings_web_page.h b/modules/users/web/web_nodes/user_settings_web_page.h index 2f79c6a99..c7f8c8edc 100644 --- a/modules/users/web/web_nodes/user_settings_web_page.h +++ b/modules/users/web/web_nodes/user_settings_web_page.h @@ -2,7 +2,7 @@ #define USER_SETTINGS_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "user_web_page.h" diff --git a/modules/users/web/web_nodes/user_stats_web_page.h b/modules/users/web/web_nodes/user_stats_web_page.h index 4b180b55a..3819b3683 100644 --- a/modules/users/web/web_nodes/user_stats_web_page.h +++ b/modules/users/web/web_nodes/user_stats_web_page.h @@ -2,7 +2,7 @@ #define USER_STATS_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "modules/web/http/web_node.h" diff --git a/modules/users/web/web_nodes/user_web_page.h b/modules/users/web/web_nodes/user_web_page.h index 609fc43a0..6c0869af6 100644 --- a/modules/users/web/web_nodes/user_web_page.h +++ b/modules/users/web/web_nodes/user_web_page.h @@ -2,7 +2,7 @@ #define USER_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "modules/web/http/web_node.h" diff --git a/modules/voxelman/areas/world_area.h b/modules/voxelman/areas/world_area.h index 3b4bc7d23..4c5daec3e 100644 --- a/modules/voxelman/areas/world_area.h +++ b/modules/voxelman/areas/world_area.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/math/aabb.h" #include "scene/resources/texture.h" diff --git a/modules/voxelman/world/default/voxel_chunk_default.h b/modules/voxelman/world/default/voxel_chunk_default.h index 8ee4febb4..93805df09 100644 --- a/modules/voxelman/world/default/voxel_chunk_default.h +++ b/modules/voxelman/world/default/voxel_chunk_default.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../voxel_chunk.h" diff --git a/modules/voxelman/world/voxel_chunk.h b/modules/voxelman/world/voxel_chunk.h index f71234ad5..50b1f9edc 100644 --- a/modules/voxelman/world/voxel_chunk.h +++ b/modules/voxelman/world/voxel_chunk.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" #include "core/object/resource.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../defines.h" diff --git a/modules/web/file_cache.cpp b/modules/web/file_cache.cpp index 831443cd2..bc1de4d4e 100644 --- a/modules/web/file_cache.cpp +++ b/modules/web/file_cache.cpp @@ -3,7 +3,7 @@ #include "core/os/dir_access.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" String FileCache::get_wwwroot() { diff --git a/modules/web/file_cache.h b/modules/web/file_cache.h index 759a03b25..eadf3ae07 100644 --- a/modules/web/file_cache.h +++ b/modules/web/file_cache.h @@ -5,7 +5,7 @@ #include "core/containers/map.h" #include "core/os/os.h" #include "core/os/rw_lock.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/object/reference.h" diff --git a/modules/web/html/bbcode_parser.h b/modules/web/html/bbcode_parser.h index 3cb814989..efb1df0bf 100644 --- a/modules/web/html/bbcode_parser.h +++ b/modules/web/html/bbcode_parser.h @@ -1,7 +1,7 @@ #ifndef BBCODE_PARSER_H #define BBCODE_PARSER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/object/reference.h" diff --git a/modules/web/html/form_validator.h b/modules/web/html/form_validator.h index 20b131a29..132af5d30 100644 --- a/modules/web/html/form_validator.h +++ b/modules/web/html/form_validator.h @@ -1,7 +1,7 @@ #ifndef HTTP_FORM_VALIDATOR_H #define HTTP_FORM_VALIDATOR_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/object/resource.h" diff --git a/modules/web/html/html_builder.h b/modules/web/html/html_builder.h index 66de69d1e..d84fd5737 100644 --- a/modules/web/html/html_builder.h +++ b/modules/web/html/html_builder.h @@ -1,7 +1,7 @@ #ifndef HTML_BUILDER_H #define HTML_BUILDER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/web/html/html_builder_bind.cpp b/modules/web/html/html_builder_bind.cpp index 4e961e73b..1b8ef4556 100644 --- a/modules/web/html/html_builder_bind.cpp +++ b/modules/web/html/html_builder_bind.cpp @@ -1,6 +1,6 @@ #include "html_builder_bind.h" -#include "core/print_string.h" -#include "core/ustring.h" +#include "core/string/print_string.h" +#include "core/string/ustring.h" #include "core/object/method_bind_ext.gen.inc" diff --git a/modules/web/html/html_builder_bind.h b/modules/web/html/html_builder_bind.h index 679bed5f6..86cf4b7eb 100644 --- a/modules/web/html/html_builder_bind.h +++ b/modules/web/html/html_builder_bind.h @@ -2,7 +2,7 @@ #define HTML_BUILDER_BIND_H #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/web/html/html_parser.h b/modules/web/html/html_parser.h index 38c1f0233..24f1f06b0 100644 --- a/modules/web/html/html_parser.h +++ b/modules/web/html/html_parser.h @@ -1,7 +1,7 @@ #ifndef HTML_PARSER_H #define HTML_PARSER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/web/html/markdown_renderer.h b/modules/web/html/markdown_renderer.h index 9a4e2a821..e4c722e51 100644 --- a/modules/web/html/markdown_renderer.h +++ b/modules/web/html/markdown_renderer.h @@ -1,7 +1,7 @@ #ifndef MARKDOWN_RENDERER_H #define MARKDOWN_RENDERER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/web/html/paginator.h b/modules/web/html/paginator.h index c91c419c8..46a8cc432 100644 --- a/modules/web/html/paginator.h +++ b/modules/web/html/paginator.h @@ -1,7 +1,7 @@ #ifndef HTML_PAGINATOR_H #define HTML_PAGINATOR_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/object/reference.h" diff --git a/modules/web/http/csrf_token.h b/modules/web/http/csrf_token.h index e1f9cdd74..bc19b51a6 100644 --- a/modules/web/http/csrf_token.h +++ b/modules/web/http/csrf_token.h @@ -3,7 +3,7 @@ #include "web_server_middleware.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class WebServerRequest; diff --git a/modules/web/http/http_server_enums.h b/modules/web/http/http_server_enums.h index c03fa2d16..03c4ae5e9 100644 --- a/modules/web/http/http_server_enums.h +++ b/modules/web/http/http_server_enums.h @@ -24,7 +24,7 @@ SOFTWARE. */ #include "core/object/object.h" -#include "core/ustring.h" +#include "core/string/ustring.h" class HTTPServerEnums : public Object { GDCLASS(HTTPServerEnums, Object); diff --git a/modules/web/http/http_session.h b/modules/web/http/http_session.h index 9b3c06044..cee5bfe2c 100644 --- a/modules/web/http/http_session.h +++ b/modules/web/http/http_session.h @@ -6,7 +6,7 @@ #include "core/object/reference.h" #include "core/os/mutex.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" //TODO diff --git a/modules/web/http/http_session_manager.h b/modules/web/http/http_session_manager.h index 9da37bdea..685e8de6b 100644 --- a/modules/web/http/http_session_manager.h +++ b/modules/web/http/http_session_manager.h @@ -3,7 +3,7 @@ #include "core/containers/hash_map.h" #include "core/os/mutex.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/object/reference.h" diff --git a/modules/web/http/web_node.cpp b/modules/web/http/web_node.cpp index 81a20c731..a31c83bae 100644 --- a/modules/web/http/web_node.cpp +++ b/modules/web/http/web_node.cpp @@ -4,7 +4,7 @@ #include "core/error_macros.h" #include "core/object/object.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "http_server_enums.h" #include "modules/database/database_connection.h" #include "web_server_request.h" diff --git a/modules/web/http/web_permission.h b/modules/web/http/web_permission.h index 609bcf0d1..2ea065a9e 100644 --- a/modules/web/http/web_permission.h +++ b/modules/web/http/web_permission.h @@ -1,7 +1,7 @@ #ifndef WEB_PERMISSION_H #define WEB_PERMISSION_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/object/reference.h" diff --git a/modules/web/http/web_root.h b/modules/web/http/web_root.h index 872083e98..d73f1cca5 100644 --- a/modules/web/http/web_root.h +++ b/modules/web/http/web_root.h @@ -3,7 +3,7 @@ #include "core/containers/hash_map.h" #include "core/os/mutex.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "web_node.h" diff --git a/modules/web/http/web_server_cookie.h b/modules/web/http/web_server_cookie.h index a248f313a..7908a08cd 100644 --- a/modules/web/http/web_server_cookie.h +++ b/modules/web/http/web_server_cookie.h @@ -2,7 +2,7 @@ #define WEB_SERVER_COOKIE_H #include "core/os/os.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/web/http/web_server_middleware.h b/modules/web/http/web_server_middleware.h index d9a119f57..d1abca99e 100644 --- a/modules/web/http/web_server_middleware.h +++ b/modules/web/http/web_server_middleware.h @@ -1,7 +1,7 @@ #ifndef WEB_SERVRER_MIDDLEWARE_H #define WEB_SERVRER_MIDDLEWARE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/resource.h" diff --git a/modules/web/http/web_server_request.h b/modules/web/http/web_server_request.h index a2c3a4331..e1217303d 100644 --- a/modules/web/http/web_server_request.h +++ b/modules/web/http/web_server_request.h @@ -2,7 +2,7 @@ #define WEB_SERVER_REQUEST_H #include "core/variant/dictionary.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "core/object/object.h" diff --git a/modules/web/http_server_simple/http_parser.h b/modules/web/http_server_simple/http_parser.h index dd882a326..73332da20 100644 --- a/modules/web/http_server_simple/http_parser.h +++ b/modules/web/http_server_simple/http_parser.h @@ -1,7 +1,7 @@ #ifndef HTTP_PARSER_H #define HTTP_PARSER_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/object/reference.h" diff --git a/modules/web/http_server_simple/simple_web_server_request.h b/modules/web/http_server_simple/simple_web_server_request.h index 6b1e67f87..6349b5cce 100644 --- a/modules/web/http_server_simple/simple_web_server_request.h +++ b/modules/web/http_server_simple/simple_web_server_request.h @@ -3,7 +3,7 @@ #include "core/variant/dictionary.h" #include "core/containers/hash_map.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "../http/web_server_request.h" diff --git a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h index 5204ea2ea..a389a1148 100644 --- a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h +++ b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h @@ -1,7 +1,7 @@ #ifndef BROWSABLE_FOLDER_SERVE_WEB_PAGE_H #define BROWSABLE_FOLDER_SERVE_WEB_PAGE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "folder_serve_web_page.h" diff --git a/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h index a839a8172..c6529f0bb 100644 --- a/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h +++ b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h @@ -2,7 +2,7 @@ #define FOLDER_SERVE_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/list_page/list_web_page.h b/modules/web/nodes/list_page/list_web_page.h index 96d3da465..23830a87b 100644 --- a/modules/web/nodes/list_page/list_web_page.h +++ b/modules/web/nodes/list_page/list_web_page.h @@ -1,7 +1,7 @@ #ifndef LIST_WEB_PAGE_H #define LIST_WEB_PAGE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/paged_article/paged_article_web_page.h b/modules/web/nodes/paged_article/paged_article_web_page.h index 2dc781dfe..c362d8029 100644 --- a/modules/web/nodes/paged_article/paged_article_web_page.h +++ b/modules/web/nodes/paged_article/paged_article_web_page.h @@ -2,7 +2,7 @@ #define PAGED_ARTICLE_WEB_PAGE_H #include "core/object/reference.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h index 5c0b428de..88293338e 100644 --- a/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h +++ b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h @@ -1,7 +1,7 @@ #ifndef PAGED_ARTICLES_WEB_PAGE_MD_INDEX_H #define PAGED_ARTICLES_WEB_PAGE_MD_INDEX_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/paged_article/paged_articles_web_page.h b/modules/web/nodes/paged_article/paged_articles_web_page.h index 3d43170e3..96d36dff5 100644 --- a/modules/web/nodes/paged_article/paged_articles_web_page.h +++ b/modules/web/nodes/paged_article/paged_articles_web_page.h @@ -1,7 +1,7 @@ #ifndef PAGED_ARTICLES_WEB_PAGE_H #define PAGED_ARTICLES_WEB_PAGE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/containers/vector.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/redirect/alias_web_page.h b/modules/web/nodes/redirect/alias_web_page.h index d68b1d2c1..296557a91 100644 --- a/modules/web/nodes/redirect/alias_web_page.h +++ b/modules/web/nodes/redirect/alias_web_page.h @@ -1,7 +1,7 @@ #ifndef ALIAS_WEB_PAGE_H #define ALIAS_WEB_PAGE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/redirect/redirect_web_page.h b/modules/web/nodes/redirect/redirect_web_page.h index 83a900f31..fdd8c5eac 100644 --- a/modules/web/nodes/redirect/redirect_web_page.h +++ b/modules/web/nodes/redirect/redirect_web_page.h @@ -1,7 +1,7 @@ #ifndef REDIRECT_WEB_PAGE_H #define REDIRECT_WEB_PAGE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/static_pages/static_web_page.h b/modules/web/nodes/static_pages/static_web_page.h index 48c4e79df..163847d2d 100644 --- a/modules/web/nodes/static_pages/static_web_page.h +++ b/modules/web/nodes/static_pages/static_web_page.h @@ -1,7 +1,7 @@ #ifndef STATIC_WEB_PAGE_H #define STATIC_WEB_PAGE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/static_pages/static_web_page_file.h b/modules/web/nodes/static_pages/static_web_page_file.h index 3cbecdf92..b10046d0e 100644 --- a/modules/web/nodes/static_pages/static_web_page_file.h +++ b/modules/web/nodes/static_pages/static_web_page_file.h @@ -1,7 +1,7 @@ #ifndef STATIC_WEB_PAGE_FILE_H #define STATIC_WEB_PAGE_FILE_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "static_web_page.h" diff --git a/modules/web/nodes/static_pages/static_web_page_folder_files.h b/modules/web/nodes/static_pages/static_web_page_folder_files.h index 01db60473..4e59cfd16 100644 --- a/modules/web/nodes/static_pages/static_web_page_folder_files.h +++ b/modules/web/nodes/static_pages/static_web_page_folder_files.h @@ -1,7 +1,7 @@ #ifndef STATIC_WEB_PAGE_FOLDER_FILES_H #define STATIC_WEB_PAGE_FOLDER_FILES_H -#include "core/ustring.h" +#include "core/string/ustring.h" #include "static_web_page.h" diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp index 7942e639c..7b9645583 100644 --- a/platform/android/dir_access_jandroid.cpp +++ b/platform/android/dir_access_jandroid.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "dir_access_jandroid.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "file_access_android.h" #include "string_android.h" #include "thread_jandroid.h" diff --git a/platform/android/export/pandemonium_plugin_config.h b/platform/android/export/pandemonium_plugin_config.h index 1bb61a8e0..8d72ac1ca 100644 --- a/platform/android/export/pandemonium_plugin_config.h +++ b/platform/android/export/pandemonium_plugin_config.h @@ -34,7 +34,7 @@ #include "core/error_list.h" #include "core/io/config_file.h" #include "core/project_settings.h" -#include "core/ustring.h" +#include "core/string/ustring.h" /* The `config` section and fields are required and defined as follow: diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp index 8027973e6..d6128e211 100644 --- a/platform/android/file_access_android.cpp +++ b/platform/android/file_access_android.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "file_access_android.h" -#include "core/print_string.h" +#include "core/string/print_string.h" AAssetManager *FileAccessAndroid::asset_manager = NULL; diff --git a/platform/android/string_android.h b/platform/android/string_android.h index f6b843103..62125fd55 100644 --- a/platform/android/string_android.h +++ b/platform/android/string_android.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ustring.h" +#include "core/string/ustring.h" #include "thread_jandroid.h" #include diff --git a/platform/frt/os_frt.cpp b/platform/frt/os_frt.cpp index c904b7a3d..4ccf016f4 100644 --- a/platform/frt/os_frt.cpp +++ b/platform/frt/os_frt.cpp @@ -44,7 +44,7 @@ #include "main/main.h" #include "main/input_default.h" #include "main/performance.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #define VIDEO_DRIVER_GLES2 0 #define VIDEO_DRIVER_COUNT 1 diff --git a/platform/frt_sdl/frt_godot3.cc b/platform/frt_sdl/frt_godot3.cc index 7a44994d0..f5347307b 100644 --- a/platform/frt_sdl/frt_godot3.cc +++ b/platform/frt_sdl/frt_godot3.cc @@ -12,7 +12,7 @@ #include "drivers/gles2/rasterizer_gles2.h" //#define FRT_DL_SKIP -#include "core/print_string.h" +#include "core/string/print_string.h" #include "drivers/unix/os_unix.h" #pragma GCC diagnostic ignored "-Wvolatile" #include "servers/audio_server.h" diff --git a/platform/iphone/pandemonium_iphone.mm b/platform/iphone/pandemonium_iphone.mm index 10efd6a08..4500f173d 100644 --- a/platform/iphone/pandemonium_iphone.mm +++ b/platform/iphone/pandemonium_iphone.mm @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/ustring.h" +#include "core/string/ustring.h" #include "main/main.h" #include "os_iphone.h" diff --git a/platform/iphone/plugin/pandemonium_plugin_config.h b/platform/iphone/plugin/pandemonium_plugin_config.h index d4f7d3547..9a152bf72 100644 --- a/platform/iphone/plugin/pandemonium_plugin_config.h +++ b/platform/iphone/plugin/pandemonium_plugin_config.h @@ -32,7 +32,7 @@ #include "core/error_list.h" #include "core/io/config_file.h" -#include "core/ustring.h" +#include "core/string/ustring.h" /* The `config` section and fields are required and defined as follow: diff --git a/platform/osx/crash_handler_osx.mm b/platform/osx/crash_handler_osx.mm index 15025f428..c0e5a5c7c 100644 --- a/platform/osx/crash_handler_osx.mm +++ b/platform/osx/crash_handler_osx.mm @@ -31,7 +31,7 @@ #include "crash_handler_osx.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "core/version.h" #include "main/main.h" diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index b350ef79a..e21162d4d 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -32,7 +32,7 @@ #include "core/math/geometry.h" #include "core/os/keyboard.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/version_generated.gen.h" #include "dir_access_osx.h" #include "drivers/gles2/rasterizer_gles2.h" diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index 0317a1668..12d4c7cc3 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -30,7 +30,7 @@ #include "os_server.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "drivers/dummy/rasterizer_dummy.h" #include "drivers/dummy/texture_loader_dummy.h" #include "servers/visual/visual_server_raster.h" diff --git a/platform/windows/crash_handler_windows.cpp b/platform/windows/crash_handler_windows.cpp index c7f92e0f5..ffecaa795 100644 --- a/platform/windows/crash_handler_windows.cpp +++ b/platform/windows/crash_handler_windows.cpp @@ -31,7 +31,7 @@ #include "crash_handler_windows.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "core/version.h" #include "main/main.h" diff --git a/platform/x11/crash_handler_x11.cpp b/platform/x11/crash_handler_x11.cpp index 94cbcaa2b..57653df3c 100644 --- a/platform/x11/crash_handler_x11.cpp +++ b/platform/x11/crash_handler_x11.cpp @@ -31,7 +31,7 @@ #include "crash_handler_x11.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "core/version.h" #include "main/main.h" diff --git a/platform/x11/detect_prime.cpp b/platform/x11/detect_prime.cpp index f68a1317d..884b52585 100644 --- a/platform/x11/detect_prime.cpp +++ b/platform/x11/detect_prime.cpp @@ -33,8 +33,8 @@ #include "detect_prime.h" -#include "core/print_string.h" -#include "core/ustring.h" +#include "core/string/print_string.h" +#include "core/string/ustring.h" #include diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index adedcf89d..fdc843671 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -32,7 +32,7 @@ #include "core/math/vector2i.h" #include "core/os/dir_access.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "detect_prime.h" #include "drivers/gles2/rasterizer_gles2.h" #include "key_mapping_x11.h" diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index d8f8dfc7a..6e0752515 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -30,7 +30,7 @@ #include "button.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "servers/visual_server.h" Size2 Button::get_minimum_size() const { diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp index 6416557b9..99ec3aeb7 100644 --- a/scene/gui/check_button.cpp +++ b/scene/gui/check_button.cpp @@ -30,7 +30,7 @@ #include "check_button.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "servers/visual_server.h" Size2 CheckButton::get_icon_size() const { diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 5ffe94180..4fc77ab6a 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -33,7 +33,7 @@ #include "core/object/message_queue.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "scene/gui/label.h" #include "scene/gui/panel.h" diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index e02907eb9..e2549ffea 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "dialogs.h" -#include "core/print_string.h" -#include "core/translation.h" +#include "core/string/print_string.h" +#include "core/string/translation.h" #include "line_edit.h" #include "box_container.h" diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 0dab01204..61746755c 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -31,7 +31,7 @@ #include "file_dialog.h" #include "core/os/keyboard.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "scene/gui/label.h" #include "scene/gui/shortcut.h" diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index a6d1bc125..6336debc7 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -29,9 +29,9 @@ /*************************************************************************/ #include "label.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" -#include "core/translation.h" +#include "core/string/translation.h" void Label::set_autowrap(bool p_autowrap) { if (autowrap == p_autowrap) { diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 3f476a6cc..6909731f9 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -34,8 +34,8 @@ #include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/print_string.h" -#include "core/translation.h" +#include "core/string/print_string.h" +#include "core/string/translation.h" #include "label.h" #include "scene/gui/popup_menu.h" #include "scene/gui/shortcut.h" diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp index 8fc9674ae..a20c58e3d 100644 --- a/scene/gui/link_button.cpp +++ b/scene/gui/link_button.cpp @@ -30,7 +30,7 @@ #include "link_button.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "scene/gui/shortcut.h" void LinkButton::set_text(const String &p_text) { diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index 285dcc009..c25da861b 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -30,7 +30,7 @@ #include "option_button.h" #include "core/os/input.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "scene/gui/popup_menu.h" #include "scene/gui/shortcut.h" diff --git a/scene/gui/panel.cpp b/scene/gui/panel.cpp index dbb39f090..ce3c988eb 100644 --- a/scene/gui/panel.cpp +++ b/scene/gui/panel.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "panel.h" -#include "core/print_string.h" +#include "core/string/print_string.h" void Panel::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index de6a6b7dd..b7d9e3f4f 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -32,9 +32,9 @@ #include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" -#include "core/translation.h" +#include "core/string/translation.h" #include "scene/gui/shortcut.h" #include "scene/main/timer.h" diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index dd7ffb0db..40524dc88 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -32,7 +32,7 @@ #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" bool ScrollBar::focus_by_default = false; diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index c52115551..726aaa4ea 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -34,7 +34,7 @@ #include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "scene/gui/line_edit.h" #include "scene/gui/popup_menu.h" diff --git a/scene/main/node.cpp b/scene/main/node.cpp index dd5f254b0..9a3b3c102 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -33,7 +33,7 @@ #include "core/core_string_names.h" #include "core/io/resource_loader.h" #include "core/object/message_queue.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "instance_placeholder.h" #include "scene/animation/scene_tree_tween.h" #include "scene/resources/packed_scene.h" diff --git a/scene/main/node.h b/scene/main/node.h index a33e87587..318b87911 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -33,7 +33,7 @@ #include "core/object/object.h" #include "core/containers/map.h" -#include "core/node_path.h" +#include "core/string/node_path.h" #include "scene/main/scene_tree.h" class Viewport; diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 8f331b0ac..8b3cbaed8 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -36,7 +36,7 @@ #include "core/os/dir_access.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" #include "main/input_default.h" #include "node.h" diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 0656143ae..6f34193e9 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "theme.h" -#include "core/print_string.h" +#include "core/string/print_string.h" // Universal Theme resources used when no other theme has the item. Ref Theme::default_theme; diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h index eaa193cc5..89a1f2b9e 100644 --- a/scene/scene_string_names.h +++ b/scene/scene_string_names.h @@ -30,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/node_path.h" -#include "core/string_name.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" class SceneStringNames { friend void register_scene_types(); friend void unregister_scene_types(); diff --git a/servers/physics/broad_phase_basic.cpp b/servers/physics/broad_phase_basic.cpp index 98da33d30..19ac60f1e 100644 --- a/servers/physics/broad_phase_basic.cpp +++ b/servers/physics/broad_phase_basic.cpp @@ -30,7 +30,7 @@ #include "broad_phase_basic.h" #include "core/containers/list.h" -#include "core/print_string.h" +#include "core/string/print_string.h" BroadPhaseSW::ID BroadPhaseBasic::create(CollisionObjectSW *p_object, int p_subindex, const AABB &p_aabb, bool p_static) { ERR_FAIL_COND_V(p_object == nullptr, 0); diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 95c991283..a3c42f6c6 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -31,7 +31,7 @@ #include "physics_2d_server.h" #include "core/object/method_bind_ext.gen.inc" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" Physics2DServer *Physics2DServer::singleton = nullptr; diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index 88e542fa2..e95b7f73e 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -31,7 +31,7 @@ #include "physics_server.h" #include "core/object/method_bind_ext.gen.inc" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/project_settings.h" PhysicsServer *PhysicsServer::singleton = nullptr; diff --git a/servers/visual/portals/portal_pvs_builder.cpp b/servers/visual/portals/portal_pvs_builder.cpp index 5216a3e1a..3b2df3947 100644 --- a/servers/visual/portals/portal_pvs_builder.cpp +++ b/servers/visual/portals/portal_pvs_builder.cpp @@ -32,7 +32,7 @@ #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "portal_renderer.h" bool PVSBuilder::_log_active = true; diff --git a/servers/visual/portals/portal_rooms_bsp.cpp b/servers/visual/portals/portal_rooms_bsp.cpp index f30e493bc..ccc9fc722 100644 --- a/servers/visual/portals/portal_rooms_bsp.cpp +++ b/servers/visual/portals/portal_rooms_bsp.cpp @@ -32,7 +32,7 @@ #include "core/math/geometry.h" #include "core/math/plane.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "core/variant/variant.h" #include "portal_renderer.h" diff --git a/servers/visual/rasterizer.cpp b/servers/visual/rasterizer.cpp index d6bfe656c..e12f9edd3 100644 --- a/servers/visual/rasterizer.cpp +++ b/servers/visual/rasterizer.cpp @@ -31,7 +31,7 @@ #include "rasterizer.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" Rasterizer *(*Rasterizer::_create_func)() = nullptr; diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index ebdd618bf..6b94fce70 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -30,7 +30,7 @@ #include "shader_language.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "servers/visual_server.h" static bool _is_text_char(CharType c) { diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h index 69b5ab241..48e953d6b 100644 --- a/servers/visual/shader_language.h +++ b/servers/visual/shader_language.h @@ -34,9 +34,9 @@ #include "core/containers/map.h" #include "core/containers/ordered_hash_map.h" #include "core/object/script_language.h" -#include "core/string_name.h" +#include "core/string/string_name.h" #include "core/typedefs.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "core/variant/variant.h" class ShaderLanguage {