seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use C++ iterators for Lists in many situations

Browse Source
This commit is contained in:
Aaron Franke
2021-07-15 23:45:57 -04:00
parent b918c4c3ce
commit 4e6efd1b07
218 changed files with 2755 additions and 3004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
editor/import_defaults_editor.cpp
View File

@ -61,9 +61,9 @@ protected:
if (importer.is_null()) {
return;
}
for (const List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
if (importer->get_option_visibility(E->get().name, values)) {
p_list->push_back(E->get());
for (const PropertyInfo &E : properties) {
if (importer->get_option_visibility(E.name, values)) {
p_list->push_back(E);
}
}
}
@ -106,9 +106,9 @@ void ImportDefaultsEditor::_update_importer() {
List<Ref<ResourceImporter>> importer_list;
ResourceFormatImporter::get_singleton()->get_importers(&importer_list);
Ref<ResourceImporter> importer;
for (List<Ref<ResourceImporter>>::Element *E = importer_list.front(); E; E = E->next()) {
if (E->get()->get_visible_name() == importers->get_item_text(importers->get_selected())) {
importer = E->get();
for (Ref<ResourceImporter> E : importer_list) {
if (E->get_visible_name() == importers->get_item_text(importers->get_selected())) {
importer = E;
break;
}
}
@ -125,14 +125,14 @@ void ImportDefaultsEditor::_update_importer() {
d = ProjectSettings::get_singleton()->get("importer_defaults/" + importer->get_importer_name());
}
for (List<ResourceImporter::ImportOption>::Element *E = options.front(); E; E = E->next()) {
settings->properties.push_back(E->get().option);
if (d.has(E->get().option.name)) {
settings->values[E->get().option.name] = d[E->get().option.name];
for (ResourceImporter::ImportOption &E : options) {
settings->properties.push_back(E.option);
if (d.has(E.option.name)) {
settings->values[E.option.name] = d[E.option.name];
} else {
settings->values[E->get().option.name] = E->get().default_value;
settings->values[E.option.name] = E.default_value;
}
settings->default_values[E->get().option.name] = E->get().default_value;
settings->default_values[E.option.name] = E.default_value;
}
save_defaults->set_disabled(false);
@ -166,8 +166,8 @@ void ImportDefaultsEditor::clear() {
List<Ref<ResourceImporter>> importer_list;
ResourceFormatImporter::get_singleton()->get_importers(&importer_list);
Vector<String> names;
for (List<Ref<ResourceImporter>>::Element *E = importer_list.front(); E; E = E->next()) {
String vn = E->get()->get_visible_name();
for (Ref<ResourceImporter> E : importer_list) {
String vn = E->get_visible_name();
names.push_back(vn);
}
names.sort();