Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #109562 from YYF233333/style-vector

Browse source 
Replace "local" `Vector` with `LocalVector`
This commit is contained in:
Thaddeus Crews 2025-09-16 20:28:59 -05:00
commit 153bd70c8a
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
editor/import/3d/post_import_plugin_skeleton_renamer.cpp
View file

@ -187,15 +187,15 @@ void PostImportPluginSkeletonRenamer::internal_process(InternalImportCategory p_
// Main process of renaming bones. // Main process of renaming bones.
{ {
// Apply pre-renaming result to prepared main rename map. // Apply pre-renaming result to prepared main rename map.
Vector<String> remove_queue; LocalVector<String> remove_queue;
for (HashMap<String, String>::Iterator E = main_rename_map.begin(); E; ++E) { for (const KeyValue<String, String> &kv : main_rename_map) {
if (pre_rename_map.has(E->key)) { if (pre_rename_map.has(kv.key)) {
remove_queue.push_back(E->key); remove_queue.push_back(kv.key);
} }
} }
for (int i = 0; i < remove_queue.size(); i++) { for (const String &key : remove_queue) {
main_rename_map.insert(pre_rename_map[remove_queue[i]], main_rename_map[remove_queue[i]]); main_rename_map.insert(pre_rename_map[key], main_rename_map[key]);
main_rename_map.erase(remove_queue[i]); main_rename_map.erase(key);
} }
_internal_process(p_category, p_base_scene, p_node, p_resource, p_options, main_rename_map); _internal_process(p_category, p_base_scene, p_node, p_resource, p_options, main_rename_map);
} }

19
scene/debugger/scene_debugger.cpp
View file

@ -1292,11 +1292,9 @@ void LiveEditor::_remove_node_func(const NodePath &p_at) {
return; //scene not editable return; //scene not editable
} }
Vector<Node *> to_delete; LocalVector<Node *> to_delete;
for (HashSet<Node *>::Iterator F = E->value.begin(); F; ++F) {
Node *n = *F;
for (const Node *n : E->value) {
if (base && !base->is_ancestor_of(n)) { if (base && !base->is_ancestor_of(n)) {
continue; continue;
} }
@ -1309,8 +1307,8 @@ void LiveEditor::_remove_node_func(const NodePath &p_at) {
to_delete.push_back(n2); to_delete.push_back(n2);
} }
for (int i = 0; i < to_delete.size(); i++) { for (Node *node : to_delete) {
memdelete(to_delete[i]); memdelete(node);
} }
} }
@ -1330,10 +1328,8 @@ void LiveEditor::_remove_and_keep_node_func(const NodePath &p_at, ObjectID p_kee
return; //scene not editable return; //scene not editable
} }
Vector<Node *> to_remove; LocalVector<Node *> to_remove;
for (HashSet<Node *>::Iterator F = E->value.begin(); F; ++F) { for (Node *n : E->value) {
Node *n = *F;
if (base && !base->is_ancestor_of(n)) { if (base && !base->is_ancestor_of(n)) {
continue; continue;
} }
@ -1345,8 +1341,7 @@ void LiveEditor::_remove_and_keep_node_func(const NodePath &p_at, ObjectID p_kee
to_remove.push_back(n); to_remove.push_back(n);
} }
for (int i = 0; i < to_remove.size(); i++) { for (Node *n : to_remove) {
Node *n = to_remove[i];
Node *n2 = n->get_node(p_at); Node *n2 = n->get_node(p_at);
n2->get_parent()->remove_child(n2); n2->get_parent()->remove_child(n2);
live_edit_remove_list[n][p_keep_id] = n2; live_edit_remove_list[n][p_keep_id] = n2;