godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92723 from AThousandShips/incorrect_sname 

Fix some incorrect uses of `String` over `StringName`
This commit is contained in:
Rémi Verschelde 2024-06-03 15:58:44 +02:00
parent 56cf773b02 0f72b15bc2
commit 5f1184e93f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/gui/scene_tree_editor.cpp
View File

@ -291,7 +291,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) {
const PackedStringArray warnings = p_node->get_configuration_warnings(); const PackedStringArray warnings = p_node->get_configuration_warnings();
const int num_warnings = warnings.size(); const int num_warnings = warnings.size();
if (num_warnings > 0) { if (num_warnings > 0) {
String warning_icon; StringName warning_icon;
if (num_warnings == 1) { if (num_warnings == 1) {
warning_icon = SNAME("NodeWarning"); warning_icon = SNAME("NodeWarning");
} else if (num_warnings <= 3) { } else if (num_warnings <= 3) {

6
editor/plugins/control_editor_plugin.cpp
View File

@ -360,9 +360,9 @@ void EditorPropertySizeFlags::setup(const Vector<String> &p_options, bool p_vert
} }
Control *gui_base = EditorNode::get_singleton()->get_gui_base(); Control *gui_base = EditorNode::get_singleton()->get_gui_base();
String wide_preset_icon = SNAME("ControlAlignHCenterWide"); StringName wide_preset_icon = SNAME("ControlAlignHCenterWide");
String begin_preset_icon = SNAME("ControlAlignCenterLeft"); StringName begin_preset_icon = SNAME("ControlAlignCenterLeft");
String end_preset_icon = SNAME("ControlAlignCenterRight"); StringName end_preset_icon = SNAME("ControlAlignCenterRight");
if (vertical) { if (vertical) {
wide_preset_icon = SNAME("ControlAlignVCenterWide"); wide_preset_icon = SNAME("ControlAlignVCenterWide");
begin_preset_icon = SNAME("ControlAlignCenterTop"); begin_preset_icon = SNAME("ControlAlignCenterTop");