From 3205a92ad872f918c8322cdcd1434c231a1fd251 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 17 Feb 2020 18:06:54 -0300 Subject: PoolVector is gone, replaced by Vector Typed `PoolTypeArray` types are now renamed `PackedTypeArray` and are sugar for `Vector`. --- scene/resources/theme.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'scene/resources/theme.cpp') diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 75903c1383..aa05e41b16 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -37,112 +37,112 @@ void Theme::_emit_theme_changed() { emit_changed(); } -PoolVector Theme::_get_icon_list(const String &p_type) const { +Vector Theme::_get_icon_list(const String &p_type) const { - PoolVector ilret; + Vector ilret; List il; get_icon_list(p_type, &il); ilret.resize(il.size()); int i = 0; - PoolVector::Write w = ilret.write(); + String *w = ilret.ptrw(); for (List::Element *E = il.front(); E; E = E->next(), i++) { w[i] = E->get(); } return ilret; } -PoolVector Theme::_get_stylebox_list(const String &p_type) const { +Vector Theme::_get_stylebox_list(const String &p_type) const { - PoolVector ilret; + Vector ilret; List il; get_stylebox_list(p_type, &il); ilret.resize(il.size()); int i = 0; - PoolVector::Write w = ilret.write(); + String *w = ilret.ptrw(); for (List::Element *E = il.front(); E; E = E->next(), i++) { w[i] = E->get(); } return ilret; } -PoolVector Theme::_get_stylebox_types(void) const { +Vector Theme::_get_stylebox_types(void) const { - PoolVector ilret; + Vector ilret; List il; get_stylebox_types(&il); ilret.resize(il.size()); int i = 0; - PoolVector::Write w = ilret.write(); + String *w = ilret.ptrw(); for (List::Element *E = il.front(); E; E = E->next(), i++) { w[i] = E->get(); } return ilret; } -PoolVector Theme::_get_font_list(const String &p_type) const { +Vector Theme::_get_font_list(const String &p_type) const { - PoolVector ilret; + Vector ilret; List il; get_font_list(p_type, &il); ilret.resize(il.size()); int i = 0; - PoolVector::Write w = ilret.write(); + String *w = ilret.ptrw(); for (List::Element *E = il.front(); E; E = E->next(), i++) { w[i] = E->get(); } return ilret; } -PoolVector Theme::_get_color_list(const String &p_type) const { +Vector Theme::_get_color_list(const String &p_type) const { - PoolVector ilret; + Vector ilret; List il; get_color_list(p_type, &il); ilret.resize(il.size()); int i = 0; - PoolVector::Write w = ilret.write(); + String *w = ilret.ptrw(); for (List::Element *E = il.front(); E; E = E->next(), i++) { w[i] = E->get(); } return ilret; } -PoolVector Theme::_get_constant_list(const String &p_type) const { +Vector Theme::_get_constant_list(const String &p_type) const { - PoolVector ilret; + Vector ilret; List il; get_constant_list(p_type, &il); ilret.resize(il.size()); int i = 0; - PoolVector::Write w = ilret.write(); + String *w = ilret.ptrw(); for (List::Element *E = il.front(); E; E = E->next(), i++) { w[i] = E->get(); } return ilret; } -PoolVector Theme::_get_type_list(const String &p_type) const { +Vector Theme::_get_type_list(const String &p_type) const { - PoolVector ilret; + Vector ilret; List il; get_type_list(&il); ilret.resize(il.size()); int i = 0; - PoolVector::Write w = ilret.write(); + String *w = ilret.ptrw(); for (List::Element *E = il.front(); E; E = E->next(), i++) { w[i] = E->get(); } -- cgit v1.2.3