godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace append_utfx with direct String::utfx

Browse Source
This commit is contained in:
Kiro
2025-03-30 19:56:38 +02:00
parent ba3482926d
commit 23129a66ed
30 changed files with 49 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/linuxbsd/wayland/wayland_thread.cpp
View File

@@ -4140,10 +4140,7 @@ String WaylandThread::keyboard_get_layout_name(int p_index) const {
SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
if (ss && ss->xkb_keymap) {
String ret;
ret.append_utf8(xkb_keymap_layout_get_name(ss->xkb_keymap, p_index));
return ret;
return String::utf8(xkb_keymap_layout_get_name(ss->xkb_keymap, p_index));
}
return "";

9
platform/linuxbsd/x11/display_server_x11.cpp
View File

@@ -111,8 +111,7 @@ struct Hints {
static String get_atom_name(Display *p_disp, Atom p_atom) {
char *name = XGetAtomName(p_disp, p_atom);
ERR_FAIL_NULL_V_MSG(name, String(), "Atom is invalid.");
String ret;
ret.append_utf8(name);
String ret = String::utf8(name);
XFree(name);
return ret;
}
@@ -3684,8 +3683,7 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
keycode -= 'a' - 'A';
}
String tmp;
tmp.append_utf8(utf8string, utf8bytes);
String tmp = String::utf8(utf8string, utf8bytes);
for (int i = 0; i < tmp.length(); i++) {
Ref<InputEventKey> k;
k.instantiate();
@@ -3765,8 +3763,7 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
char str_xkb[256] = {};
int str_xkb_size = xkb_compose_state_get_utf8(wd.xkb_state, str_xkb, 255);
String tmp;
tmp.append_utf8(str_xkb, str_xkb_size);
String tmp = String::utf8(str_xkb, str_xkb_size);
for (int i = 0; i < tmp.length(); i++) {
Ref<InputEventKey> k;
k.instantiate();