1 files changed, 18 insertions, 20 deletions

diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp
index 76fbee7490..113306fc8a 100644
--- a/editor/groups_editor.cpp
+++ b/editor/groups_editor.cpp
@@ -94,7 +94,7 @@ void GroupDialog::_load_nodes(Node *p_current) {
 
 		if (!_can_edit(p_current, selected_group)) {
 			node->set_selectable(0, false);
-			node->set_custom_color(0, groups->get_theme_color("disabled_font_color", "Editor"));
+			node->set_custom_color(0, groups->get_theme_color(SNAME("disabled_font_color"), SNAME("Editor")));
 		}
 	}
 
@@ -204,7 +204,7 @@ void GroupDialog::_add_group(String p_name) {
 
 	TreeItem *new_group = groups->create_item(groups_root);
 	new_group->set_text(0, name);
-	new_group->add_button(0, groups->get_theme_icon("Remove", "EditorIcons"), 0);
+	new_group->add_button(0, groups->get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), 0);
 	new_group->set_editable(0, true);
 	new_group->select(0);
 	groups->ensure_cursor_is_visible();
@@ -240,8 +240,7 @@ void GroupDialog::_group_renamed() {
 	List<Node *> nodes;
 	scene_tree->get_nodes_in_group(selected_group, &nodes);
 	bool removed_all = true;
-	for (List<Node *>::Element *E = nodes.front(); E; E = E->next()) {
-		Node *node = E->get();
+	for (Node *node : nodes) {
 		if (_can_edit(node, selected_group)) {
 			undo_redo->add_do_method(node, "remove_from_group", selected_group);
 			undo_redo->add_undo_method(node, "remove_from_group", name);
@@ -286,11 +285,11 @@ void GroupDialog::_load_groups(Node *p_current) {
 	List<Node::GroupInfo> gi;
 	p_current->get_groups(&gi);
 
-	for (List<Node::GroupInfo>::Element *E = gi.front(); E; E = E->next()) {
-		if (!E->get().persistent) {
+	for (const Node::GroupInfo &E : gi) {
+		if (!E.persistent) {
 			continue;
 		}
-		_add_group(E->get().name);
+		_add_group(E.name);
 	}
 
 	for (int i = 0; i < p_current->get_child_count(); i++) {
@@ -311,10 +310,10 @@ void GroupDialog::_delete_group_pressed(Object *p_item, int p_column, int p_id)
 	List<Node *> nodes;
 	scene_tree->get_nodes_in_group(name, &nodes);
 	bool removed_all = true;
-	for (List<Node *>::Element *E = nodes.front(); E; E = E->next()) {
-		if (_can_edit(E->get(), name)) {
-			undo_redo->add_do_method(E->get(), "remove_from_group", name);
-			undo_redo->add_undo_method(E->get(), "add_to_group", name, true);
+	for (Node *E : nodes) {
+		if (_can_edit(E, name)) {
+			undo_redo->add_do_method(E, "remove_from_group", name);
+			undo_redo->add_undo_method(E, "add_to_group", name, true);
 		} else {
 			removed_all = false;
 		}
@@ -365,16 +364,16 @@ void GroupDialog::_notification(int p_what) {
 		case Control::NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
 		case NOTIFICATION_ENTER_TREE: {
 			if (is_layout_rtl()) {
-				add_button->set_icon(groups->get_theme_icon("Back", "EditorIcons"));
-				remove_button->set_icon(groups->get_theme_icon("Forward", "EditorIcons"));
+				add_button->set_icon(groups->get_theme_icon(SNAME("Back"), SNAME("EditorIcons")));
+				remove_button->set_icon(groups->get_theme_icon(SNAME("Forward"), SNAME("EditorIcons")));
 			} else {
-				add_button->set_icon(groups->get_theme_icon("Forward", "EditorIcons"));
-				remove_button->set_icon(groups->get_theme_icon("Back", "EditorIcons"));
+				add_button->set_icon(groups->get_theme_icon(SNAME("Forward"), SNAME("EditorIcons")));
+				remove_button->set_icon(groups->get_theme_icon(SNAME("Back"), SNAME("EditorIcons")));
 			}
 
-			add_filter->set_right_icon(groups->get_theme_icon("Search", "EditorIcons"));
+			add_filter->set_right_icon(groups->get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
 			add_filter->set_clear_button_enabled(true);
-			remove_filter->set_right_icon(groups->get_theme_icon("Search", "EditorIcons"));
+			remove_filter->set_right_icon(groups->get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
 			remove_filter->set_clear_button_enabled(true);
 		} break;
 	}
@@ -628,8 +627,7 @@ void GroupsEditor::update_tree() {
 
 	TreeItem *root = tree->create_item();
 
-	for (List<GroupInfo>::Element *E = groups.front(); E; E = E->next()) {
-		Node::GroupInfo gi = E->get();
+	for (const GroupInfo &gi : groups) {
 		if (!gi.persistent) {
 			continue;
 		}
@@ -655,7 +653,7 @@ void GroupsEditor::update_tree() {
 		TreeItem *item = tree->create_item(root);
 		item->set_text(0, gi.name);
 		if (can_be_deleted) {
-			item->add_button(0, get_theme_icon("Remove", "EditorIcons"), 0);
+			item->add_button(0, get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), 0);
 		} else {
 			item->set_selectable(0, false);
 		}