From 4f9a4cb4797bcd91d6b3cad0fdd93b0e09759c08 Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 21 Apr 2025 15:53:39 +0200 Subject: [PATCH] Codechange: Remove unnecessary string constructions. --- src/newgrf_gui.cpp | 2 +- src/strings.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index 6c206a93fe..b66f226697 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -260,7 +260,7 @@ struct NewGRFParametersWindow : public Window { auto it = std::ranges::lower_bound(par_info.value_names, value, std::less{}, &GRFParameterInfo::ValueName::first); if (it != std::end(par_info.value_names) && it->first == value) { - if (auto label = GetGRFStringFromGRFText(it->second); label.has_value()) return {STR_JUST_RAW_STRING, std::string(*label)}; + if (auto label = GetGRFStringFromGRFText(it->second); label.has_value()) return {STR_JUST_RAW_STRING, *label}; } return {STR_JUST_INT, value}; diff --git a/src/strings.cpp b/src/strings.cpp index d0d65f9d40..102f08d132 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -185,7 +185,7 @@ EncodedString EncodedString::ReplaceParam(size_t param, StringParameter &&data) } case SCC_ENCODED_STRING: { - params.emplace_back(std::string(record.Read(StringConsumer::npos))); + params.emplace_back(record.Read(StringConsumer::npos)); break; } @@ -1037,7 +1037,7 @@ static void DecodeEncodedString(StringConsumer &consumer, bool game_script, Stri } case SCC_ENCODED_STRING: { - sub_args.emplace_back(std::string(record.Read(StringConsumer::npos))); + sub_args.emplace_back(record.Read(StringConsumer::npos)); break; }