piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11756 from lioncash/ini

Browse Source 
Common/IniFile: Move interface into Common namespace
This commit is contained in:
Admiral H. Curtiss
2023-04-14 20:52:30 +02:00
committed by GitHub
parent ae18aa0639 e4caace6bb
commit e9dbb93cb5
45 changed files with 172 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt/Config/ARCodeWidget.cpp
View File

@ -33,13 +33,14 @@ ARCodeWidget::ARCodeWidget(std::string game_id, u16 game_revision, bool restart_
if (!m_game_id.empty())
{
IniFile game_ini_local;
Common::IniFile game_ini_local;
// We don't use LoadLocalGameIni() here because user cheat codes that are installed via the UI
// will always be stored in GS/${GAMEID}.ini
game_ini_local.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini");
const IniFile game_ini_default = SConfig::LoadDefaultGameIni(m_game_id, m_game_revision);
const Common::IniFile game_ini_default =
SConfig::LoadDefaultGameIni(m_game_id, m_game_revision);
m_ar_codes = ActionReplay::LoadCodes(game_ini_default, game_ini_local);
}
@ -185,7 +186,7 @@ void ARCodeWidget::SaveCodes()
const auto ini_path =
std::string(File::GetUserPath(D_GAMESETTINGS_IDX)).append(m_game_id).append(".ini");
IniFile game_ini_local;
Common::IniFile game_ini_local;
game_ini_local.Load(ini_path);
ActionReplay::SaveCodes(&game_ini_local, m_ar_codes);
game_ini_local.Save(ini_path);

4
Source/Core/DolphinQt/Config/GameConfigWidget.h
View File

@ -63,6 +63,6 @@ private:
const UICommon::GameFile& m_game;
std::string m_game_id;
IniFile m_gameini_local;
IniFile m_gameini_default;
Common::IniFile m_gameini_local;
Common::IniFile m_gameini_default;
};

7
Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp
View File

@ -40,13 +40,14 @@ GeckoCodeWidget::GeckoCodeWidget(std::string game_id, std::string gametdb_id, u1
if (!m_game_id.empty())
{
IniFile game_ini_local;
Common::IniFile game_ini_local;
// We don't use LoadLocalGameIni() here because user cheat codes that are installed via the UI
// will always be stored in GS/${GAMEID}.ini
game_ini_local.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini");
const IniFile game_ini_default = SConfig::LoadDefaultGameIni(m_game_id, m_game_revision);
const Common::IniFile game_ini_default =
SConfig::LoadDefaultGameIni(m_game_id, m_game_revision);
m_gecko_codes = Gecko::LoadCodes(game_ini_default, game_ini_local);
}
@ -245,7 +246,7 @@ void GeckoCodeWidget::SaveCodes()
const auto ini_path =
std::string(File::GetUserPath(D_GAMESETTINGS_IDX)).append(m_game_id).append(".ini");
IniFile game_ini_local;
Common::IniFile game_ini_local;
game_ini_local.Load(ini_path);
Gecko::SaveCodes(game_ini_local, m_gecko_codes);
game_ini_local.Save(ini_path);

6
Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
View File

@ -299,7 +299,7 @@ void MappingWindow::OnLoadProfilePressed()
const QString profile_path = m_profiles_combo->currentData().toString();
IniFile ini;
Common::IniFile ini;
ini.Load(profile_path.toStdString());
m_controller->LoadConfig(ini.GetOrCreateSection("Profile"));
@ -322,7 +322,7 @@ void MappingWindow::OnSaveProfilePressed()
File::CreateFullPath(profile_path);
IniFile ini;
Common::IniFile ini;
m_controller->SaveConfig(ini.GetOrCreateSection("Profile"));
ini.Save(profile_path);
@ -542,7 +542,7 @@ void MappingWindow::OnDefaultFieldsPressed()
void MappingWindow::OnClearFieldsPressed()
{
// Loading an empty inifile section clears everything.
IniFile::Section sec;
Common::IniFile::Section sec;
// Keep the currently selected device.
const auto default_device = m_controller->GetDefaultDevice();

7
Source/Core/DolphinQt/Config/PatchesWidget.cpp
View File

@ -21,10 +21,11 @@
PatchesWidget::PatchesWidget(const UICommon::GameFile& game)
: m_game_id(game.GetGameID()), m_game_revision(game.GetRevision())
{
IniFile game_ini_local;
Common::IniFile game_ini_local;
game_ini_local.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini");
IniFile game_ini_default = SConfig::GetInstance().LoadDefaultGameIni(m_game_id, m_game_revision);
Common::IniFile game_ini_default =
SConfig::GetInstance().LoadDefaultGameIni(m_game_id, m_game_revision);
PatchEngine::LoadPatchSection("OnFrame", &m_patches, game_ini_default, game_ini_local);
@ -128,7 +129,7 @@ void PatchesWidget::SavePatches()
{
const std::string ini_path = File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini";
IniFile game_ini_local;
Common::IniFile game_ini_local;
game_ini_local.Load(ini_path);
PatchEngine::SavePatchSection(&game_ini_local, m_patches);
game_ini_local.Save(ini_path);

4
Source/Core/DolphinQt/Debugger/BreakpointWidget.cpp
View File

@ -337,7 +337,7 @@ void BreakpointWidget::OnEditBreakpoint(u32 address, bool is_instruction_bp)
void BreakpointWidget::OnLoad()
{
IniFile ini;
Common::IniFile ini;
if (!ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetGameID() + ".ini",
false))
{
@ -367,7 +367,7 @@ void BreakpointWidget::OnLoad()
void BreakpointWidget::OnSave()
{
IniFile ini;
Common::IniFile ini;
ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetGameID() + ".ini",
false);
ini.SetLines("BreakPoints", m_system.GetPowerPC().GetBreakPoints().GetStrings());

4
Source/Core/DolphinQt/Debugger/WatchWidget.cpp
View File

@ -289,7 +289,7 @@ void WatchWidget::OnNewWatch()
void WatchWidget::OnLoad()
{
IniFile ini;
Common::IniFile ini;
std::vector<std::string> watches;
@ -317,7 +317,7 @@ void WatchWidget::OnLoad()
void WatchWidget::OnSave()
{
IniFile ini;
Common::IniFile ini;
ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetGameID() + ".ini",
false);
ini.SetLines("Watches", m_system.GetPowerPC().GetDebugInterface().SaveWatchesToStrings());

2
Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp
View File

@ -353,7 +353,7 @@ WiiTASInputWindow::WiiTASInputWindow(QWidget* parent, int num) : TASInputWindow(
}
else
{
IniFile ini;
Common::IniFile ini;
ini.Load(File::GetUserPath(D_CONFIG_IDX) + "WiimoteNew.ini");
const std::string section_name = "Wiimote" + std::to_string(num + 1);