diff options
Diffstat (limited to 'scene/gui/rich_text_label.cpp')
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 3f4fd88053..58babee0a4 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -216,7 +216,7 @@ String RichTextLabel::_letters(int p_num, bool p_capitalize) const { } void RichTextLabel::_update_line_font(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size) { - ERR_FAIL_COND(p_frame == nullptr); + ERR_FAIL_NULL(p_frame); ERR_FAIL_COND(p_line < 0 || p_line >= (int)p_frame->lines.size()); Line &l = p_frame->lines[p_line]; @@ -267,7 +267,7 @@ void RichTextLabel::_update_line_font(ItemFrame *p_frame, int p_line, const Ref< } float RichTextLabel::_resize_line(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size, int p_width, float p_h) { - ERR_FAIL_COND_V(p_frame == nullptr, p_h); + ERR_FAIL_NULL_V(p_frame, p_h); ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), p_h); Line &l = p_frame->lines[p_line]; @@ -448,7 +448,7 @@ float RichTextLabel::_resize_line(ItemFrame *p_frame, int p_line, const Ref<Font } float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size, int p_width, float p_h, int *r_char_offset) { - ERR_FAIL_COND_V(p_frame == nullptr, p_h); + ERR_FAIL_NULL_V(p_frame, p_h); ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), p_h); Line &l = p_frame->lines[p_line]; @@ -748,7 +748,7 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font> } int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, const Color &p_base_color, int p_outline_size, const Color &p_outline_color, const Color &p_font_shadow_color, int p_shadow_outline_size, const Point2 &p_shadow_ofs, int &r_processed_glyphs) { - ERR_FAIL_COND_V(p_frame == nullptr, 0); + ERR_FAIL_NULL_V(p_frame, 0); ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), 0); Vector2 off; @@ -5025,7 +5025,7 @@ bool RichTextLabel::_search_table(ItemTable *p_table, List<Item *>::Element *p_f } bool RichTextLabel::_search_line(ItemFrame *p_frame, int p_line, const String &p_string, int p_char_idx, bool p_reverse_search) { - ERR_FAIL_COND_V(p_frame == nullptr, false); + ERR_FAIL_NULL_V(p_frame, false); ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), false); Line &l = p_frame->lines[p_line]; @@ -5110,14 +5110,14 @@ bool RichTextLabel::search(const String &p_string, bool p_from_selection, bool p while (parent_element->get() != selection.from_frame) { parent_element = p_search_previous ? parent_element->prev() : parent_element->next(); - ERR_FAIL_COND_V(parent_element == nullptr, false); + ERR_FAIL_NULL_V(parent_element, false); } // Search remainder of table if (!(p_search_previous && parent_element == parent_table->subitems.front()) && parent_element != parent_table->subitems.back()) { parent_element = p_search_previous ? parent_element->prev() : parent_element->next(); // Don't want to search current item - ERR_FAIL_COND_V(parent_element == nullptr, false); + ERR_FAIL_NULL_V(parent_element, false); // Search for next element if (_search_table(parent_table, parent_element, p_string, p_search_previous)) { @@ -5166,7 +5166,7 @@ bool RichTextLabel::search(const String &p_string, bool p_from_selection, bool p String RichTextLabel::_get_line_text(ItemFrame *p_frame, int p_line, Selection p_selection) const { String txt; - ERR_FAIL_COND_V(p_frame == nullptr, txt); + ERR_FAIL_NULL_V(p_frame, txt); ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), txt); Line &l = p_frame->lines[p_line]; |