From 746dddc0673d7261f19b1e056e90e6e3a49ef33a Mon Sep 17 00:00:00 2001 From: reduz Date: Fri, 13 May 2022 15:04:37 +0200 Subject: Replace most uses of Map by HashMap * Map is unnecessary and inefficient in almost every case. * Replaced by the new HashMap. * Renamed Map to RBMap and Set to RBSet for cases that still make sense (order matters) but use is discouraged. There were very few cases where replacing by HashMap was undesired because keeping the key order was intended. I tried to keep those (as RBMap) as much as possible, but might have missed some. Review appreciated! --- core/io/resource.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/io/resource.cpp') diff --git a/core/io/resource.cpp b/core/io/resource.cpp index e81382b72e..4a94c17132 100644 --- a/core/io/resource.cpp +++ b/core/io/resource.cpp @@ -193,7 +193,7 @@ void Resource::reload_from_file() { copy_from(s); } -Ref Resource::duplicate_for_local_scene(Node *p_for_scene, Map, Ref> &remap_cache) { +Ref Resource::duplicate_for_local_scene(Node *p_for_scene, HashMap, Ref> &remap_cache) { List plist; get_property_list(&plist); @@ -228,7 +228,7 @@ Ref Resource::duplicate_for_local_scene(Node *p_for_scene, Map, Ref> &remap_cache) { +void Resource::configure_for_local_scene(Node *p_for_scene, HashMap, Ref> &remap_cache) { List plist; get_property_list(&plist); @@ -317,7 +317,7 @@ void Resource::unregister_owner(Object *p_owner) { } void Resource::notify_change_to_owners() { - for (Set::Element *E = owners.front(); E; E = E->next()) { + for (RBSet::Element *E = owners.front(); E; E = E->next()) { Object *obj = ObjectDB::get_instance(E->get()); ERR_CONTINUE_MSG(!obj, "Object was deleted, while still owning a resource."); //wtf //TODO store string @@ -532,7 +532,7 @@ void ResourceCache::dump(const char *p_file, bool p_short) { #ifdef DEBUG_ENABLED lock.read_lock(); - Map type_count; + HashMap type_count; Ref f; if (p_file) { -- cgit v1.2.3