Skip to content

Commit 5f1184e

Browse files
committed
Merge pull request godotengine#92723 from AThousandShips/incorrect_sname
Fix some incorrect uses of `String` over `StringName`
2 parents 56cf773 + 0f72b15 commit 5f1184e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

editor/gui/scene_tree_editor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) {
291291
const PackedStringArray warnings = p_node->get_configuration_warnings();
292292
const int num_warnings = warnings.size();
293293
if (num_warnings > 0) {
294-
String warning_icon;
294+
StringName warning_icon;
295295
if (num_warnings == 1) {
296296
warning_icon = SNAME("NodeWarning");
297297
} else if (num_warnings <= 3) {

editor/plugins/control_editor_plugin.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ void EditorPropertySizeFlags::setup(const Vector<String> &p_options, bool p_vert
360360
}
361361

362362
Control *gui_base = EditorNode::get_singleton()->get_gui_base();
363-
String wide_preset_icon = SNAME("ControlAlignHCenterWide");
364-
String begin_preset_icon = SNAME("ControlAlignCenterLeft");
365-
String end_preset_icon = SNAME("ControlAlignCenterRight");
363+
StringName wide_preset_icon = SNAME("ControlAlignHCenterWide");
364+
StringName begin_preset_icon = SNAME("ControlAlignCenterLeft");
365+
StringName end_preset_icon = SNAME("ControlAlignCenterRight");
366366
if (vertical) {
367367
wide_preset_icon = SNAME("ControlAlignVCenterWide");
368368
begin_preset_icon = SNAME("ControlAlignCenterTop");

0 commit comments

Comments
 (0)