mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use std::string_view to set string settings

pull/8505/merge
Rubidium 2025-04-21 22:36:40 +02:00 committed by rubidium42
parent fdb8defa64
commit b279bc37e7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings.cpp
View File

@ -1877,16 +1877,16 @@ void SyncCompanySettings()
* @param force_newgame force the newgame settings
* @note Strings WILL NOT be synced over the network
*/
bool SetSettingValue(const StringSettingDesc *sd, std::string value, bool force_newgame)
bool SetSettingValue(const StringSettingDesc *sd, std::string_view value, bool force_newgame)
{
assert(sd->flags.Test(SettingFlag::NoNetworkSync));
if (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ && value.compare("(null)") == 0) {
value.clear();
if (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ && value == "(null)") {
value = {};
}
const void *object = (_game_mode == GM_MENU || force_newgame) ? &_settings_newgame : &_settings_game;
sd->AsStringSetting()->ChangeValue(object, value);
sd->AsStringSetting()->ChangeValue(object, std::string{value});
return true;
}
@ -1896,7 +1896,7 @@ bool SetSettingValue(const StringSettingDesc *sd, std::string value, bool force_
* @param object The object the setting is in.
* @param newval The new value for the setting.
*/
void StringSettingDesc::ChangeValue(const void *object, std::string &newval) const
void StringSettingDesc::ChangeValue(const void *object, std::string &&newval) const
{
this->MakeValueValid(newval);
if (this->pre_check != nullptr && !this->pre_check(newval)) return;

4
src/settings_internal.h
View File

@ -334,7 +334,7 @@ struct StringSettingDesc : SettingDesc {
PostChangeCallback *post_callback; ///< Callback when the setting has been changed.
bool IsStringSetting() const override { return true; }
void ChangeValue(const void *object, std::string &newval) const;
void ChangeValue(const void *object, std::string &&newval) const;
std::string FormatValue(const void *object) const override;
void ParseValue(const IniItem *item, void *object) const override;
@ -392,7 +392,7 @@ const SettingDesc *GetSettingFromName(const std::string_view name);
void GetSaveLoadFromSettingTable(SettingTable settings, std::vector<SaveLoad> &saveloads);
SettingTable GetSaveLoadSettingTable();
bool SetSettingValue(const IntSettingDesc *sd, int32_t value, bool force_newgame = false);
bool SetSettingValue(const StringSettingDesc *sd, const std::string value, bool force_newgame = false);
bool SetSettingValue(const StringSettingDesc *sd, std::string_view value, bool force_newgame = false);
std::vector<const SettingDesc *> GetFilteredSettingCollection(std::function<bool(const SettingDesc &desc)> func);