From 0f72b15bc2181bd02923599d2587524b1ba0e8be Mon Sep 17 00:00:00 2001 From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> Date: Mon, 3 Jun 2024 13:42:31 +0200 Subject: [PATCH] Fix some incorrect uses of `String` over `StringName` These were accepting `SNAME` assignments --- editor/gui/scene_tree_editor.cpp | 2 +- editor/plugins/control_editor_plugin.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/editor/gui/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp index ddf22c46e6ca..7e2d6c9d1e24 100644 --- a/editor/gui/scene_tree_editor.cpp +++ b/editor/gui/scene_tree_editor.cpp @@ -291,7 +291,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) { const PackedStringArray warnings = p_node->get_configuration_warnings(); const int num_warnings = warnings.size(); if (num_warnings > 0) { - String warning_icon; + StringName warning_icon; if (num_warnings == 1) { warning_icon = SNAME("NodeWarning"); } else if (num_warnings <= 3) { diff --git a/editor/plugins/control_editor_plugin.cpp b/editor/plugins/control_editor_plugin.cpp index a3804eff005e..3479d222672a 100644 --- a/editor/plugins/control_editor_plugin.cpp +++ b/editor/plugins/control_editor_plugin.cpp @@ -360,9 +360,9 @@ void EditorPropertySizeFlags::setup(const Vector &p_options, bool p_vert } Control *gui_base = EditorNode::get_singleton()->get_gui_base(); - String wide_preset_icon = SNAME("ControlAlignHCenterWide"); - String begin_preset_icon = SNAME("ControlAlignCenterLeft"); - String end_preset_icon = SNAME("ControlAlignCenterRight"); + StringName wide_preset_icon = SNAME("ControlAlignHCenterWide"); + StringName begin_preset_icon = SNAME("ControlAlignCenterLeft"); + StringName end_preset_icon = SNAME("ControlAlignCenterRight"); if (vertical) { wide_preset_icon = SNAME("ControlAlignVCenterWide"); begin_preset_icon = SNAME("ControlAlignCenterTop");