ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Remove parameter to CSettingTypeApplication::Initialize

This commit is contained in:
zilmar 2018-12-02 15:01:54 +10:30
parent ad19a6fa83
commit b957cac73d
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/Settings.cpp
View File

@ -654,7 +654,7 @@ bool CSettings::Initialize(const char * BaseDirectory, const char * AppName)
{ {
WriteTrace(TraceAppInit, TraceDebug, "Start"); WriteTrace(TraceAppInit, TraceDebug, "Start");
AddHowToHandleSetting(BaseDirectory); AddHowToHandleSetting(BaseDirectory);
CSettingTypeApplication::Initialize(AppName); CSettingTypeApplication::Initialize();
CSettingTypeRomDatabase::Initialize(); CSettingTypeRomDatabase::Initialize();
CSettingTypeGame::Initialize(); CSettingTypeGame::Initialize();
CSettingTypeCheats::Initialize(); CSettingTypeCheats::Initialize();

42
Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp
View File

@ -25,32 +25,32 @@ CSettingTypeApplication::CSettingTypeApplication(const char * Section, const cha
} }
CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, bool DefaultValue) : CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, bool DefaultValue) :
m_DefaultStr(""), m_DefaultStr(""),
m_DefaultValue(DefaultValue), m_DefaultValue(DefaultValue),
m_DefaultSetting(Default_Constant), m_DefaultSetting(Default_Constant),
m_Section(FixSectionName(Section)), m_Section(FixSectionName(Section)),
m_KeyName(Name), m_KeyName(Name),
m_KeyNameIdex(m_KeyName) m_KeyNameIdex(m_KeyName)
{ {
} }
CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, const char * DefaultValue) : CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, const char * DefaultValue) :
m_DefaultStr(DefaultValue), m_DefaultStr(DefaultValue),
m_DefaultValue(0), m_DefaultValue(0),
m_DefaultSetting(Default_Constant), m_DefaultSetting(Default_Constant),
m_Section(FixSectionName(Section)), m_Section(FixSectionName(Section)),
m_KeyName(Name), m_KeyName(Name),
m_KeyNameIdex(m_KeyName) m_KeyNameIdex(m_KeyName)
{ {
} }
CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, SettingID DefaultSetting) : CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, SettingID DefaultSetting) :
m_DefaultStr(""), m_DefaultStr(""),
m_DefaultValue(0), m_DefaultValue(0),
m_DefaultSetting(DefaultSetting), m_DefaultSetting(DefaultSetting),
m_Section(FixSectionName(Section)), m_Section(FixSectionName(Section)),
m_KeyName(Name), m_KeyName(Name),
m_KeyNameIdex(m_KeyName) m_KeyNameIdex(m_KeyName)
{ {
} }
@ -63,7 +63,7 @@ bool CSettingTypeApplication::IsSettingSet(void) const
return m_SettingsIniFile ? m_SettingsIniFile->EntryExists(SectionName(), m_KeyNameIdex.c_str()) : false; return m_SettingsIniFile ? m_SettingsIniFile->EntryExists(SectionName(), m_KeyNameIdex.c_str()) : false;
} }
void CSettingTypeApplication::Initialize(const char * /*AppName*/) void CSettingTypeApplication::Initialize(void)
{ {
WriteTrace(TraceAppInit, TraceDebug, "Start"); WriteTrace(TraceAppInit, TraceDebug, "Start");
CPath BaseDir(g_Settings->LoadStringVal(Cmd_BaseDirectory).c_str(), ""); CPath BaseDir(g_Settings->LoadStringVal(Cmd_BaseDirectory).c_str(), "");
@ -92,9 +92,7 @@ void CSettingTypeApplication::Initialize(const char * /*AppName*/)
delete m_SettingsIniFile; delete m_SettingsIniFile;
} }
CPath SettingPath(SettingsFile.c_str()); CPath SettingPath(SettingsFile.c_str());
#ifdef _WIN32 SettingPath.NormalizePath(BaseDir);
SettingPath.NormalizePath(CPath(CPath::MODULE_DIRECTORY));
#endif
if (!SettingPath.DirectoryExists()) if (!SettingPath.DirectoryExists())
{ {
SettingPath.DirectoryCreate(); SettingPath.DirectoryCreate();

2
Source/Project64-core/Settings/SettingType/SettingsType-Application.h
View File

@ -47,7 +47,7 @@ public:
virtual void Delete(uint32_t Index); virtual void Delete(uint32_t Index);
// Initialize this class to use ini or registry // Initialize this class to use ini or registry
static void Initialize(const char * AppName); static void Initialize(void);
static void CleanUp(void); static void CleanUp(void);
static void Flush(void); static void Flush(void);
static void ResetAll(void); static void ResetAll(void);