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

Codechange: use std::string_view in IConsole settings API

pull/8505/merge
Rubidium 2025-04-21 22:28:57 +02:00 committed by rubidium42
parent b279bc37e7
commit 917ef03e97
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/console_cmds.cpp
View File

@ -2329,7 +2329,7 @@ static bool ConListSettings([[maybe_unused]] uint8_t argc, [[maybe_unused]] char
if (argc > 2) return false; if (argc > 2) return false;
IConsoleListSettings((argc == 2) ? argv[1] : nullptr); IConsoleListSettings((argc == 2) ? argv[1] : std::string_view{});
return true; return true;
} }

12
src/settings.cpp
View File

@ -1909,7 +1909,7 @@ void StringSettingDesc::ChangeValue(const void *object, std::string &&newval) co
/* Those 2 functions need to be here, else we have to make some stuff non-static /* Those 2 functions need to be here, else we have to make some stuff non-static
* and besides, it is also better to keep stuff like this at the same place */ * and besides, it is also better to keep stuff like this at the same place */
void IConsoleSetSetting(const char *name, const char *value, bool force_newgame) void IConsoleSetSetting(std::string_view name, std::string_view value, bool force_newgame)
{ {
const SettingDesc *sd = GetSettingFromName(name); const SettingDesc *sd = GetSettingFromName(name);
/* Company settings are not in "list_settings", so don't try to modify them. */ /* Company settings are not in "list_settings", so don't try to modify them. */
@ -1941,7 +1941,7 @@ void IConsoleSetSetting(const char *name, const char *value, bool force_newgame)
} }
} }
void IConsoleSetSetting(const char *name, int value) void IConsoleSetSetting(std::string_view name, int value)
{ {
const SettingDesc *sd = GetSettingFromName(name); const SettingDesc *sd = GetSettingFromName(name);
assert(sd != nullptr); assert(sd != nullptr);
@ -1953,7 +1953,7 @@ void IConsoleSetSetting(const char *name, int value)
* @param name Name of the setting to output its value * @param name Name of the setting to output its value
* @param force_newgame force the newgame settings * @param force_newgame force the newgame settings
*/ */
void IConsoleGetSetting(const char *name, bool force_newgame) void IConsoleGetSetting(std::string_view name, bool force_newgame)
{ {
const SettingDesc *sd = GetSettingFromName(name); const SettingDesc *sd = GetSettingFromName(name);
/* Company settings are not in "list_settings", so don't try to read them. */ /* Company settings are not in "list_settings", so don't try to read them. */
@ -1976,12 +1976,12 @@ void IConsoleGetSetting(const char *name, bool force_newgame)
} }
} }
static void IConsoleListSettingsTable(const SettingTable &table, const char *prefilter) static void IConsoleListSettingsTable(const SettingTable &table, std::string_view prefilter)
{ {
for (auto &desc : table) { for (auto &desc : table) {
const SettingDesc *sd = GetSettingDesc(desc); const SettingDesc *sd = GetSettingDesc(desc);
if (!SlIsObjectCurrentlyValid(sd->save.version_from, sd->save.version_to)) continue; if (!SlIsObjectCurrentlyValid(sd->save.version_from, sd->save.version_to)) continue;
if (prefilter != nullptr && sd->GetName().find(prefilter) == std::string::npos) continue; if (!prefilter.empty() && sd->GetName().find(prefilter) == std::string::npos) continue;
IConsolePrint(CC_DEFAULT, "{} = {}", sd->GetName(), sd->FormatValue(&GetGameSettings())); IConsolePrint(CC_DEFAULT, "{} = {}", sd->GetName(), sd->FormatValue(&GetGameSettings()));
} }
} }
@ -1991,7 +1991,7 @@ static void IConsoleListSettingsTable(const SettingTable &table, const char *pre
* *
* @param prefilter If not \c nullptr, only list settings with names that begin with \a prefilter prefix * @param prefilter If not \c nullptr, only list settings with names that begin with \a prefilter prefix
*/ */
void IConsoleListSettings(const char *prefilter) void IConsoleListSettings(std::string_view prefilter)
{ {
IConsolePrint(CC_HELP, "All settings with their current value:"); IConsolePrint(CC_HELP, "All settings with their current value:");

8
src/settings_func.h
View File

@ -17,10 +17,10 @@
struct IniFile; struct IniFile;
struct WindowDesc; struct WindowDesc;
void IConsoleSetSetting(const char *name, const char *value, bool force_newgame = false); void IConsoleSetSetting(std::string_view name, std::string_view value, bool force_newgame = false);
void IConsoleSetSetting(const char *name, int32_t value); void IConsoleSetSetting(std::string_view name, int32_t value);
void IConsoleGetSetting(const char *name, bool force_newgame = false); void IConsoleGetSetting(std::string_view name, bool force_newgame = false);
void IConsoleListSettings(const char *prefilter); void IConsoleListSettings(std::string_view prefilter);
void LoadFromConfig(bool minimal = false); void LoadFromConfig(bool minimal = false);
void SaveToConfig(); void SaveToConfig();