diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 3f868b901..f8280b318 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -901,34 +901,6 @@ void Settings::Save(SettingsInterface& si, bool ignore_base) const si.SetStringValue("PCDrv", "Root", pcdrv_root.c_str()); } -void Settings::Clear(SettingsInterface& si) -{ - si.ClearSection("Main"); - si.ClearSection("Console"); - si.ClearSection("CPU"); - si.ClearSection("GPU"); - si.ClearSection("Display"); - si.ClearSection("CDROM"); - si.ClearSection("Audio"); - si.ClearSection("Hacks"); - si.ClearSection("PCDrv"); - si.ClearSection("BIOS"); - - si.ClearSection("ControllerPorts"); - for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++) - si.ClearSection(Controller::GetSettingsSection(i).c_str()); - - si.ClearSection("MemoryCards"); - si.ClearSection("Cheevos"); - si.ClearSection("Logging"); - si.ClearSection("Debug"); - si.ClearSection("TextureReplacements"); - - // Cheats/patches have to be removed too. - si.ClearSection("Cheats"); - si.ClearSection("Patches"); -} - bool Settings::TextureReplacementSettings::Configuration::operator==(const Configuration& rhs) const { return (max_hash_cache_entries == rhs.max_hash_cache_entries && diff --git a/src/core/settings.h b/src/core/settings.h index e30893d77..be9dd140e 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -443,7 +443,6 @@ struct Settings : public GPUSettings void Load(const SettingsInterface& si, const SettingsInterface& controller_si); void LoadPGXPSettings(const SettingsInterface& si); void Save(SettingsInterface& si, bool ignore_base) const; - static void Clear(SettingsInterface& si); void ApplySettingRestrictions(); void FixIncompatibleSettings(const SettingsInterface& si, bool display_osd_messages); diff --git a/src/duckstation-qt/settingswindow.cpp b/src/duckstation-qt/settingswindow.cpp index 36bc420f7..fac60344a 100644 --- a/src/duckstation-qt/settingswindow.cpp +++ b/src/duckstation-qt/settingswindow.cpp @@ -344,7 +344,7 @@ void SettingsWindow::onClearSettingsClicked() return; } - Settings::Clear(*m_sif.get()); + m_sif->Clear(); saveAndReloadGameSettings(); reloadPages();