Moved String and related classes under a string folder in core.

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")

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;
 

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

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"
 

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

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();

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 {

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;

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:

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"
 

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();

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 <stdio.h>

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"
 

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<String> extensions;

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;
 

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:

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] = {
 	"'{'",

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.

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 <stdarg.h>

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 <limits.h>

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<ResourceFormatLoader> ResourceLoader::loader[ResourceLoader::MAX_LOADERS];

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 {

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:

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
 

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"
 
 /*

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) {

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;

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);

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"

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;

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])

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();

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 <limits.h>
 
 #define BVHABB_CLASS BVH_ABB<BOUNDS, POINT>

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);

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 {

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"

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 {

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;

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 {

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);

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 {

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();

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);

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(

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;
 

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);

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);

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 {

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);

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"

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
 

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 {

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.

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.

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:

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 <stdarg.h>

core/path_remap.cpp

@@ -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"

core/path_remap.h

@@ -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

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 <assert.h>
 

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"

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().

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")

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);

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;

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 {

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);
 

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 <int SHORT_BUFFER_SIZE = 64>
 class StringBuffer {

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"
 

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;

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;

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"
 

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"

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;
 

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"

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;

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();

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 <errno.h>
 

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 <CoreAudio/HostTime.h>
 #include <CoreServices/CoreServices.h>

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 <string.h>
 

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
 

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"

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"
 

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 <string.h>

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 <errno.h>
 #include <stdio.h>

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 <sys/stat.h>
 #include <sys/types.h>

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 <syslog.h>
 
 void SyslogLogger::logv(const char *p_format, va_list p_list, bool p_err) {

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 <pthread_np.h>

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 <stdio.h>
 #include <wchar.h>

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 <share.h> // _SH_DENYNO
 #include <shlwapi.h>

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) {

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"

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"