Codechange: Replace linkgraph related FOR_ALL with range-based for loops

3 files changed, 2 insertions, 8 deletions

diff --git a/src/linkgraph/linkgraph.h b/src/linkgraph/linkgraph.h
index 4995efd96..997d94623 100644
--- a/src/linkgraph/linkgraph.h
+++ b/src/linkgraph/linkgraph.h
@@ -534,6 +534,4 @@ protected:
 	EdgeMatrix edges;      ///< Edges in the component.
 };
 
-#define FOR_ALL_LINK_GRAPHS(var) FOR_ALL_ITEMS_FROM(LinkGraph, link_graph_index, var, 0)
-
 #endif /* LINKGRAPH_H */
diff --git a/src/linkgraph/linkgraphjob.h b/src/linkgraph/linkgraphjob.h
index 955ebefd3..9344ea246 100644
--- a/src/linkgraph/linkgraphjob.h
+++ b/src/linkgraph/linkgraphjob.h
@@ -334,8 +334,6 @@ public:
 	inline const LinkGraph &Graph() const { return this->link_graph; }
 };
 
-#define FOR_ALL_LINK_GRAPH_JOBS(var) FOR_ALL_ITEMS_FROM(LinkGraphJob, link_graph_job_index, var, 0)
-
 /**
  * A leg of a path in the link graph. Paths can form trees by being "forked".
  */
diff --git a/src/linkgraph/linkgraphschedule.cpp b/src/linkgraph/linkgraphschedule.cpp
index b1ee71f9a..964744509 100644
--- a/src/linkgraph/linkgraphschedule.cpp
+++ b/src/linkgraph/linkgraphschedule.cpp
@@ -107,10 +107,8 @@ void LinkGraphSchedule::SpawnAll()
  */
 void LinkGraphSchedule::ShiftDates(int interval)
 {
-	LinkGraph *lg;
-	FOR_ALL_LINK_GRAPHS(lg) lg->ShiftDates(interval);
-	LinkGraphJob *lgj;
-	FOR_ALL_LINK_GRAPH_JOBS(lgj) lgj->ShiftJoinDate(interval);
+	for (LinkGraph *lg : LinkGraph::Iterate()) lg->ShiftDates(interval);
+	for (LinkGraphJob *lgj : LinkGraphJob::Iterate()) lgj->ShiftJoinDate(interval);
 }
 
 /**