From a23dda7ffe9077a527ca05a30c00cbde27a4ded7 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 8 Mar 2025 20:42:02 +0100 Subject: [PATCH] Codechange: use const auto & instead of making a copy --- src/script/script_scanner.cpp | 2 +- src/settings.cpp | 2 +- src/survey.cpp | 2 +- src/tests/landscape_partial_pixel_z.cpp | 2 +- src/town_gui.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp index 3b722ccd20..f21ffa1dc5 100644 --- a/src/script/script_scanner.cpp +++ b/src/script/script_scanner.cpp @@ -205,7 +205,7 @@ static bool IsSameScript(const ContentInfo *ci, bool md5sum, ScriptInfo *info, S if (!md5sum) return true; ScriptFileChecksumCreator checksum(dir); - auto tar_filename = info->GetTarFile(); + const auto &tar_filename = info->GetTarFile(); TarList::iterator iter; if (!tar_filename.empty() && (iter = _tar_list[dir].find(tar_filename)) != _tar_list[dir].end()) { /* The main script is in a tar file, so find all files that diff --git a/src/settings.cpp b/src/settings.cpp index 5be008251c..6baf16c4f6 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -189,7 +189,7 @@ size_t OneOfManySettingDesc::ParseSingleValue(const char *str, size_t len, const if (isdigit(*str)) return std::strtoul(str, nullptr, 0); size_t idx = 0; - for (auto one : many) { + for (const auto &one : many) { if (one.size() == len && strncmp(one.c_str(), str, len) == 0) return idx; idx++; } diff --git a/src/survey.cpp b/src/survey.cpp index c282e56fa1..5e96a60a8d 100644 --- a/src/survey.cpp +++ b/src/survey.cpp @@ -146,7 +146,7 @@ static void SurveySettingsTable(nlohmann::json &survey, const SettingTable &tabl /* Skip any old settings we no longer save/load. */ if (!SlIsObjectCurrentlyValid(sd->save.version_from, sd->save.version_to)) continue; - auto name = sd->GetName(); + const auto &name = sd->GetName(); if (skip_if_default && sd->IsDefaultValue(object)) continue; survey[name] = sd->FormatValue(object); } diff --git a/src/tests/landscape_partial_pixel_z.cpp b/src/tests/landscape_partial_pixel_z.cpp index 7dc25bb083..ec8c8f79db 100644 --- a/src/tests/landscape_partial_pixel_z.cpp +++ b/src/tests/landscape_partial_pixel_z.cpp @@ -85,7 +85,7 @@ TEST_CASE("PartialPixelSlopeAdditionTest - A half tile steep slope is a one corn * @param expected The expect partial pixels Z values. * @return True iff at all GetPartialPixelZ results are the same as the expected Z-coordinates. */ -bool CheckPartialPixelZ(Slope slope, std::array expected) +bool CheckPartialPixelZ(Slope slope, const std::array &expected) { for (uint i = 0; i < expected.size(); i++) { int actual = GetPartialPixelZ(GB(i, 4, 4), GB(i, 0, 4), slope); diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 58d9019121..e556c1d6c4 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -1599,7 +1599,7 @@ public: { if (src.empty()) return src; - const auto specs = HouseSpec::Specs(); + const auto &specs = HouseSpec::Specs(); std::set dst; for (const auto &item : src) { if (item.grfid == 0) {