diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-18 11:27:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 11:27:04 +0100 |
| commit | ef5891091bceef2800b4fae4cd85af219e791467 (patch) | |
| tree | 8d58cca8cae2c34d408450cfb5ceb198543147b7 /editor/project_settings_editor.cpp | |
| parent | c7faf2e16b684f3dd0246dbdb662b1826dd24571 (diff) | |
| parent | 3205a92ad872f918c8322cdcd1434c231a1fd251 (diff) | |
Merge pull request #36311 from reduz/poolvector-deprecation
Convert all references and instances of PoolVector to Vector
Diffstat (limited to 'editor/project_settings_editor.cpp')
| -rw-r--r-- | editor/project_settings_editor.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 6635f5cb47..83593477c7 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -1188,7 +1188,7 @@ void ProjectSettingsEditor::add_translation(const String &p_translation) { void ProjectSettingsEditor::_translation_add(const String &p_path) { - PoolStringArray translations = ProjectSettings::get_singleton()->get("locale/translations"); + PackedStringArray translations = ProjectSettings::get_singleton()->get("locale/translations"); for (int i = 0; i < translations.size(); i++) { @@ -1219,7 +1219,7 @@ void ProjectSettingsEditor::_translation_delete(Object *p_item, int p_column, in int idx = ti->get_metadata(0); - PoolStringArray translations = ProjectSettings::get_singleton()->get("locale/translations"); + PackedStringArray translations = ProjectSettings::get_singleton()->get("locale/translations"); ERR_FAIL_INDEX(idx, translations.size()); @@ -1253,7 +1253,7 @@ void ProjectSettingsEditor::_translation_res_add(const String &p_path) { if (remaps.has(p_path)) return; //pointless already has it - remaps[p_path] = PoolStringArray(); + remaps[p_path] = PackedStringArray(); undo_redo->create_action(TTR("Add Remapped Path")); undo_redo->add_do_property(ProjectSettings::get_singleton(), "locale/translation_remaps", remaps); @@ -1281,7 +1281,7 @@ void ProjectSettingsEditor::_translation_res_option_add(const String &p_path) { String key = k->get_metadata(0); ERR_FAIL_COND(!remaps.has(key)); - PoolStringArray r = remaps[key]; + PackedStringArray r = remaps[key]; r.push_back(p_path + ":" + "en"); remaps[key] = r; @@ -1328,7 +1328,7 @@ void ProjectSettingsEditor::_translation_res_option_changed() { ERR_FAIL_INDEX(which, langs.size()); ERR_FAIL_COND(!remaps.has(key)); - PoolStringArray r = remaps[key]; + PackedStringArray r = remaps[key]; ERR_FAIL_INDEX(idx, r.size()); if (translation_locales_idxs_remap.size() > which) { r.set(idx, path + ":" + langs[translation_locales_idxs_remap[which]]); @@ -1395,7 +1395,7 @@ void ProjectSettingsEditor::_translation_res_option_delete(Object *p_item, int p int idx = ed->get_metadata(0); ERR_FAIL_COND(!remaps.has(key)); - PoolStringArray r = remaps[key]; + PackedStringArray r = remaps[key]; ERR_FAIL_INDEX(idx, r.size()); r.remove(idx); remaps[key] = r; @@ -1506,7 +1506,7 @@ void ProjectSettingsEditor::_update_translations() { translation_list->set_hide_root(true); if (ProjectSettings::get_singleton()->has_setting("locale/translations")) { - PoolStringArray translations = ProjectSettings::get_singleton()->get("locale/translations"); + PackedStringArray translations = ProjectSettings::get_singleton()->get("locale/translations"); for (int i = 0; i < translations.size(); i++) { TreeItem *t = translation_list->create_item(root); @@ -1642,7 +1642,7 @@ void ProjectSettingsEditor::_update_translations() { t->select(0); translation_res_option_add_button->set_disabled(false); - PoolStringArray selected = remaps[keys[i]]; + PackedStringArray selected = remaps[keys[i]]; for (int j = 0; j < selected.size(); j++) { String s2 = selected[j]; |