miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Pass unformatted strings from GetStringPtr as std::string_view. (#13871)

Browse Source
This commit is contained in:
frosch
2025-03-23 19:23:31 +01:00
committed by GitHub
parent 234c9fb3bd
commit 5aa4ad5135
8 changed files with 97 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/newgrf_config.cpp
View File

@@ -84,8 +84,8 @@ void GRFConfig::CopyParams(const GRFConfig &src)
*/
std::string GRFConfig::GetName() const
{
const char *name = GetGRFStringFromGRFText(this->name);
return StrEmpty(name) ? this->filename : name;
auto name = GetGRFStringFromGRFText(this->name);
return name.has_value() ? std::string(*name) : this->filename;
}
/**
@@ -94,9 +94,9 @@ std::string GRFConfig::GetName() const
*/
std::optional<std::string> GRFConfig::GetDescription() const
{
const char *str = GetGRFStringFromGRFText(this->info);
if (StrEmpty(str)) return std::nullopt;
return std::string(str);
auto str = GetGRFStringFromGRFText(this->info);
if (!str.has_value()) return std::nullopt;
return std::string(*str);
}
/**
@@ -105,9 +105,9 @@ std::optional<std::string> GRFConfig::GetDescription() const
*/
std::optional<std::string> GRFConfig::GetURL() const
{
const char *str = GetGRFStringFromGRFText(this->url);
if (StrEmpty(str)) return std::nullopt;
return std::string(str);
auto str = GetGRFStringFromGRFText(this->url);
if (!str.has_value()) return std::nullopt;
return std::string(*str);
}
/** Set the default value for all parameters as specified by action14. */