Prepare for settings move

This commit is contained in:
Henrik Rydgård 2023-04-05 11:46:44 +02:00
parent 6ac45ddba1
commit b3d85ae89a
2 changed files with 11 additions and 9 deletions

View file

@ -814,12 +814,6 @@ static const ConfigSetting vrSettings[] = {
ConfigSetting("VRHeadRotationSmoothing", &g_Config.bHeadRotationSmoothing, false),
};
struct ConfigSectionSettings {
const char *section;
const ConfigSetting *settings;
size_t settingsCount;
};
static const ConfigSectionSettings sections[] = {
{"General", generalSettings, ARRAY_SIZE(generalSettings)},
{"CPU", cpuSettings, ARRAY_SIZE(cpuSettings)},
@ -835,8 +829,10 @@ static const ConfigSectionSettings sections[] = {
{"VR", vrSettings, ARRAY_SIZE(vrSettings)},
};
const size_t numSections = ARRAY_SIZE(sections);
static void IterateSettings(IniFile &iniFile, std::function<void(Section *section, const ConfigSetting &setting)> func) {
for (size_t i = 0; i < ARRAY_SIZE(sections); ++i) {
for (size_t i = 0; i < numSections; ++i) {
Section *section = iniFile.GetOrCreateSection(sections[i].section);
for (size_t j = 0; j < sections[i].settingsCount; j++) {
func(section, sections[i].settings[j]);
@ -845,7 +841,7 @@ static void IterateSettings(IniFile &iniFile, std::function<void(Section *sectio
}
static void IterateSettings(std::function<void(const ConfigSetting &setting)> func) {
for (size_t i = 0; i < ARRAY_SIZE(sections); ++i) {
for (size_t i = 0; i < numSections; ++i) {
for (size_t j = 0; j < sections[i].settingsCount; j++) {
func(sections[i].settings[j]);
}
@ -1686,7 +1682,7 @@ void Config::ResetControlLayout() {
}
void Config::GetReportingInfo(UrlEncoder &data) {
for (size_t i = 0; i < ARRAY_SIZE(sections); ++i) {
for (size_t i = 0; i < numSections; ++i) {
const std::string prefix = std::string("config.") + sections[i].section;
for (size_t j = 0; j < sections[i].settingsCount; j++) {
sections[i].settings[j].Report(data, prefix);