From 80b8eff6aa41ba79175a5152ba5b2b9b16f6de3f Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Mon, 27 Jul 2020 13:43:20 +0300
Subject: [Complex Test Layouts] Change `String` to use UTF-32 encoding on all
 platforms.

---
 scene/main/canvas_item.cpp | 4 ++--
 scene/main/node.cpp        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scene/main')

diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
index d6d1134cc9..5cd45ea408 100644
--- a/scene/main/canvas_item.cpp
+++ b/scene/main/canvas_item.cpp
@@ -939,9 +939,9 @@ float CanvasItem::draw_char(const Ref<Font> &p_font, const Point2 &p_pos, const
 	ERR_FAIL_COND_V(p_font.is_null(), 0);
 
 	if (p_font->has_outline()) {
-		p_font->draw_char(canvas_item, p_pos, p_char[0], p_next.c_str()[0], Color(1, 1, 1), true);
+		p_font->draw_char(canvas_item, p_pos, p_char[0], p_next.get_data()[0], Color(1, 1, 1), true);
 	}
-	return p_font->draw_char(canvas_item, p_pos, p_char[0], p_next.c_str()[0], p_modulate);
+	return p_font->draw_char(canvas_item, p_pos, p_char[0], p_next.get_data()[0], p_modulate);
 }
 
 void CanvasItem::_notify_transform(CanvasItem *p_node) {
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 6b304c03d2..e7753089c7 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -1094,7 +1094,7 @@ String increase_numeric_string(const String &s) {
 		if (!carry) {
 			break;
 		}
-		CharType n = s[i];
+		char32_t n = s[i];
 		if (n == '9') { // keep carry as true: 9 + 1
 			res[i] = '0';
 		} else {
@@ -1155,7 +1155,7 @@ void Node::_generate_serial_child_name(const Node *p_child, StringName &name) co
 	String name_string = name;
 	String nums;
 	for (int i = name_string.length() - 1; i >= 0; i--) {
-		CharType n = name_string[i];
+		char32_t n = name_string[i];
 		if (n >= '0' && n <= '9') {
 			nums = String::chr(name_string[i]) + nums;
 		} else {
-- 
cgit v1.2.3