godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #101293 from Ivorforce/string-to-pointer-conversion

Browse Source 
Remove implicit conversions from `String`, `Char16String` and `CharString` to data pointers.
This commit is contained in:
Thaddeus Crews
2025-03-07 15:12:12 -06:00
parent 9e7fbdf52b 512abc38b2
commit d9125ebebe
13 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3730,12 +3730,12 @@ void WaylandThread::window_set_title(DisplayServer::WindowID p_window_id, const
#ifdef LIBDECOR_ENABLED
if (ws.libdecor_frame) {
libdecor_frame_set_title(ws.libdecor_frame, p_title.utf8());
libdecor_frame_set_title(ws.libdecor_frame, p_title.utf8().get_data());
}
#endif // LIBDECOR_ENABLE
if (ws.xdg_toplevel) {
xdg_toplevel_set_title(ws.xdg_toplevel, p_title.utf8());
xdg_toplevel_set_title(ws.xdg_toplevel, p_title.utf8().get_data());
}
}
@@ -3745,13 +3745,13 @@ void WaylandThread::window_set_app_id(DisplayServer::WindowID p_window_id, const
#ifdef LIBDECOR_ENABLED
if (ws.libdecor_frame) {
libdecor_frame_set_app_id(ws.libdecor_frame, p_app_id.utf8());
libdecor_frame_set_app_id(ws.libdecor_frame, p_app_id.utf8().get_data());
return;
}
#endif // LIBDECOR_ENABLED
if (ws.xdg_toplevel) {
xdg_toplevel_set_app_id(ws.xdg_toplevel, p_app_id.utf8());
xdg_toplevel_set_app_id(ws.xdg_toplevel, p_app_id.utf8().get_data());
return;
}
}
@@ -4240,7 +4240,7 @@ Vector<uint8_t> WaylandThread::selection_get_mime(const String &p_mime) const {
return Vector<uint8_t>();
}
return _wl_data_offer_read(wl_display, p_mime.utf8(), ss->wl_data_offer_selection);
return _wl_data_offer_read(wl_display, p_mime.utf8().get_data(), ss->wl_data_offer_selection);
}
bool WaylandThread::primary_has_mime(const String &p_mime) const {
@@ -4283,7 +4283,7 @@ Vector<uint8_t> WaylandThread::primary_get_mime(const String &p_mime) const {
return Vector<uint8_t>();
}
return _wp_primary_selection_offer_read(wl_display, p_mime.utf8(), ss->wp_primary_selection_offer);
return _wp_primary_selection_offer_read(wl_display, p_mime.utf8().get_data(), ss->wp_primary_selection_offer);
}
void WaylandThread::primary_set_text(const String &p_text) {