Skip to content

Commit 5d66b0b

Browse files
committed
Replace unneeded Vector.
1 parent 99a39ce commit 5d66b0b

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

editor/import/3d/post_import_plugin_skeleton_renamer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,15 @@ void PostImportPluginSkeletonRenamer::internal_process(InternalImportCategory p_
187187
// Main process of renaming bones.
188188
{
189189
// Apply pre-renaming result to prepared main rename map.
190-
Vector<String> remove_queue;
191-
for (HashMap<String, String>::Iterator E = main_rename_map.begin(); E; ++E) {
192-
if (pre_rename_map.has(E->key)) {
193-
remove_queue.push_back(E->key);
190+
LocalVector<String> remove_queue;
191+
for (const KeyValue<String, String> &kv : main_rename_map) {
192+
if (pre_rename_map.has(kv.key)) {
193+
remove_queue.push_back(kv.key);
194194
}
195195
}
196-
for (int i = 0; i < remove_queue.size(); i++) {
197-
main_rename_map.insert(pre_rename_map[remove_queue[i]], main_rename_map[remove_queue[i]]);
198-
main_rename_map.erase(remove_queue[i]);
196+
for (const String &key : remove_queue) {
197+
main_rename_map.insert(pre_rename_map[key], main_rename_map[key]);
198+
main_rename_map.erase(key);
199199
}
200200
_internal_process(p_category, p_base_scene, p_node, p_resource, p_options, main_rename_map);
201201
}

scene/debugger/scene_debugger.cpp

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,11 +1292,9 @@ void LiveEditor::_remove_node_func(const NodePath &p_at) {
12921292
return; //scene not editable
12931293
}
12941294

1295-
Vector<Node *> to_delete;
1296-
1297-
for (HashSet<Node *>::Iterator F = E->value.begin(); F; ++F) {
1298-
Node *n = *F;
1295+
LocalVector<Node *> to_delete;
12991296

1297+
for (const Node *n : E->value) {
13001298
if (base && !base->is_ancestor_of(n)) {
13011299
continue;
13021300
}
@@ -1309,8 +1307,8 @@ void LiveEditor::_remove_node_func(const NodePath &p_at) {
13091307
to_delete.push_back(n2);
13101308
}
13111309

1312-
for (int i = 0; i < to_delete.size(); i++) {
1313-
memdelete(to_delete[i]);
1310+
for (Node *node : to_delete) {
1311+
memdelete(node);
13141312
}
13151313
}
13161314

@@ -1330,10 +1328,8 @@ void LiveEditor::_remove_and_keep_node_func(const NodePath &p_at, ObjectID p_kee
13301328
return; //scene not editable
13311329
}
13321330

1333-
Vector<Node *> to_remove;
1334-
for (HashSet<Node *>::Iterator F = E->value.begin(); F; ++F) {
1335-
Node *n = *F;
1336-
1331+
LocalVector<Node *> to_remove;
1332+
for (Node *n : E->value) {
13371333
if (base && !base->is_ancestor_of(n)) {
13381334
continue;
13391335
}
@@ -1345,8 +1341,7 @@ void LiveEditor::_remove_and_keep_node_func(const NodePath &p_at, ObjectID p_kee
13451341
to_remove.push_back(n);
13461342
}
13471343

1348-
for (int i = 0; i < to_remove.size(); i++) {
1349-
Node *n = to_remove[i];
1344+
for (Node *n : to_remove) {
13501345
Node *n2 = n->get_node(p_at);
13511346
n2->get_parent()->remove_child(n2);
13521347
live_edit_remove_list[n][p_keep_id] = n2;

0 commit comments

Comments
 (0)