From 92299989bd10fd9855b6d77bc2bfabae218d1eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 26 Jul 2021 17:50:35 +0200
Subject: Use Ref<T> references as iterators where relevant

And const when possible.
---
 modules/gdscript/gdscript.cpp              | 28 ++++++++++++++--------------
 modules/mono/csharp_script.cpp             | 10 +++++-----
 modules/webrtc/webrtc_multiplayer_peer.cpp | 10 +++++-----
 modules/websocket/wsl_server.cpp           |  4 ++--
 4 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'modules')

diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index bcb53508ea..8957b00a1b 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -1804,10 +1804,10 @@ void GDScriptLanguage::reload_all_scripts() {
 
 	scripts.sort_custom<GDScriptDepSort>(); //update in inheritance dependency order
 
-	for (Ref<GDScript> E : scripts) {
-		print_verbose("GDScript: Reloading: " + E->get_path());
-		E->load_source_code(E->get_path());
-		E->reload(true);
+	for (Ref<GDScript> &script : scripts) {
+		print_verbose("GDScript: Reloading: " + script->get_path());
+		script->load_source_code(script->get_path());
+		script->reload(true);
 	}
 #endif
 }
@@ -1836,21 +1836,21 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 
 	scripts.sort_custom<GDScriptDepSort>(); //update in inheritance dependency order
 
-	for (Ref<GDScript> E : scripts) {
-		bool reload = E == p_script || to_reload.has(E->get_base());
+	for (Ref<GDScript> &script : scripts) {
+		bool reload = script == p_script || to_reload.has(script->get_base());
 
 		if (!reload) {
 			continue;
 		}
 
-		to_reload.insert(E, Map<ObjectID, List<Pair<StringName, Variant>>>());
+		to_reload.insert(script, Map<ObjectID, List<Pair<StringName, Variant>>>());
 
 		if (!p_soft_reload) {
 			//save state and remove script from instances
-			Map<ObjectID, List<Pair<StringName, Variant>>> &map = to_reload[E];
+			Map<ObjectID, List<Pair<StringName, Variant>>> &map = to_reload[script];
 
-			while (E->instances.front()) {
-				Object *obj = E->instances.front()->get();
+			while (script->instances.front()) {
+				Object *obj = script->instances.front()->get();
 				//save instance info
 				List<Pair<StringName, Variant>> state;
 				if (obj->get_script_instance()) {
@@ -1863,8 +1863,8 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 //same thing for placeholders
 #ifdef TOOLS_ENABLED
 
-			while (E->placeholders.size()) {
-				Object *obj = E->placeholders.front()->get()->get_owner();
+			while (script->placeholders.size()) {
+				Object *obj = script->placeholders.front()->get()->get_owner();
 
 				//save instance info
 				if (obj->get_script_instance()) {
@@ -1874,13 +1874,13 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 					obj->set_script(Variant());
 				} else {
 					// no instance found. Let's remove it so we don't loop forever
-					E->placeholders.erase(E->placeholders.front()->get());
+					script->placeholders.erase(script->placeholders.front()->get());
 				}
 			}
 
 #endif
 
-			for (Map<ObjectID, List<Pair<StringName, Variant>>>::Element *F = E->pending_reload_state.front(); F; F = F->next()) {
+			for (Map<ObjectID, List<Pair<StringName, Variant>>>::Element *F = script->pending_reload_state.front(); F; F = F->next()) {
 				map[F->key()] = F->get(); //pending to reload, use this one instead
 			}
 		}
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index b52277974f..9e8b4d38bf 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -874,7 +874,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 
 	// As scripts are going to be reloaded, must proceed without locking here
 
-	for (Ref<CSharpScript> script : scripts) {
+	for (Ref<CSharpScript> &script : scripts) {
 		to_reload.push_back(script);
 
 		if (script->get_path().is_empty()) {
@@ -934,7 +934,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 	}
 
 	// After the state of all instances is saved, clear scripts and script instances
-	for (Ref<CSharpScript> script : scripts) {
+	for (Ref<CSharpScript> &script : scripts) {
 		while (script->instances.front()) {
 			Object *obj = script->instances.front()->get();
 			obj->set_script(REF()); // Remove script and existing script instances (placeholder are not removed before domain reload)
@@ -947,7 +947,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 	if (gdmono->reload_scripts_domain() != OK) {
 		// Failed to reload the scripts domain
 		// Make sure to add the scripts back to their owners before returning
-		for (Ref<CSharpScript> scr : to_reload) {
+		for (Ref<CSharpScript> &scr : to_reload) {
 			for (const Map<ObjectID, CSharpScript::StateBackup>::Element *F = scr->pending_reload_state.front(); F; F = F->next()) {
 				Object *obj = ObjectDB::get_instance(F->key());
 
@@ -982,7 +982,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 
 	List<Ref<CSharpScript>> to_reload_state;
 
-	for (Ref<CSharpScript> script : to_reload) {
+	for (Ref<CSharpScript> &script : to_reload) {
 #ifdef TOOLS_ENABLED
 		script->exports_invalidated = true;
 #endif
@@ -1087,7 +1087,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 		to_reload_state.push_back(script);
 	}
 
-	for (Ref<CSharpScript> script : to_reload_state) {
+	for (Ref<CSharpScript> &script : to_reload_state) {
 		for (Set<ObjectID>::Element *F = script->pending_reload_instances.front(); F; F = F->next()) {
 			ObjectID obj_id = F->get();
 			Object *obj = ObjectDB::get_instance(obj_id);
diff --git a/modules/webrtc/webrtc_multiplayer_peer.cpp b/modules/webrtc/webrtc_multiplayer_peer.cpp
index 77857255c1..9b08a26aed 100644
--- a/modules/webrtc/webrtc_multiplayer_peer.cpp
+++ b/modules/webrtc/webrtc_multiplayer_peer.cpp
@@ -154,7 +154,7 @@ void WebRTCMultiplayerPeer::_find_next_peer() {
 	}
 	// After last.
 	while (E) {
-		for (Ref<WebRTCDataChannel> F : E->get()->channels) {
+		for (const Ref<WebRTCDataChannel> &F : E->get()->channels) {
 			if (F->get_available_packet_count()) {
 				next_packet_peer = E->key();
 				return;
@@ -165,7 +165,7 @@ void WebRTCMultiplayerPeer::_find_next_peer() {
 	E = peer_map.front();
 	// Before last
 	while (E) {
-		for (Ref<WebRTCDataChannel> F : E->get()->channels) {
+		for (const Ref<WebRTCDataChannel> &F : E->get()->channels) {
 			if (F->get_available_packet_count()) {
 				next_packet_peer = E->key();
 				return;
@@ -213,7 +213,7 @@ int WebRTCMultiplayerPeer::get_unique_id() const {
 
 void WebRTCMultiplayerPeer::_peer_to_dict(Ref<ConnectedPeer> p_connected_peer, Dictionary &r_dict) {
 	Array channels;
-	for (Ref<WebRTCDataChannel> F : p_connected_peer->channels) {
+	for (Ref<WebRTCDataChannel> &F : p_connected_peer->channels) {
 		channels.push_back(F);
 	}
 	r_dict["connection"] = p_connected_peer->connection;
@@ -297,7 +297,7 @@ Error WebRTCMultiplayerPeer::get_packet(const uint8_t **r_buffer, int &r_buffer_
 		_find_next_peer();
 		ERR_FAIL_V(ERR_UNAVAILABLE);
 	}
-	for (Ref<WebRTCDataChannel> E : peer_map[next_packet_peer]->channels) {
+	for (Ref<WebRTCDataChannel> &E : peer_map[next_packet_peer]->channels) {
 		if (E->get_available_packet_count()) {
 			Error err = E->get_packet(r_buffer, r_buffer_size);
 			_find_next_peer();
@@ -357,7 +357,7 @@ int WebRTCMultiplayerPeer::get_available_packet_count() const {
 	}
 	int size = 0;
 	for (Map<int, Ref<ConnectedPeer>>::Element *E = peer_map.front(); E; E = E->next()) {
-		for (Ref<WebRTCDataChannel> F : E->get()->channels) {
+		for (const Ref<WebRTCDataChannel> &F : E->get()->channels) {
 			size += F->get_available_packet_count();
 		}
 	}
diff --git a/modules/websocket/wsl_server.cpp b/modules/websocket/wsl_server.cpp
index 1df001f86e..c6eb3d44b4 100644
--- a/modules/websocket/wsl_server.cpp
+++ b/modules/websocket/wsl_server.cpp
@@ -196,7 +196,7 @@ void WSLServer::poll() {
 	remove_ids.clear();
 
 	List<Ref<PendingPeer>> remove_peers;
-	for (Ref<PendingPeer> E : _pending) {
+	for (const Ref<PendingPeer> &E : _pending) {
 		String resource_name;
 		Ref<PendingPeer> ppeer = E;
 		Error err = ppeer->do_handshake(_protocols, handshake_timeout, resource_name);
@@ -224,7 +224,7 @@ void WSLServer::poll() {
 		remove_peers.push_back(ppeer);
 		_on_connect(id, ppeer->protocol, resource_name);
 	}
-	for (Ref<PendingPeer> E : remove_peers) {
+	for (const Ref<PendingPeer> &E : remove_peers) {
 		_pending.erase(E);
 	}
 	remove_peers.clear();
-- 
cgit v1.2.3