cpp/openttd-patchpack/source Changeset - r23961:d62b62a4184a

Changeset - r23961:d62b62a4184a

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

glx - 5 years ago 2019-12-16 17:01:57
glx@openttd.org

Codechange: Replace FOR_ALL_GROUPS with range-based for loops

8 files changed with 18 insertions and 41 deletions:

src/company_cmd.cpp

src/company_gui.cpp

src/economy.cpp

src/group.h

src/group_cmd.cpp

src/group_gui.cpp

src/saveload/group_sl.cpp

src/script/api/script_grouplist.cpp

0 comments (0 inline, 0 general)

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -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;

src/company_gui.cpp

➞

Show inline comments

@@ @@ -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));

src/economy.cpp

➞

Show inline comments

@@ @@ -410,8 +410,7 @@ void ChangeOwnershipOfCompanyItems(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;
+		}
+	}

src/group.h

➞

Show inline comments

@@ @@ -95,9 +95,6 @@ static inline bool IsAllGroupID(GroupID @@
 	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);

src/group_cmd.cpp

➞

Show inline comments

@@ @@ -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 til @@
 	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(Gr @@
+{
 	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 compan @@
+{
 	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 compan @@
 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 compan @@
 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 @@
 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 c @@
 void RemoveAllGroupsForCompany(const CompanyID company)
+{
 	Group *g;
 	FOR_ALL_GROUPS(g) {
 	for (Group *g : Group::Iterate()) {
 		if (company == g->owner) delete g;
+	}
+}

src/group_gui.cpp

➞

Show inline comments

@@ @@ -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);
+			}

src/saveload/group_sl.cpp

➞

Show inline comments

@@ @@ -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);
+	}

src/script/api/script_grouplist.cpp

➞

Show inline comments

@@ @@ -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);
+	}
+}

0 comments (0 inline, 0 general)