1 files changed, 27 insertions, 29 deletions

diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp
index 062b221c84..b5ba1899ec 100644
--- a/scene/main/instance_placeholder.cpp
+++ b/scene/main/instance_placeholder.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 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       */
@@ -34,7 +34,6 @@
 #include "scene/resources/packed_scene.h"
 
 bool InstancePlaceholder::_set(const StringName &p_name, const Variant &p_value) {
-
 	PropSet ps;
 	ps.name = p_name;
 	ps.value = p_value;
@@ -43,10 +42,9 @@ bool InstancePlaceholder::_set(const StringName &p_name, const Variant &p_value)
 }
 
 bool InstancePlaceholder::_get(const StringName &p_name, Variant &r_ret) const {
-
-	for (const List<PropSet>::Element *E = stored_values.front(); E; E = E->next()) {
-		if (E->get().name == p_name) {
-			r_ret = E->get().value;
+	for (const PropSet &E : stored_values) {
+		if (E.name == p_name) {
+			r_ret = E.value;
 			return true;
 		}
 	}
@@ -54,11 +52,10 @@ bool InstancePlaceholder::_get(const StringName &p_name, Variant &r_ret) const {
 }
 
 void InstancePlaceholder::_get_property_list(List<PropertyInfo> *p_list) const {
-
-	for (const List<PropSet>::Element *E = stored_values.front(); E; E = E->next()) {
+	for (const PropSet &E : stored_values) {
 		PropertyInfo pi;
-		pi.name = E->get().name;
-		pi.type = E->get().value.get_type();
+		pi.name = E.name;
+		pi.type = E.value.get_type();
 		pi.usage = PROPERTY_USAGE_STORAGE;
 
 		p_list->push_back(pi);
@@ -66,39 +63,40 @@ void InstancePlaceholder::_get_property_list(List<PropertyInfo> *p_list) const {
 }
 
 void InstancePlaceholder::set_instance_path(const String &p_name) {
-
 	path = p_name;
 }
 
 String InstancePlaceholder::get_instance_path() const {
-
 	return path;
 }
 
 Node *InstancePlaceholder::create_instance(bool p_replace, const Ref<PackedScene> &p_custom_scene) {
-
 	ERR_FAIL_COND_V(!is_inside_tree(), nullptr);
 
 	Node *base = get_parent();
-	if (!base)
+	if (!base) {
 		return nullptr;
+	}
 
 	Ref<PackedScene> ps;
-	if (p_custom_scene.is_valid())
+	if (p_custom_scene.is_valid()) {
 		ps = p_custom_scene;
-	else
+	} else {
 		ps = ResourceLoader::load(path, "PackedScene");
+	}
 
-	if (!ps.is_valid())
+	if (!ps.is_valid()) {
 		return nullptr;
-	Node *scene = ps->instance();
-	if (!scene)
+	}
+	Node *scene = ps->instantiate();
+	if (!scene) {
 		return nullptr;
+	}
 	scene->set_name(get_name());
 	int pos = get_index();
 
-	for (List<PropSet>::Element *E = stored_values.front(); E; E = E->next()) {
-		scene->set(E->get().name, E->get().value);
+	for (const PropSet &E : stored_values) {
+		scene->set(E.name, E.value);
 	}
 
 	if (p_replace) {
@@ -113,24 +111,24 @@ Node *InstancePlaceholder::create_instance(bool p_replace, const Ref<PackedScene
 }
 
 Dictionary InstancePlaceholder::get_stored_values(bool p_with_order) {
-
 	Dictionary ret;
 	PackedStringArray order;
 
-	for (List<PropSet>::Element *E = stored_values.front(); E; E = E->next()) {
-		ret[E->get().name] = E->get().value;
-		if (p_with_order)
-			order.push_back(E->get().name);
+	for (const PropSet &E : stored_values) {
+		ret[E.name] = E.value;
+		if (p_with_order) {
+			order.push_back(E.name);
+		}
 	};
 
-	if (p_with_order)
+	if (p_with_order) {
 		ret[".order"] = order;
+	}
 
 	return ret;
 };
 
 void InstancePlaceholder::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("get_stored_values", "with_order"), &InstancePlaceholder::get_stored_values, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("create_instance", "replace", "custom_scene"), &InstancePlaceholder::create_instance, DEFVAL(false), DEFVAL(Variant()));
 	ClassDB::bind_method(D_METHOD("get_instance_path"), &InstancePlaceholder::get_instance_path);