dolphin-emu/archived-dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-31 01:15:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/ConfigManager: Refactor LoadGameIni and friends

Browse Source
This commit is contained in:
Sintendo
2026-01-24 17:43:30 +01:00
parent bc4b977e9d
commit 8e6d95adb1
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/ConfigManager.cpp
View File

@@ -4,11 +4,9 @@
#include "Core/ConfigManager.h"
#include <algorithm>
#include <climits>
#include <memory>
#include <mutex>
#include <optional>
#include <sstream>
#include <string>
#include <string_view>
#include <variant>
@@ -19,7 +17,6 @@
#include "AudioCommon/AudioCommon.h"
#include "Common/Assert.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/Config/Config.h"
@@ -27,13 +24,10 @@
#include "Common/IniFile.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
#include "Common/NandPaths.h"
#include "Common/StringUtil.h"
#include "Common/Version.h"
#include "Core/AchievementManager.h"
#include "Core/Boot/Boot.h"
#include "Core/CommonTitles.h"
#include "Core/Config/DefaultLocale.h"
#include "Core/Config/MainSettings.h"
#include "Core/Config/SYSCONFSettings.h"
@@ -54,7 +48,6 @@
#include "Core/IOS/ES/Formats.h"
#include "Core/PatchEngine.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/System.h"
#include "Core/TitleDatabase.h"
#include "Core/WC24PatchEngine.h"
@@ -527,7 +520,7 @@ Common::IniFile SConfig::LoadGameIni() const
return LoadGameIni(GetGameID(), m_revision);
}
Common::IniFile SConfig::LoadDefaultGameIni(const std::string& id, std::optional<u16> revision)
Common::IniFile SConfig::LoadDefaultGameIni(std::string_view id, std::optional<u16> revision)
{
Common::IniFile game_ini;
for (const std::string& filename : ConfigLoaders::GetGameIniFilenames(id, revision))
@@ -535,7 +528,7 @@ Common::IniFile SConfig::LoadDefaultGameIni(const std::string& id, std::optional
return game_ini;
}
Common::IniFile SConfig::LoadLocalGameIni(const std::string& id, std::optional<u16> revision)
Common::IniFile SConfig::LoadLocalGameIni(std::string_view id, std::optional<u16> revision)
{
Common::IniFile game_ini;
for (const std::string& filename : ConfigLoaders::GetGameIniFilenames(id, revision))
@@ -543,7 +536,7 @@ Common::IniFile SConfig::LoadLocalGameIni(const std::string& id, std::optional<u
return game_ini;
}
Common::IniFile SConfig::LoadGameIni(const std::string& id, std::optional<u16> revision)
Common::IniFile SConfig::LoadGameIni(std::string_view id, std::optional<u16> revision)
{
Common::IniFile game_ini;
for (const std::string& filename : ConfigLoaders::GetGameIniFilenames(id, revision))

11
Source/Core/Core/ConfigManager.h
View File

@@ -3,16 +3,11 @@
#pragma once
#include <limits>
#include <mutex>
#include <optional>
#include <set>
#include <string>
#include <string_view>
#include <utility>
#include <vector>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
namespace Common
@@ -95,9 +90,9 @@ struct SConfig
Common::IniFile LoadLocalGameIni() const;
Common::IniFile LoadGameIni() const;
static Common::IniFile LoadDefaultGameIni(const std::string& id, std::optional<u16> revision);
static Common::IniFile LoadLocalGameIni(const std::string& id, std::optional<u16> revision);
static Common::IniFile LoadGameIni(const std::string& id, std::optional<u16> revision);
static Common::IniFile LoadDefaultGameIni(std::string_view id, std::optional<u16> revision);
static Common::IniFile LoadLocalGameIni(std::string_view id, std::optional<u16> revision);
static Common::IniFile LoadGameIni(std::string_view id, std::optional<u16> revision);
SConfig(const SConfig&) = delete;
SConfig& operator=(const SConfig&) = delete;