1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00

Use initializer list in Arrays

This commit is contained in:
kobewi
2024-03-22 22:53:26 +01:00
parent 594d64ec24
commit 75881f8322
72 changed files with 347 additions and 947 deletions

View File

@@ -240,8 +240,7 @@ void ThemeItemImportTree::_update_items_tree() {
}
if (color_amount > 0) {
Array arr;
arr.push_back(color_amount);
Array arr = { color_amount };
select_colors_label->set_text(TTRN("1 color", "{num} colors", color_amount).format(arr, "{num}"));
select_all_colors_button->set_visible(true);
select_full_colors_button->set_visible(true);
@@ -254,8 +253,7 @@ void ThemeItemImportTree::_update_items_tree() {
}
if (constant_amount > 0) {
Array arr;
arr.push_back(constant_amount);
Array arr = { constant_amount };
select_constants_label->set_text(TTRN("1 constant", "{num} constants", constant_amount).format(arr, "{num}"));
select_all_constants_button->set_visible(true);
select_full_constants_button->set_visible(true);
@@ -268,8 +266,7 @@ void ThemeItemImportTree::_update_items_tree() {
}
if (font_amount > 0) {
Array arr;
arr.push_back(font_amount);
Array arr = { font_amount };
select_fonts_label->set_text(TTRN("1 font", "{num} fonts", font_amount).format(arr, "{num}"));
select_all_fonts_button->set_visible(true);
select_full_fonts_button->set_visible(true);
@@ -282,8 +279,7 @@ void ThemeItemImportTree::_update_items_tree() {
}
if (font_size_amount > 0) {
Array arr;
arr.push_back(font_size_amount);
Array arr = { font_size_amount };
select_font_sizes_label->set_text(TTRN("1 font size", "{num} font sizes", font_size_amount).format(arr, "{num}"));
select_all_font_sizes_button->set_visible(true);
select_full_font_sizes_button->set_visible(true);
@@ -296,8 +292,7 @@ void ThemeItemImportTree::_update_items_tree() {
}
if (icon_amount > 0) {
Array arr;
arr.push_back(icon_amount);
Array arr = { icon_amount };
select_icons_label->set_text(TTRN("1 icon", "{num} icons", icon_amount).format(arr, "{num}"));
select_all_icons_button->set_visible(true);
select_full_icons_button->set_visible(true);
@@ -312,8 +307,7 @@ void ThemeItemImportTree::_update_items_tree() {
}
if (stylebox_amount > 0) {
Array arr;
arr.push_back(stylebox_amount);
Array arr = { stylebox_amount };
select_styleboxes_label->set_text(TTRN("1 stylebox", "{num} styleboxes", stylebox_amount).format(arr, "{num}"));
select_all_styleboxes_button->set_visible(true);
select_full_styleboxes_button->set_visible(true);
@@ -460,8 +454,7 @@ void ThemeItemImportTree::_update_total_selected(Theme::DataType p_data_type) {
if (count == 0) {
total_selected_items_label->hide();
} else {
Array arr;
arr.push_back(count);
Array arr = { count };
total_selected_items_label->set_text(TTRN("{num} currently selected", "{num} currently selected", count).format(arr, "{num}"));
total_selected_items_label->show();
}
@@ -756,9 +749,7 @@ void ThemeItemImportTree::_import_selected() {
// Arbitrary number of items to skip from reporting.
// Reduces the number of UI updates that this causes when copying large themes.
if (idx % 10 == 0) {
Array arr;
arr.push_back(idx + 1);
arr.push_back(selected_items.size());
Array arr = { idx + 1, selected_items.size() };
ProgressDialog::get_singleton()->task_step("import_theme_items", TTR("Importing items {n}/{n}").format(arr, "{n}"), idx);
}