1 files changed, 20 insertions, 19 deletions

diff --git a/scene/main/resource_preloader.cpp b/scene/main/resource_preloader.cpp
index cd9560db61..5512d0a84e 100644
--- a/scene/main/resource_preloader.cpp
+++ b/scene/main/resource_preloader.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "resource_preloader.h"
-
+#include "core/templates/rb_set.h"
 void ResourcePreloader::_set_resources(const Array &p_data) {
 	resources.clear();
 
@@ -41,7 +41,7 @@ void ResourcePreloader::_set_resources(const Array &p_data) {
 
 	for (int i = 0; i < resdata.size(); i++) {
 		String name = names[i];
-		RES resource = resdata[i];
+		Ref<Resource> resource = resdata[i];
 		ERR_CONTINUE(!resource.is_valid());
 		resources[name] = resource;
 
@@ -55,16 +55,16 @@ Array ResourcePreloader::_get_resources() const {
 	arr.resize(resources.size());
 	names.resize(resources.size());
 
-	Set<String> sorted_names;
+	RBSet<String> sorted_names;
 
-	for (Map<StringName, RES>::Element *E = resources.front(); E; E = E->next()) {
-		sorted_names.insert(E->key());
+	for (const KeyValue<StringName, Ref<Resource>> &E : resources) {
+		sorted_names.insert(E.key);
 	}
 
 	int i = 0;
-	for (Set<String>::Element *E = sorted_names.front(); E; E = E->next()) {
-		names.set(i, E->get());
-		arr[i] = resources[E->get()];
+	for (const String &E : sorted_names) {
+		names.set(i, E);
+		arr[i] = resources[E];
 		i++;
 	}
 
@@ -74,7 +74,7 @@ Array ResourcePreloader::_get_resources() const {
 	return res;
 }
 
-void ResourcePreloader::add_resource(const StringName &p_name, const RES &p_resource) {
+void ResourcePreloader::add_resource(const StringName &p_name, const Ref<Resource> &p_resource) {
 	ERR_FAIL_COND(p_resource.is_null());
 	if (resources.has(p_name)) {
 		StringName new_name;
@@ -104,7 +104,7 @@ void ResourcePreloader::remove_resource(const StringName &p_name) {
 void ResourcePreloader::rename_resource(const StringName &p_from_name, const StringName &p_to_name) {
 	ERR_FAIL_COND(!resources.has(p_from_name));
 
-	RES res = resources[p_from_name];
+	Ref<Resource> res = resources[p_from_name];
 
 	resources.erase(p_from_name);
 	add_resource(p_to_name, res);
@@ -114,8 +114,8 @@ bool ResourcePreloader::has_resource(const StringName &p_name) const {
 	return resources.has(p_name);
 }
 
-RES ResourcePreloader::get_resource(const StringName &p_name) const {
-	ERR_FAIL_COND_V(!resources.has(p_name), RES());
+Ref<Resource> ResourcePreloader::get_resource(const StringName &p_name) const {
+	ERR_FAIL_COND_V(!resources.has(p_name), Ref<Resource>());
 	return resources[p_name];
 }
 
@@ -123,16 +123,17 @@ Vector<String> ResourcePreloader::_get_resource_list() const {
 	Vector<String> res;
 	res.resize(resources.size());
 	int i = 0;
-	for (Map<StringName, RES>::Element *E = resources.front(); E; E = E->next(), i++) {
-		res.set(i, E->key());
+	for (const KeyValue<StringName, Ref<Resource>> &E : resources) {
+		res.set(i, E.key);
+		i++;
 	}
 
 	return res;
 }
 
 void ResourcePreloader::get_resource_list(List<StringName> *p_list) {
-	for (Map<StringName, RES>::Element *E = resources.front(); E; E = E->next()) {
-		p_list->push_back(E->key());
+	for (const KeyValue<StringName, Ref<Resource>> &E : resources) {
+		p_list->push_back(E.key);
 	}
 }
 
@@ -147,7 +148,7 @@ void ResourcePreloader::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_resource", "name"), &ResourcePreloader::get_resource);
 	ClassDB::bind_method(D_METHOD("get_resource_list"), &ResourcePreloader::_get_resource_list);
 
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "resources", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_resources", "_get_resources");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "resources", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_resources", "_get_resources");
 }
 
 ResourcePreloader::ResourcePreloader() {