Use range iterators for RBSet in most cases

5 files changed, 51 insertions, 51 deletions

diff --git a/scene/resources/concave_polygon_shape_3d.cpp b/scene/resources/concave_polygon_shape_3d.cpp
index ab2c1da327..081271c2fc 100644
--- a/scene/resources/concave_polygon_shape_3d.cpp
+++ b/scene/resources/concave_polygon_shape_3d.cpp
@@ -50,9 +50,9 @@ Vector<Vector3> ConcavePolygonShape3D::get_debug_mesh_lines() const {
 	Vector<Vector3> points;
 	points.resize(edges.size() * 2);
 	int idx = 0;
-	for (RBSet<DrawEdge>::Element *E = edges.front(); E; E = E->next()) {
-		points.write[idx + 0] = E->get().a;
-		points.write[idx + 1] = E->get().b;
+	for (const DrawEdge &E : edges) {
+		points.write[idx + 0] = E.a;
+		points.write[idx + 1] = E.b;
 		idx += 2;
 	}
 
diff --git a/scene/resources/polygon_path_finder.cpp b/scene/resources/polygon_path_finder.cpp
index 155a8522cf..6b0c22d720 100644
--- a/scene/resources/polygon_path_finder.cpp
+++ b/scene/resources/polygon_path_finder.cpp
@@ -34,8 +34,8 @@
 bool PolygonPathFinder::_is_point_inside(const Vector2 &p_point) const {
 	int crosses = 0;
 
-	for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-		const Edge &e = E->get();
+	for (const Edge &E : edges) {
+		const Edge &e = E;
 
 		Vector2 a = points[e.points[0]].pos;
 		Vector2 b = points[e.points[1]].pos;
@@ -105,8 +105,8 @@ void PolygonPathFinder::setup(const Vector<Vector2> &p_points, const Vector<int>
 
 			bool valid = true;
 
-			for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-				const Edge &e = E->get();
+			for (const Edge &E : edges) {
+				const Edge &e = E;
 				if (e.points[0] == i || e.points[1] == i || e.points[0] == j || e.points[1] == j) {
 					continue;
 				}
@@ -140,8 +140,8 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 		float closest_dist = 1e20f;
 		Vector2 closest_point;
 
-		for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-			const Edge &e = E->get();
+		for (const Edge &E : edges) {
+			const Edge &e = E;
 			Vector2 seg[2] = {
 				points[e.points[0]].pos,
 				points[e.points[1]].pos
@@ -151,7 +151,7 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 			float d = from.distance_squared_to(closest);
 
 			if (d < closest_dist) {
-				ignore_from_edge = E->get();
+				ignore_from_edge = E;
 				closest_dist = d;
 				closest_point = closest;
 			}
@@ -164,8 +164,8 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 		float closest_dist = 1e20f;
 		Vector2 closest_point;
 
-		for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-			const Edge &e = E->get();
+		for (const Edge &E : edges) {
+			const Edge &e = E;
 			Vector2 seg[2] = {
 				points[e.points[0]].pos,
 				points[e.points[1]].pos
@@ -175,7 +175,7 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 			float d = to.distance_squared_to(closest);
 
 			if (d < closest_dist) {
-				ignore_to_edge = E->get();
+				ignore_to_edge = E;
 				closest_dist = d;
 				closest_point = closest;
 			}
@@ -188,8 +188,8 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 	{
 		bool can_see_eachother = true;
 
-		for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-			const Edge &e = E->get();
+		for (const Edge &E : edges) {
+			const Edge &e = E;
 			if (e.points[0] == ignore_from_edge.points[0] && e.points[1] == ignore_from_edge.points[1]) {
 				continue;
 			}
@@ -240,8 +240,8 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 			valid_b = false;
 		}
 
-		for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-			const Edge &e = E->get();
+		for (const Edge &E : edges) {
+			const Edge &e = E;
 
 			if (e.points[0] == i || e.points[1] == i) {
 				continue;
@@ -293,10 +293,10 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 
 	points.write[aidx].distance = 0;
 	points.write[aidx].prev = aidx;
-	for (RBSet<int>::Element *E = points[aidx].connections.front(); E; E = E->next()) {
-		open_list.insert(E->get());
-		points.write[E->get()].distance = from.distance_to(points[E->get()].pos);
-		points.write[E->get()].prev = aidx;
+	for (const int &E : points[aidx].connections) {
+		open_list.insert(E);
+		points.write[E].distance = from.distance_to(points[E].pos);
+		points.write[E].prev = aidx;
 	}
 
 	bool found_route = false;
@@ -312,14 +312,14 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 		float least_cost = 1e30;
 
 		//this could be faster (cache previous results)
-		for (RBSet<int>::Element *E = open_list.front(); E; E = E->next()) {
-			const Point &p = points[E->get()];
+		for (const int &E : open_list) {
+			const Point &p = points[E];
 			float cost = p.distance;
 			cost += p.pos.distance_to(to);
 			cost += p.penalty;
 
 			if (cost < least_cost) {
-				least_cost_point = E->get();
+				least_cost_point = E;
 				least_cost = cost;
 			}
 		}
@@ -327,8 +327,8 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 		const Point &np = points[least_cost_point];
 		//open the neighbours for search
 
-		for (RBSet<int>::Element *E = np.connections.front(); E; E = E->next()) {
-			Point &p = points.write[E->get()];
+		for (const int &E : np.connections) {
+			Point &p = points.write[E];
 			float distance = np.pos.distance_to(p.pos) + np.distance;
 
 			if (p.prev != -1) {
@@ -343,9 +343,9 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 
 				p.prev = least_cost_point;
 				p.distance = distance;
-				open_list.insert(E->get());
+				open_list.insert(E);
 
-				if (E->get() == bidx) {
+				if (E == bidx) {
 					//oh my reached end! stop algorithm
 					found_route = true;
 					break;
@@ -459,8 +459,8 @@ Dictionary PolygonPathFinder::_get_data() const {
 			{
 				int *cw = c.ptrw();
 				int idx = 0;
-				for (RBSet<int>::Element *E = points[i].connections.front(); E; E = E->next()) {
-					cw[idx++] = E->get();
+				for (const int &E : points[i].connections) {
+					cw[idx++] = E;
 				}
 			}
 			connections[i] = c;
@@ -469,9 +469,9 @@ Dictionary PolygonPathFinder::_get_data() const {
 	{
 		int *iw = ind.ptrw();
 		int idx = 0;
-		for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-			iw[idx++] = E->get().points[0];
-			iw[idx++] = E->get().points[1];
+		for (const Edge &E : edges) {
+			iw[idx++] = E.points[0];
+			iw[idx++] = E.points[1];
 		}
 	}
 
@@ -492,8 +492,8 @@ Vector2 PolygonPathFinder::get_closest_point(const Vector2 &p_point) const {
 	float closest_dist = 1e20f;
 	Vector2 closest_point;
 
-	for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-		const Edge &e = E->get();
+	for (const Edge &E : edges) {
+		const Edge &e = E;
 		Vector2 seg[2] = {
 			points[e.points[0]].pos,
 			points[e.points[1]].pos
@@ -516,9 +516,9 @@ Vector2 PolygonPathFinder::get_closest_point(const Vector2 &p_point) const {
 Vector<Vector2> PolygonPathFinder::get_intersections(const Vector2 &p_from, const Vector2 &p_to) const {
 	Vector<Vector2> inters;
 
-	for (RBSet<Edge>::Element *E = edges.front(); E; E = E->next()) {
-		Vector2 a = points[E->get().points[0]].pos;
-		Vector2 b = points[E->get().points[1]].pos;
+	for (const Edge &E : edges) {
+		Vector2 a = points[E.points[0]].pos;
+		Vector2 b = points[E.points[1]].pos;
 
 		Vector2 res;
 		if (Geometry2D::segment_intersects_segment(a, b, p_from, p_to, &res)) {
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index e65763ba2e..2981f38766 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -1307,8 +1307,8 @@ void Theme::get_type_list(List<StringName> *p_list) const {
 		types.insert(E.key);
 	}
 
-	for (RBSet<StringName>::Element *E = types.front(); E; E = E->next()) {
-		p_list->push_back(E->get());
+	for (const StringName &E : types) {
+		p_list->push_back(E);
 	}
 }
 
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp
index cee3f85c32..e22b8efaae 100644
--- a/scene/resources/tile_set.cpp
+++ b/scene/resources/tile_set.cpp
@@ -1369,12 +1369,12 @@ TileMapCell TileSet::get_random_tile_from_terrains_pattern(int p_terrain_set, Ti
 	// Count the sum of probabilities.
 	double sum = 0.0;
 	RBSet<TileMapCell> set = per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern];
-	for (RBSet<TileMapCell>::Element *E = set.front(); E; E = E->next()) {
-		if (E->get().source_id >= 0) {
-			Ref<TileSetSource> source = sources[E->get().source_id];
+	for (const TileMapCell &E : set) {
+		if (E.source_id >= 0) {
+			Ref<TileSetSource> source = sources[E.source_id];
 			Ref<TileSetAtlasSource> atlas_source = source;
 			if (atlas_source.is_valid()) {
-				TileData *tile_data = atlas_source->get_tile_data(E->get().get_atlas_coords(), E->get().alternative_tile);
+				TileData *tile_data = atlas_source->get_tile_data(E.get_atlas_coords(), E.alternative_tile);
 				sum += tile_data->get_probability();
 			} else {
 				sum += 1.0;
@@ -1389,13 +1389,13 @@ TileMapCell TileSet::get_random_tile_from_terrains_pattern(int p_terrain_set, Ti
 	double picked = Math::random(0.0, sum);
 
 	// Pick the tile.
-	for (RBSet<TileMapCell>::Element *E = set.front(); E; E = E->next()) {
-		if (E->get().source_id >= 0) {
-			Ref<TileSetSource> source = sources[E->get().source_id];
+	for (const TileMapCell &E : set) {
+		if (E.source_id >= 0) {
+			Ref<TileSetSource> source = sources[E.source_id];
 
 			Ref<TileSetAtlasSource> atlas_source = source;
 			if (atlas_source.is_valid()) {
-				TileData *tile_data = atlas_source->get_tile_data(E->get().get_atlas_coords(), E->get().alternative_tile);
+				TileData *tile_data = atlas_source->get_tile_data(E.get_atlas_coords(), E.alternative_tile);
 				count += tile_data->get_probability();
 			} else {
 				count += 1.0;
@@ -1405,7 +1405,7 @@ TileMapCell TileSet::get_random_tile_from_terrains_pattern(int p_terrain_set, Ti
 		}
 
 		if (count >= picked) {
-			return E->get();
+			return E;
 		}
 	}
 
diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp
index 3281ebb2f6..d361aa876b 100644
--- a/scene/resources/visual_shader.cpp
+++ b/scene/resources/visual_shader.cpp
@@ -1579,8 +1579,8 @@ void VisualShader::_get_property_list(List<PropertyInfo> *p_list) const {
 		p_list->push_back(PropertyInfo(Variant::INT, vformat("%s/%s", PNAME("modes"), E.key), PROPERTY_HINT_ENUM, E.value));
 	}
 
-	for (RBSet<String>::Element *E = toggles.front(); E; E = E->next()) {
-		p_list->push_back(PropertyInfo(Variant::BOOL, vformat("%s/%s", PNAME("flags"), E->get())));
+	for (const String &E : toggles) {
+		p_list->push_back(PropertyInfo(Variant::BOOL, vformat("%s/%s", PNAME("flags"), E)));
 	}
 
 	for (const KeyValue<String, Varying> &E : varyings) {