Codechange: Replace FOR_ALL_GROUPS with range-based for loops

8 files changed, 18 insertions, 41 deletions

diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 97be03fa9..4fa8eced2 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -517,8 +517,7 @@ void ResetCompanyLivery(Company *c)
 		c->livery[scheme].colour2 = c->colour;
 	}
 
-	Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (Group *g : Group::Iterate()) {
 		if (g->owner == c->index) {
 			g->livery.in_use  = 0;
 			g->livery.colour1 = c->colour;
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 92c6ccb53..423efcb01 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -658,8 +658,7 @@ private:
 			GUIGroupList list;
 			VehicleType vtype = (VehicleType)(this->livery_class - LC_GROUP_RAIL);
 
-			const Group *g;
-			FOR_ALL_GROUPS(g) {
+			for (const Group *g : Group::Iterate()) {
 				if (g->owner == owner && g->vehicle_type == vtype) {
 					list.push_back(g);
 				}
@@ -750,8 +749,7 @@ public:
 				}
 
 				/* And group names */
-				const Group *g;
-				FOR_ALL_GROUPS(g) {
+				for (const Group *g : Group::Iterate()) {
 					if (g->owner == (CompanyID)this->window_number) {
 						SetDParam(0, g->index);
 						d = maxdim(d, GetStringBoundingBox(STR_GROUP_NAME));
diff --git a/src/economy.cpp b/src/economy.cpp
index b0e723c57..9250cd930 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -410,8 +410,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 	if (new_owner == INVALID_OWNER) {
 		RemoveAllGroupsForCompany(old_owner);
 	} else {
-		Group *g;
-		FOR_ALL_GROUPS(g) {
+		for (Group *g : Group::Iterate()) {
 			if (g->owner == old_owner) g->owner = new_owner;
 		}
 	}
diff --git a/src/group.h b/src/group.h
index 58d9bc53f..aeb7f581a 100644
--- a/src/group.h
+++ b/src/group.h
@@ -95,9 +95,6 @@ static inline bool IsAllGroupID(GroupID id_g)
 	return id_g == ALL_GROUP;
 }
 
-#define FOR_ALL_GROUPS_FROM(var, start) FOR_ALL_ITEMS_FROM(Group, group_index, var, start)
-#define FOR_ALL_GROUPS(var) FOR_ALL_GROUPS_FROM(var, 0)
-
 
 uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e);
 uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type);
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index e16d03620..a13cd5f38 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -109,8 +109,7 @@ void GroupStatistics::Clear()
 	}
 
 	/* Recalculate */
-	Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (Group *g : Group::Iterate()) {
 		g->statistics.Clear();
 	}
 
@@ -190,8 +189,7 @@ void GroupStatistics::Clear()
 	}
 
 	/* Recalculate */
-	Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (Group *g : Group::Iterate()) {
 		g->statistics.ClearProfits();
 	}
 
@@ -215,8 +213,7 @@ void GroupStatistics::Clear()
 	}
 
 	/* Recalculate */
-	Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (Group *g : Group::Iterate()) {
 		if (g->owner != company) continue;
 		g->statistics.ClearAutoreplace();
 	}
@@ -280,8 +277,7 @@ void PropagateChildLivery(const Group *g)
 		}
 	}
 
-	Group *cg;
-	FOR_ALL_GROUPS(cg) {
+	for (Group *cg : Group::Iterate()) {
 		if (cg->parent == g->index) {
 			if (!HasBit(cg->livery.in_use, 0)) cg->livery.colour1 = g->livery.colour1;
 			if (!HasBit(cg->livery.in_use, 1)) cg->livery.colour2 = g->livery.colour2;
@@ -370,8 +366,7 @@ CommandCost CmdDeleteGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 	DoCommand(0, p1, 0, flags, CMD_REMOVE_ALL_VEHICLES_GROUP);
 
 	/* Delete sub-groups */
-	Group *gp;
-	FOR_ALL_GROUPS(gp) {
+	for (const Group *gp : Group::Iterate()) {
 		if (gp->parent == g->index) {
 			DoCommand(0, gp->index, 0, flags, CMD_DELETE_GROUP);
 		}
@@ -683,8 +678,7 @@ static void SetGroupReplaceProtection(Group *g, bool protect)
 {
 	g->replace_protection = protect;
 
-	Group *pg;
-	FOR_ALL_GROUPS(pg) {
+	for (Group *pg : Group::Iterate()) {
 		if (pg->parent == g->index) SetGroupReplaceProtection(pg, protect);
 	}
 }
@@ -797,8 +791,7 @@ uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e)
 {
 	uint count = 0;
 	const Engine *e = Engine::Get(id_e);
-	const Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (const Group *g : Group::Iterate()) {
 		if (g->parent == id_g) count += GetGroupNumEngines(company, g->index, id_e);
 	}
 	return count + GroupStatistics::Get(company, id_g, e->type).num_engines[id_e];
@@ -815,8 +808,7 @@ uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e)
 uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type)
 {
 	uint count = 0;
-	const Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (const Group *g : Group::Iterate()) {
 		if (g->parent == id_g) count += GetGroupNumVehicle(company, g->index, type);
 	}
 	return count + GroupStatistics::Get(company, id_g, type).num_vehicle;
@@ -833,8 +825,7 @@ uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type)
 uint GetGroupNumProfitVehicle(CompanyID company, GroupID id_g, VehicleType type)
 {
 	uint count = 0;
-	const Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (const Group *g : Group::Iterate()) {
 		if (g->parent == id_g) count += GetGroupNumProfitVehicle(company, g->index, type);
 	}
 	return count + GroupStatistics::Get(company, id_g, type).num_profit_vehicle;
@@ -851,8 +842,7 @@ uint GetGroupNumProfitVehicle(CompanyID company, GroupID id_g, VehicleType type)
 Money GetGroupProfitLastYear(CompanyID company, GroupID id_g, VehicleType type)
 {
 	Money sum = 0;
-	const Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (const Group *g : Group::Iterate()) {
 		if (g->parent == id_g) sum += GetGroupProfitLastYear(company, g->index, type);
 	}
 	return sum + GroupStatistics::Get(company, id_g, type).profit_last_year;
@@ -860,9 +850,7 @@ Money GetGroupProfitLastYear(CompanyID company, GroupID id_g, VehicleType type)
 
 void RemoveAllGroupsForCompany(const CompanyID company)
 {
-	Group *g;
-
-	FOR_ALL_GROUPS(g) {
+	for (Group *g : Group::Iterate()) {
 		if (company == g->owner) delete g;
 	}
 }
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index b65543375..256c85ba4 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -178,8 +178,7 @@ private:
 
 		GUIGroupList list;
 
-		const Group *g;
-		FOR_ALL_GROUPS(g) {
+		for (const Group *g : Group::Iterate()) {
 			if (g->owner == owner && g->vehicle_type == this->vli.vtype) {
 				list.push_back(g);
 			}
diff --git a/src/saveload/group_sl.cpp b/src/saveload/group_sl.cpp
index 16ef117ef..33c63ee44 100644
--- a/src/saveload/group_sl.cpp
+++ b/src/saveload/group_sl.cpp
@@ -31,9 +31,7 @@ static const SaveLoad _group_desc[] = {
 
 static void Save_GRPS()
 {
-	Group *g;
-
-	FOR_ALL_GROUPS(g) {
+	for (Group *g : Group::Iterate()) {
 		SlSetArrayIndex(g->index);
 		SlObject(g, _group_desc);
 	}
diff --git a/src/script/api/script_grouplist.cpp b/src/script/api/script_grouplist.cpp
index 2a99caf33..569b44634 100644
--- a/src/script/api/script_grouplist.cpp
+++ b/src/script/api/script_grouplist.cpp
@@ -15,8 +15,7 @@
 
 ScriptGroupList::ScriptGroupList()
 {
-	Group *g;
-	FOR_ALL_GROUPS(g) {
+	for (const Group *g : Group::Iterate()) {
 		if (g->owner == ScriptObject::GetCompany()) this->AddItem(g->index);
 	}
 }