From 40fa45a76a60912aaadf45814317e1643321441c Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter1138@openttd.org>
Date: Sat, 20 Apr 2024 02:48:56 +0100
Subject: [PATCH] Codechange: Emplace std::pair into vectors.

This creates the pair in the vector, instead of creating it then copying it in.
---
 src/league_gui.cpp                  | 2 +-
 src/linkgraph/linkgraph_gui.cpp     | 2 +-
 src/misc/lrucache.hpp               | 2 +-
 src/station_cmd.cpp                 | 4 ++--
 src/town_cmd.cpp                    | 2 +-
 src/viewport.cpp                    | 2 +-
 src/viewport_sprite_sorter_sse4.cpp | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/league_gui.cpp b/src/league_gui.cpp
index 58b36c213b..60af81e972 100644
--- a/src/league_gui.cpp
+++ b/src/league_gui.cpp
@@ -293,7 +293,7 @@ private:
 		for (uint i = 0; i != elements.size(); i++) {
 			auto *lte = elements[i];
 			if (i > 0 && elements[i - 1]->rating != lte->rating) rank = i;
-			this->rows.emplace_back(std::make_pair(rank, lte));
+			this->rows.emplace_back(rank, lte);
 		}
 	}
 
diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp
index c065711504..937f24509c 100644
--- a/src/linkgraph/linkgraph_gui.cpp
+++ b/src/linkgraph/linkgraph_gui.cpp
@@ -113,7 +113,7 @@ void LinkGraphOverlay::RebuildCache()
 			}
 		}
 		if (this->IsPointVisible(pta, &dpi)) {
-			this->cached_stations.push_back(std::make_pair(from, supply));
+			this->cached_stations.emplace_back(from, supply);
 		}
 	}
 }
diff --git a/src/misc/lrucache.hpp b/src/misc/lrucache.hpp
index 3adedbefd4..0ff9db663a 100644
--- a/src/misc/lrucache.hpp
+++ b/src/misc/lrucache.hpp
@@ -71,7 +71,7 @@ public:
 			}
 
 			/* Insert new item. */
-			this->data.push_front(std::make_pair(key, item));
+			this->data.emplace_front(key, item);
 			this->lookup.emplace(key, this->data.begin());
 		}
 
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index e807e8d9b1..dd32c4f006 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -4225,9 +4225,9 @@ uint MoveGoodsToStation(CargoID type, uint amount, SourceType source_type, Sourc
 		}
 		if (used_stations.empty()) {
 			used_stations.reserve(2);
-			used_stations.emplace_back(std::make_pair(first_station, 0));
+			used_stations.emplace_back(first_station, 0);
 		}
-		used_stations.emplace_back(std::make_pair(st, 0));
+		used_stations.emplace_back(st, 0);
 	}
 
 	/* no stations around at all? */
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 7a5d9221a1..2fae67fc47 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -2717,7 +2717,7 @@ static bool BuildTownHouse(Town *t, TileIndex tile)
 
 		uint cur_prob = hs.probability;
 		probability_max += cur_prob;
-		probs.emplace_back(std::make_pair(hs.Index(), cur_prob));
+		probs.emplace_back(hs.Index(), cur_prob);
 	}
 
 	TileIndex baseTile = tile;
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 8110bc4224..8a19f56ae0 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1545,7 +1545,7 @@ static void ViewportSortParentSprites(ParentSpriteToSortVector *psdv)
 
 	/* Initialize sprite list and order. */
 	for (auto p = psdv->rbegin(); p != psdv->rend(); p++) {
-		sprite_list.push_front(std::make_pair((*p)->xmin + (*p)->ymin, *p));
+		sprite_list.emplace_front((*p)->xmin + (*p)->ymin, *p);
 		sprite_order.push(*p);
 		(*p)->order = next_order++;
 	}
diff --git a/src/viewport_sprite_sorter_sse4.cpp b/src/viewport_sprite_sorter_sse4.cpp
index 3c868d2a09..4f7de754ff 100644
--- a/src/viewport_sprite_sorter_sse4.cpp
+++ b/src/viewport_sprite_sorter_sse4.cpp
@@ -48,7 +48,7 @@ void ViewportSortParentSpritesSSE41(ParentSpriteToSortVector *psdv)
 
 	/* Initialize sprite list and order. */
 	for (auto p = psdv->rbegin(); p != psdv->rend(); p++) {
-		sprite_list.push_front(std::make_pair((*p)->xmin + (*p)->ymin, *p));
+		sprite_list.emplace_front((*p)->xmin + (*p)->ymin, *p);
 		sprite_order.push(*p);
 		(*p)->order = next_order++;
 	}