mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-19 18:32:35 +01:00
Code Issues Releases Wiki Activity

Codechange: use std::string_view for the string setting defaults

Browse Source
This commit is contained in:
Rubidium
2025-05-01 17:47:47 +02:00
committed by rubidium42
parent 5c7b04a0c2
commit 5ca686261e
9 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings.cpp
View File

@@ -592,7 +592,7 @@ void StringSettingDesc::MakeValueValid(std::string &str) const
* @param object The object the setting is to be saved in.
* @param str The string to save.
*/
void StringSettingDesc::Write(const void *object, const std::string &str) const
void StringSettingDesc::Write(const void *object, std::string_view str) const
{
reinterpret_cast<std::string *>(GetVariableAddress(object, this->save))->assign(str);
}
@@ -665,7 +665,7 @@ void IntSettingDesc::ParseValue(const IniItem *item, void *object) const
void StringSettingDesc::ParseValue(const IniItem *item, void *object) const
{
std::string str = (item == nullptr) ? this->def : item->value.value_or("");
std::string str{(item == nullptr) ? this->def : item->value.value_or("")};
this->MakeValueValid(str);
this->Write(object, str);
}
@@ -675,7 +675,7 @@ void ListSettingDesc::ParseValue(const IniItem *item, void *object) const
std::optional<std::string_view> str;
if (item != nullptr) {
str = item->value;
} else if (this->def != nullptr) {
} else if (!this->def.empty()) {
str = this->def;
}
void *ptr = GetVariableAddress(object, this->save);