From 1a7be001d214ecbb8ce01c030d641348a4a55e8d Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 26 Sep 2025 09:21:14 -0700 Subject: [PATCH] Use const Array ref in `set_structured_text_bidi_override_options` --- scene/3d/label_3d.cpp | 6 +++--- scene/3d/label_3d.h | 2 +- scene/gui/label.cpp | 6 +++--- scene/gui/label.h | 2 +- scene/gui/line_edit.cpp | 6 +++--- scene/gui/line_edit.h | 2 +- scene/gui/link_button.cpp | 6 +++--- scene/gui/link_button.h | 2 +- scene/gui/rich_text_label.cpp | 12 ++++++------ scene/gui/rich_text_label.h | 4 ++-- scene/gui/text_edit.cpp | 6 +++--- scene/gui/text_edit.h | 2 +- scene/gui/tree.cpp | 6 +++--- scene/gui/tree.h | 2 +- scene/resources/3d/primitive_meshes.cpp | 6 +++--- scene/resources/3d/primitive_meshes.h | 2 +- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/scene/3d/label_3d.cpp b/scene/3d/label_3d.cpp index 2b511bac9af..03e1792271e 100644 --- a/scene/3d/label_3d.cpp +++ b/scene/3d/label_3d.cpp @@ -739,16 +739,16 @@ TextServer::StructuredTextParser Label3D::get_structured_text_bidi_override() co return st_parser; } -void Label3D::set_structured_text_bidi_override_options(Array p_args) { +void Label3D::set_structured_text_bidi_override_options(const Array &p_args) { if (st_args != p_args) { - st_args = p_args; + st_args = Array(p_args); dirty_text = true; _queue_update(); } } Array Label3D::get_structured_text_bidi_override_options() const { - return st_args; + return Array(st_args); } void Label3D::set_uppercase(bool p_uppercase) { diff --git a/scene/3d/label_3d.h b/scene/3d/label_3d.h index a27f6d62319..ab6cc358677 100644 --- a/scene/3d/label_3d.h +++ b/scene/3d/label_3d.h @@ -188,7 +188,7 @@ public: void set_structured_text_bidi_override(TextServer::StructuredTextParser p_parser); TextServer::StructuredTextParser get_structured_text_bidi_override() const; - void set_structured_text_bidi_override_options(Array p_args); + void set_structured_text_bidi_override_options(const Array &p_args); Array get_structured_text_bidi_override_options() const; void set_uppercase(bool p_uppercase); diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 9e33ff2963f..420e0b26da5 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -1114,12 +1114,12 @@ TextServer::StructuredTextParser Label::get_structured_text_bidi_override() cons return st_parser; } -void Label::set_structured_text_bidi_override_options(Array p_args) { +void Label::set_structured_text_bidi_override_options(const Array &p_args) { if (st_args == p_args) { return; } - st_args = p_args; + st_args = Array(p_args); for (Paragraph ¶ : paragraphs) { para.dirty = true; } @@ -1127,7 +1127,7 @@ void Label::set_structured_text_bidi_override_options(Array p_args) { } Array Label::get_structured_text_bidi_override_options() const { - return st_args; + return Array(st_args); } Control::TextDirection Label::get_text_direction() const { diff --git a/scene/gui/label.h b/scene/gui/label.h index 57628b57067..be05c98e0ea 100644 --- a/scene/gui/label.h +++ b/scene/gui/label.h @@ -141,7 +141,7 @@ public: void set_structured_text_bidi_override(TextServer::StructuredTextParser p_parser); TextServer::StructuredTextParser get_structured_text_bidi_override() const; - void set_structured_text_bidi_override_options(Array p_args); + void set_structured_text_bidi_override_options(const Array &p_args); Array get_structured_text_bidi_override_options() const; void set_autowrap_mode(TextServer::AutowrapMode p_mode); diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 6989a72e2cc..1e4c55c3b6e 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -2148,14 +2148,14 @@ TextServer::StructuredTextParser LineEdit::get_structured_text_bidi_override() c return st_parser; } -void LineEdit::set_structured_text_bidi_override_options(Array p_args) { - st_args = p_args; +void LineEdit::set_structured_text_bidi_override_options(const Array &p_args) { + st_args = Array(p_args); _shape(); queue_redraw(); } Array LineEdit::get_structured_text_bidi_override_options() const { - return st_args; + return Array(st_args); } void LineEdit::clear() { diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h index 51cfdb7b164..7622c436e31 100644 --- a/scene/gui/line_edit.h +++ b/scene/gui/line_edit.h @@ -344,7 +344,7 @@ public: void set_structured_text_bidi_override(TextServer::StructuredTextParser p_parser); TextServer::StructuredTextParser get_structured_text_bidi_override() const; - void set_structured_text_bidi_override_options(Array p_args); + void set_structured_text_bidi_override_options(const Array &p_args); Array get_structured_text_bidi_override_options() const; void set_placeholder(String p_text); diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp index 0f29e400d42..72c013125e2 100644 --- a/scene/gui/link_button.cpp +++ b/scene/gui/link_button.cpp @@ -75,14 +75,14 @@ TextServer::StructuredTextParser LinkButton::get_structured_text_bidi_override() return st_parser; } -void LinkButton::set_structured_text_bidi_override_options(Array p_args) { - st_args = p_args; +void LinkButton::set_structured_text_bidi_override_options(const Array &p_args) { + st_args = Array(p_args); _shape(); queue_redraw(); } Array LinkButton::get_structured_text_bidi_override_options() const { - return st_args; + return Array(st_args); } void LinkButton::set_text_direction(Control::TextDirection p_text_direction) { diff --git a/scene/gui/link_button.h b/scene/gui/link_button.h index 4152467daf4..4847bad9c45 100644 --- a/scene/gui/link_button.h +++ b/scene/gui/link_button.h @@ -91,7 +91,7 @@ public: void set_structured_text_bidi_override(TextServer::StructuredTextParser p_parser); TextServer::StructuredTextParser get_structured_text_bidi_override() const; - void set_structured_text_bidi_override_options(Array p_args); + void set_structured_text_bidi_override_options(const Array &p_args); Array get_structured_text_bidi_override_options() const; void set_text_direction(TextDirection p_text_direction); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index ddabf5e8a18..9ee9c747630 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -7187,11 +7187,11 @@ TextServer::StructuredTextParser RichTextLabel::get_structured_text_bidi_overrid return st_parser; } -void RichTextLabel::set_structured_text_bidi_override_options(Array p_args) { +void RichTextLabel::set_structured_text_bidi_override_options(const Array &p_args) { if (st_args != p_args) { _stop_thread(); - st_args = p_args; + st_args = Array(p_args); main->first_invalid_line.store(0); // Invalidate all lines. _invalidate_accessibility(); _validate_line_caches(); @@ -7200,7 +7200,7 @@ void RichTextLabel::set_structured_text_bidi_override_options(Array p_args) { } Array RichTextLabel::get_structured_text_bidi_override_options() const { - return st_args; + return Array(st_args); } void RichTextLabel::set_language(const String &p_language) { @@ -7318,13 +7318,13 @@ float RichTextLabel::get_visible_ratio() const { return visible_ratio; } -void RichTextLabel::set_effects(Array p_effects) { - custom_effects = p_effects; +void RichTextLabel::set_effects(const Array &p_effects) { + custom_effects = Array(p_effects); reload_effects(); } Array RichTextLabel::get_effects() { - return custom_effects; + return Array(custom_effects); } void RichTextLabel::install_effect(const Variant effect) { diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index 04879be5648..25b2cbf9144 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -960,7 +960,7 @@ public: void set_structured_text_bidi_override(TextServer::StructuredTextParser p_parser); TextServer::StructuredTextParser get_structured_text_bidi_override() const; - void set_structured_text_bidi_override_options(Array p_args); + void set_structured_text_bidi_override_options(const Array &p_args); Array get_structured_text_bidi_override_options() const; void set_visible_characters(int p_visible); @@ -976,7 +976,7 @@ public: TextServer::VisibleCharactersBehavior get_visible_characters_behavior() const; void set_visible_characters_behavior(TextServer::VisibleCharactersBehavior p_behavior); - void set_effects(Array p_effects); + void set_effects(const Array &p_effects); Array get_effects(); void install_effect(const Variant effect); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 9dd0cce910d..41befe15053 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -3810,12 +3810,12 @@ TextServer::StructuredTextParser TextEdit::get_structured_text_bidi_override() c return st_parser; } -void TextEdit::set_structured_text_bidi_override_options(Array p_args) { +void TextEdit::set_structured_text_bidi_override_options(const Array &p_args) { if (st_args == p_args) { return; } - st_args = p_args; + st_args = Array(p_args); for (int i = 0; i < text.size(); i++) { text.set(i, text[i], structured_text_parser(st_parser, st_args, text[i])); } @@ -3824,7 +3824,7 @@ void TextEdit::set_structured_text_bidi_override_options(Array p_args) { } Array TextEdit::get_structured_text_bidi_override_options() const { - return st_args; + return Array(st_args); } void TextEdit::set_tab_size(const int p_size) { diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index 0cabfae0f03..bbfa3a54688 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -804,7 +804,7 @@ public: void set_structured_text_bidi_override(TextServer::StructuredTextParser p_parser); TextServer::StructuredTextParser get_structured_text_bidi_override() const; - void set_structured_text_bidi_override_options(Array p_args); + void set_structured_text_bidi_override_options(const Array &p_args); Array get_structured_text_bidi_override_options() const; void set_tab_size(const int p_size); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 7c0644844bc..28b38e311a3 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -494,14 +494,14 @@ TextServer::StructuredTextParser TreeItem::get_structured_text_bidi_override(int return cells[p_column].st_parser; } -void TreeItem::set_structured_text_bidi_override_options(int p_column, Array p_args) { +void TreeItem::set_structured_text_bidi_override_options(int p_column, const Array &p_args) { ERR_FAIL_INDEX(p_column, cells.size()); if (cells[p_column].st_args == p_args) { return; } - cells.write[p_column].st_args = p_args; + cells.write[p_column].st_args = Array(p_args); cells.write[p_column].dirty = true; cells.write[p_column].cached_minimum_size_dirty = true; @@ -510,7 +510,7 @@ void TreeItem::set_structured_text_bidi_override_options(int p_column, Array p_a Array TreeItem::get_structured_text_bidi_override_options(int p_column) const { ERR_FAIL_INDEX_V(p_column, cells.size(), Array()); - return cells[p_column].st_args; + return Array(cells[p_column].st_args); } void TreeItem::set_language(int p_column, const String &p_language) { diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 4b3cbacaf31..e2c96dda3b2 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -286,7 +286,7 @@ public: void set_structured_text_bidi_override(int p_column, TextServer::StructuredTextParser p_parser); TextServer::StructuredTextParser get_structured_text_bidi_override(int p_column) const; - void set_structured_text_bidi_override_options(int p_column, Array p_args); + void set_structured_text_bidi_override_options(int p_column, const Array &p_args); Array get_structured_text_bidi_override_options(int p_column) const; void set_language(int p_column, const String &p_language); diff --git a/scene/resources/3d/primitive_meshes.cpp b/scene/resources/3d/primitive_meshes.cpp index f5886a8719f..4bc92fd2516 100644 --- a/scene/resources/3d/primitive_meshes.cpp +++ b/scene/resources/3d/primitive_meshes.cpp @@ -3952,16 +3952,16 @@ TextServer::StructuredTextParser TextMesh::get_structured_text_bidi_override() c return st_parser; } -void TextMesh::set_structured_text_bidi_override_options(Array p_args) { +void TextMesh::set_structured_text_bidi_override_options(const Array &p_args) { if (st_args != p_args) { - st_args = p_args; + st_args = Array(p_args); dirty_text = true; request_update(); } } Array TextMesh::get_structured_text_bidi_override_options() const { - return st_args; + return Array(st_args); } void TextMesh::set_uppercase(bool p_uppercase) { diff --git a/scene/resources/3d/primitive_meshes.h b/scene/resources/3d/primitive_meshes.h index fa690091c96..43699865e8d 100644 --- a/scene/resources/3d/primitive_meshes.h +++ b/scene/resources/3d/primitive_meshes.h @@ -653,7 +653,7 @@ public: void set_structured_text_bidi_override(TextServer::StructuredTextParser p_parser); TextServer::StructuredTextParser get_structured_text_bidi_override() const; - void set_structured_text_bidi_override_options(Array p_args); + void set_structured_text_bidi_override_options(const Array &p_args); Array get_structured_text_bidi_override_options() const; void set_uppercase(bool p_uppercase);