Merge pull request #50511 from aaronfranke/iterators

Use C++ range iterators for Lists in many situations

1 files changed, 2 insertions, 5 deletions

diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
index 4cd2915ffa..dbb8dc8283 100644
--- a/core/string/ustring.cpp
+++ b/core/string/ustring.cpp
@@ -3421,11 +3421,8 @@ String String::format(const Variant &values, String placeholder) const {
 		List<Variant> keys;
 		d.get_key_list(&keys);
 
-		for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
-			String key = E->get();
-			String val = d[E->get()];
-
-			new_string = new_string.replace(placeholder.replace("_", key), val);
+		for (Variant &key : keys) {
+			new_string = new_string.replace(placeholder.replace("_", key), d[key]);
 		}
 	} else {
 		ERR_PRINT(String("Invalid type: use Array or Dictionary.").ascii().get_data());