diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-03 15:58:44 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-03 15:58:44 +0200 |
| commit | 5f1184e93fe1021c86520460dc0a6619bff3c1fb (patch) | |
| tree | a3dc765ec942feb0c95bd0305993812c970c2de6 | |
| parent | 56cf773b022348e5940ef6a9c6165ec724ced43a (diff) | |
| parent | 0f72b15bc2181bd02923599d2587524b1ba0e8be (diff) | |
| download | redot-engine-5f1184e93fe1021c86520460dc0a6619bff3c1fb.tar.gz | |
Merge pull request #92723 from AThousandShips/incorrect_sname
Fix some incorrect uses of `String` over `StringName`
| -rw-r--r-- | editor/gui/scene_tree_editor.cpp | 2 | ||||
| -rw-r--r-- | 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 ddf22c46e6..7e2d6c9d1e 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 a3804eff00..3479d22267 100644 --- a/editor/plugins/control_editor_plugin.cpp +++ b/editor/plugins/control_editor_plugin.cpp @@ -360,9 +360,9 @@ void EditorPropertySizeFlags::setup(const Vector<String> &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"); |