From 403f003372c4dad5cd359375f03f9074ce134fda Mon Sep 17 00:00:00 2001 From: zilmar Date: Wed, 28 Mar 2018 19:28:02 +1100 Subject: [PATCH] [Project64] Make sure index for settings are uint32_t --- .../SettingType/SettingsType-Application.cpp | 24 ++--- .../SettingType/SettingsType-Application.h | 34 +++---- .../SettingsType-ApplicationIndex.cpp | 22 ++--- .../Settings/SettingType/SettingsType-Base.h | 26 +++--- .../SettingType/SettingsType-Cheats.cpp | 24 ++--- .../SettingType/SettingsType-Cheats.h | 34 +++---- .../SettingsType-GameSettingIndex.cpp | 14 +-- .../SettingType/SettingsType-RDBCpuType.cpp | 24 ++--- .../SettingType/SettingsType-RDBCpuType.h | 24 ++--- .../SettingType/SettingsType-RDBOnOff.cpp | 24 ++--- .../SettingType/SettingsType-RDBOnOff.h | 26 +++--- .../SettingType/SettingsType-RDBRamSize.cpp | 24 ++--- .../SettingType/SettingsType-RDBRamSize.h | 24 ++--- .../SettingType/SettingsType-RDBSaveChip.cpp | 24 ++--- .../SettingType/SettingsType-RDBSaveChip.h | 24 ++--- .../SettingType/SettingsType-RDBYesNo.cpp | 24 ++--- .../SettingType/SettingsType-RDBYesNo.h | 24 ++--- .../SettingType/SettingsType-RelativePath.cpp | 18 ++-- .../SettingType/SettingsType-RelativePath.h | 28 +++--- .../SettingType/SettingsType-RomDatabase.cpp | 26 +++--- .../SettingType/SettingsType-RomDatabase.h | 42 ++++----- .../SettingsType-RomDatabaseIndex.cpp | 34 +++---- .../SettingsType-RomDatabaseIndex.h | 28 +++--- .../SettingsType-RomDatabaseSetting.cpp | 2 +- .../SettingsType-RomDatabaseSetting.h | 2 +- .../SettingsType-SelectedDirectory.cpp | 22 ++--- .../SettingsType-SelectedDirectory.h | 28 +++--- .../SettingType/SettingsType-TempBool.cpp | 22 ++--- .../SettingType/SettingsType-TempBool.h | 26 +++--- .../SettingType/SettingsType-TempNumber.cpp | 22 ++--- .../SettingType/SettingsType-TempNumber.h | 28 +++--- .../SettingType/SettingsType-TempString.cpp | 22 ++--- .../SettingType/SettingsType-TempString.h | 28 +++--- .../Project64-core/Settings/SettingsClass.cpp | 84 ++++++++--------- .../Project64-core/Settings/SettingsClass.h | 91 +++++++++---------- Source/Project64/UserInterface/MainMenu.cpp | 2 +- 36 files changed, 487 insertions(+), 488 deletions(-) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp index 845ef903d..3ce63c753 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp @@ -140,7 +140,7 @@ void CSettingTypeApplication::CleanUp() } } -bool CSettingTypeApplication::Load(int /*Index*/, bool & Value) const +bool CSettingTypeApplication::Load(uint32_t /*Index*/, bool & Value) const { bool bRes = false; @@ -165,7 +165,7 @@ bool CSettingTypeApplication::Load(int /*Index*/, bool & Value) const return bRes; } -bool CSettingTypeApplication::Load(int /*Index*/, uint32_t & Value) const +bool CSettingTypeApplication::Load(uint32_t /*Index*/, uint32_t & Value) const { bool bRes = m_SettingsIniFile->GetNumber(SectionName(), m_KeyNameIdex.c_str(), Value, Value); if (!bRes && m_DefaultSetting != Default_None) @@ -187,7 +187,7 @@ const char * CSettingTypeApplication::SectionName(void) const return m_Section.c_str(); } -bool CSettingTypeApplication::Load(int Index, stdstr & Value) const +bool CSettingTypeApplication::Load(uint32_t Index, std::string & Value) const { bool bRes = m_SettingsIniFile ? m_SettingsIniFile->GetString(SectionName(), m_KeyNameIdex.c_str(), m_DefaultStr, Value) : false; if (!bRes) @@ -198,7 +198,7 @@ bool CSettingTypeApplication::Load(int Index, stdstr & Value) const } //return the default values -void CSettingTypeApplication::LoadDefault(int /*Index*/, bool & Value) const +void CSettingTypeApplication::LoadDefault(uint32_t /*Index*/, bool & Value) const { if (m_DefaultSetting != Default_None) { @@ -213,7 +213,7 @@ void CSettingTypeApplication::LoadDefault(int /*Index*/, bool & Value) const } } -void CSettingTypeApplication::LoadDefault(int /*Index*/, uint32_t & Value) const +void CSettingTypeApplication::LoadDefault(uint32_t /*Index*/, uint32_t & Value) const { if (m_DefaultSetting != Default_None) { @@ -228,7 +228,7 @@ void CSettingTypeApplication::LoadDefault(int /*Index*/, uint32_t & Value) const } } -void CSettingTypeApplication::LoadDefault(int /*Index*/, stdstr & Value) const +void CSettingTypeApplication::LoadDefault(uint32_t /*Index*/, std::string & Value) const { if (m_DefaultSetting != Default_None) { @@ -244,7 +244,7 @@ void CSettingTypeApplication::LoadDefault(int /*Index*/, stdstr & Value) const } //Update the settings -void CSettingTypeApplication::Save(int /*Index*/, bool Value) +void CSettingTypeApplication::Save(uint32_t /*Index*/, bool Value) { if (m_DefaultSetting != Default_None && ((m_DefaultSetting == Default_Constant && (bool)m_DefaultValue == Value) || @@ -258,7 +258,7 @@ void CSettingTypeApplication::Save(int /*Index*/, bool Value) } } -void CSettingTypeApplication::Save(int /*Index*/, uint32_t Value) +void CSettingTypeApplication::Save(uint32_t /*Index*/, uint32_t Value) { if (m_DefaultSetting != Default_None && ((m_DefaultSetting == Default_Constant && m_DefaultValue == Value) || @@ -272,12 +272,12 @@ void CSettingTypeApplication::Save(int /*Index*/, uint32_t Value) } } -void CSettingTypeApplication::Save(int Index, const stdstr & Value) +void CSettingTypeApplication::Save(uint32_t Index, const std::string & Value) { Save(Index, Value.c_str()); } -void CSettingTypeApplication::Save(int /*Index*/, const char * Value) +void CSettingTypeApplication::Save(uint32_t /*Index*/, const char * Value) { if (m_DefaultSetting != Default_None && ((m_DefaultSetting == Default_Constant && strcmp(m_DefaultStr,Value) == 0) || @@ -291,7 +291,7 @@ void CSettingTypeApplication::Save(int /*Index*/, const char * Value) } } -stdstr CSettingTypeApplication::FixSectionName(const char * Section) +std::string CSettingTypeApplication::FixSectionName(const char * Section) { stdstr SectionName(Section); @@ -303,7 +303,7 @@ stdstr CSettingTypeApplication::FixSectionName(const char * Section) return SectionName; } -void CSettingTypeApplication::Delete(int /*Index*/) +void CSettingTypeApplication::Delete(uint32_t /*Index*/) { m_SettingsIniFile->SaveString(SectionName(), m_KeyNameIdex.c_str(), NULL); } \ No newline at end of file diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Application.h b/Source/Project64-core/Settings/SettingType/SettingsType-Application.h index c146dc31f..75233dc2e 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Application.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Application.h @@ -23,28 +23,28 @@ public: CSettingTypeApplication(const char * Section, const char * Name, SettingID DefaultSetting); virtual ~CSettingTypeApplication(); - virtual bool IndexBasedSetting(void) const { return false; } + virtual bool IndexBasedSetting(void) const { return false; } virtual SettingType GetSettingType(void) const { return SettingType_CfgFile; } - virtual bool IsSettingSet(void) const; + virtual bool IsSettingSet(void) const; //return the values - virtual bool Load(int32_t Index, bool & Value) const; - virtual bool Load(int32_t Index, uint32_t & Value) const; - virtual bool Load(int32_t Index, stdstr & Value) const; + virtual bool Load(uint32_t Index, bool & Value) const; + virtual bool Load(uint32_t Index, uint32_t & Value) const; + virtual bool Load(uint32_t Index, std::string & Value) const; //return the default values - virtual void LoadDefault(int32_t Index, bool & Value) const; - virtual void LoadDefault(int32_t Index, uint32_t & Value) const; - virtual void LoadDefault(int32_t Index, stdstr & Value) const; + virtual void LoadDefault(uint32_t Index, bool & Value) const; + virtual void LoadDefault(uint32_t Index, uint32_t & Value) const; + virtual void LoadDefault(uint32_t Index, std::string & Value) const; //Update the settings - virtual void Save(int32_t Index, bool Value); - virtual void Save(int32_t Index, uint32_t Value); - virtual void Save(int32_t Index, const stdstr & Value); - virtual void Save(int32_t Index, const char * Value); + virtual void Save(uint32_t Index, bool Value); + virtual void Save(uint32_t Index, uint32_t Value); + virtual void Save(uint32_t Index, const std::string & Value); + virtual void Save(uint32_t Index, const char * Value); // Delete the setting - virtual void Delete(int32_t Index); + virtual void Delete(uint32_t Index); // Initialize this class to use ini or registry static void Initialize(const char * AppName); @@ -59,12 +59,12 @@ protected: const uint32_t m_DefaultValue; const SettingID m_DefaultSetting; - stdstr FixSectionName(const char * Section); + std::string FixSectionName(const char * Section); static CIniFile * m_SettingsIniFile; - const stdstr m_Section; - const stdstr m_KeyName; - mutable stdstr m_KeyNameIdex; + const std::string m_Section; + const std::string m_KeyName; + mutable std::string m_KeyNameIdex; virtual const char * SectionName(void) const; diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp index e9fe50d46..02df70ec9 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp @@ -38,68 +38,68 @@ CSettingTypeApplicationIndex::~CSettingTypeApplicationIndex ( void ) bool CSettingTypeApplicationIndex::Load ( int Index, bool & Value ) const { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); return CSettingTypeApplication::Load(0,Value); } bool CSettingTypeApplicationIndex::Load ( int Index, uint32_t & Value ) const { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); return CSettingTypeApplication::Load(0,Value); } bool CSettingTypeApplicationIndex::Load ( int Index, stdstr & Value ) const { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); return CSettingTypeApplication::Load(0,Value); } //return the default values void CSettingTypeApplicationIndex::LoadDefault ( int Index, bool & Value ) const { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); CSettingTypeApplication::LoadDefault(0,Value); } void CSettingTypeApplicationIndex::LoadDefault ( int Index, uint32_t & Value ) const { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); CSettingTypeApplication::LoadDefault(0,Value); } void CSettingTypeApplicationIndex::LoadDefault ( int Index, stdstr & Value ) const { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); CSettingTypeApplication::LoadDefault(0,Value); } //Update the settings void CSettingTypeApplicationIndex::Save ( int Index, bool Value ) { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); CSettingTypeApplication::Save(0,Value); } void CSettingTypeApplicationIndex::Save ( int Index, uint32_t Value ) { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); CSettingTypeApplication::Save(0,Value); } void CSettingTypeApplicationIndex::Save ( int Index, const stdstr & Value ) { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); CSettingTypeApplication::Save(0,Value); } void CSettingTypeApplicationIndex::Save ( int Index, const char * Value ) { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); CSettingTypeApplication::Save(0,Value); } void CSettingTypeApplicationIndex::Delete ( int Index ) { - m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index); + m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); CSettingTypeApplication::Save(0,(const char *)NULL); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Base.h b/Source/Project64-core/Settings/SettingType/SettingsType-Base.h index 857c2b61d..a1ff58f40 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Base.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Base.h @@ -39,25 +39,25 @@ public: virtual ~CSettingType() {}; virtual SettingType GetSettingType(void) const = 0; - virtual bool IndexBasedSetting(void) const = 0; - virtual bool IsSettingSet(void) const = 0; + virtual bool IndexBasedSetting(void) const = 0; + virtual bool IsSettingSet(void) const = 0; //return the values - virtual bool Load(int32_t Index, bool & Value) const = 0; - virtual bool Load(int32_t Index, uint32_t & Value) const = 0; - virtual bool Load(int32_t Index, stdstr & Value) const = 0; + virtual bool Load(uint32_t Index, bool & Value) const = 0; + virtual bool Load(uint32_t Index, uint32_t & Value) const = 0; + virtual bool Load(uint32_t Index, std::string & Value) const = 0; //return the default values - virtual void LoadDefault(int32_t Index, bool & Value) const = 0; - virtual void LoadDefault(int32_t Index, uint32_t & Value) const = 0; - virtual void LoadDefault(int32_t Index, stdstr & Value) const = 0; + virtual void LoadDefault(uint32_t Index, bool & Value) const = 0; + virtual void LoadDefault(uint32_t Index, uint32_t & Value) const = 0; + virtual void LoadDefault(uint32_t Index, std::string & Value) const = 0; //Update the settings - virtual void Save(int32_t Index, bool Value) = 0; - virtual void Save(int32_t Index, uint32_t Value) = 0; - virtual void Save(int32_t Index, const stdstr & Value) = 0; - virtual void Save(int32_t Index, const char * Value) = 0; + virtual void Save(uint32_t Index, bool Value) = 0; + virtual void Save(uint32_t Index, uint32_t Value) = 0; + virtual void Save(uint32_t Index, const std::string & Value) = 0; + virtual void Save(uint32_t Index, const char * Value) = 0; // Delete the setting - virtual void Delete(int32_t Index) = 0; + virtual void Delete(uint32_t Index) = 0; }; diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp index ee6d40b7b..ccad1d1ae 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp @@ -12,7 +12,7 @@ #include "SettingsType-Cheats.h" CIniFile * CSettingTypeCheats::m_CheatIniFile = NULL; -stdstr * CSettingTypeCheats::m_SectionIdent = NULL; +std::string * CSettingTypeCheats::m_SectionIdent = NULL; CSettingTypeCheats::CSettingTypeCheats(const char * PostFix ) : m_PostFix(PostFix) @@ -68,19 +68,19 @@ bool CSettingTypeCheats::IsSettingSet(void) const return false; } -bool CSettingTypeCheats::Load ( int /*Index*/, bool & /*Value*/ ) const +bool CSettingTypeCheats::Load (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeCheats::Load ( int /*Index*/, uint32_t & /*Value*/ ) const +bool CSettingTypeCheats::Load (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeCheats::Load ( int Index, stdstr & Value ) const +bool CSettingTypeCheats::Load (uint32_t Index, std::string & Value ) const { if (m_CheatIniFile == NULL) { @@ -91,33 +91,33 @@ bool CSettingTypeCheats::Load ( int Index, stdstr & Value ) const } //return the default values -void CSettingTypeCheats::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const +void CSettingTypeCheats::LoadDefault (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeCheats::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const +void CSettingTypeCheats::LoadDefault (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeCheats::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const +void CSettingTypeCheats::LoadDefault (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings -void CSettingTypeCheats::Save ( int /*Index*/, bool /*Value*/ ) +void CSettingTypeCheats::Save (uint32_t /*Index*/, bool /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeCheats::Save ( int /*Index*/, uint32_t /*Value*/ ) +void CSettingTypeCheats::Save (uint32_t /*Index*/, uint32_t /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeCheats::Save ( int Index, const stdstr & Value ) +void CSettingTypeCheats::Save (uint32_t Index, const std::string & Value ) { if (m_CheatIniFile == NULL) { return; } @@ -125,7 +125,7 @@ void CSettingTypeCheats::Save ( int Index, const stdstr & Value ) m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),Value.c_str()); } -void CSettingTypeCheats::Save ( int Index, const char * Value ) +void CSettingTypeCheats::Save (uint32_t Index, const char * Value ) { if (m_CheatIniFile == NULL) { return; } @@ -133,7 +133,7 @@ void CSettingTypeCheats::Save ( int Index, const char * Value ) m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),Value); } -void CSettingTypeCheats::Delete ( int Index ) +void CSettingTypeCheats::Delete (uint32_t Index ) { stdstr_f Key("Cheat%d%s",Index,m_PostFix); m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),NULL); diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.h b/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.h index 10a76aec3..c3fe90e6c 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.h @@ -20,37 +20,37 @@ public: CSettingTypeCheats(const char * PostFix ); ~CSettingTypeCheats(); - virtual bool IndexBasedSetting ( void ) const { return true; } - virtual SettingType GetSettingType ( void ) const { return SettingType_CheatSetting; } - virtual bool IsSettingSet ( void ) const; + virtual bool IndexBasedSetting ( void ) const { return true; } + virtual SettingType GetSettingType ( void ) const { return SettingType_CheatSetting; } + virtual bool IsSettingSet ( void ) const; //return the values - virtual bool Load ( int32_t Index, bool & Value ) const; - virtual bool Load ( int32_t Index, uint32_t & Value ) const; - virtual bool Load ( int32_t Index, stdstr & Value ) const; + virtual bool Load (uint32_t Index, bool & Value ) const; + virtual bool Load (uint32_t Index, uint32_t & Value ) const; + virtual bool Load (uint32_t Index, std::string & Value ) const; //return the default values - virtual void LoadDefault ( int32_t Index, bool & Value ) const; - virtual void LoadDefault ( int32_t Index, uint32_t & Value ) const; - virtual void LoadDefault ( int32_t Index, stdstr & Value ) const; + virtual void LoadDefault (uint32_t Index, bool & Value ) const; + virtual void LoadDefault (uint32_t Index, uint32_t & Value ) const; + virtual void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - virtual void Save ( int32_t Index, bool Value ); - virtual void Save ( int32_t Index, uint32_t Value ); - virtual void Save ( int32_t Index, const stdstr & Value ); - virtual void Save ( int32_t Index, const char * Value ); + virtual void Save (uint32_t Index, bool Value ); + virtual void Save (uint32_t Index, uint32_t Value ); + virtual void Save (uint32_t Index, const std::string & Value ); + virtual void Save (uint32_t Index, const char * Value ); // Delete the setting - virtual void Delete ( int32_t Index ); + virtual void Delete (uint32_t Index ); // Initialize this class to use ini or registry - static void Initialize ( void ); - static void CleanUp ( void ); + static void Initialize ( void ); + static void CleanUp ( void ); static void FlushChanges ( void ); protected: static CIniFile * m_CheatIniFile; - static stdstr * m_SectionIdent; + static std::string * m_SectionIdent; const char * const m_PostFix; static void GameChanged ( void * /*Data */ ); diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp index f697a2c46..ef249df5b 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp @@ -40,7 +40,7 @@ CSettingTypeGameIndex::~CSettingTypeGameIndex() bool CSettingTypeGameIndex::Load ( int Index, bool & Value ) const { - m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyNameIdex = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); return CSettingTypeGame::Load(Index,Value); } @@ -52,14 +52,14 @@ bool CSettingTypeGameIndex::Load ( int /*Index*/, uint32_t & /*Value*/ ) const bool CSettingTypeGameIndex::Load ( int Index, stdstr & Value ) const { - m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyNameIdex = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); return CSettingTypeGame::Load(0,Value); } //return the default values void CSettingTypeGameIndex::LoadDefault ( int Index, bool & Value ) const { - m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyNameIdex = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); CSettingTypeGame::LoadDefault(0,Value); } @@ -76,13 +76,13 @@ void CSettingTypeGameIndex::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) co //Update the settings void CSettingTypeGameIndex::Save ( int Index, bool Value ) { - m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyNameIdex = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); CSettingTypeGame::Save(Index,Value); } void CSettingTypeGameIndex::Save(int Index, uint32_t Value) { - m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyNameIdex = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); CSettingTypeGame::Save(0,Value); } @@ -93,12 +93,12 @@ void CSettingTypeGameIndex::Save ( int /*Index*/, const stdstr & /*Value*/ ) void CSettingTypeGameIndex::Save ( int Index, const char * Value ) { - m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyNameIdex = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); CSettingTypeGame::Save(0,Value); } void CSettingTypeGameIndex::Delete ( int Index ) { - m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyNameIdex = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); CSettingTypeGame::Delete(0); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp index c2a8d859a..db0cfba3d 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp @@ -18,7 +18,7 @@ CSettingTypeRDBCpuType::CSettingTypeRDBCpuType(const char * Name, SettingID Defa { } -CSettingTypeRDBCpuType::CSettingTypeRDBCpuType(const char * Name, int DefaultValue ) : +CSettingTypeRDBCpuType::CSettingTypeRDBCpuType(const char * Name, uint32_t DefaultValue ) : CSettingTypeRomDatabase(Name,DefaultValue) { } @@ -27,13 +27,13 @@ CSettingTypeRDBCpuType::~CSettingTypeRDBCpuType() { } -bool CSettingTypeRDBCpuType::Load ( int /*Index*/, bool & /*Value*/ ) const +bool CSettingTypeRDBCpuType::Load (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeRDBCpuType::Load ( int Index, uint32_t & Value ) const +bool CSettingTypeRDBCpuType::Load (uint32_t Index, uint32_t & Value ) const { stdstr strValue; bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue); @@ -57,19 +57,19 @@ bool CSettingTypeRDBCpuType::Load ( int Index, uint32_t & Value ) const return true; } -bool CSettingTypeRDBCpuType::Load ( int /*Index*/, stdstr & /*Value*/ ) const +bool CSettingTypeRDBCpuType::Load (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values -void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const +void CSettingTypeRDBCpuType::LoadDefault (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, uint32_t & Value ) const +void CSettingTypeRDBCpuType::LoadDefault (uint32_t /*Index*/, uint32_t & Value ) const { if (m_DefaultSetting != Default_None) { @@ -82,18 +82,18 @@ void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, uint32_t & Value ) co } } -void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const +void CSettingTypeRDBCpuType::LoadDefault (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings -void CSettingTypeRDBCpuType::Save ( int /*Index*/, bool /*Value*/ ) +void CSettingTypeRDBCpuType::Save (uint32_t /*Index*/, bool /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBCpuType::Save ( int /*Index*/, uint32_t Value ) +void CSettingTypeRDBCpuType::Save (uint32_t /*Index*/, uint32_t Value ) { stdstr strValue; switch (Value) @@ -107,17 +107,17 @@ void CSettingTypeRDBCpuType::Save ( int /*Index*/, uint32_t Value ) m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),strValue.c_str()); } -void CSettingTypeRDBCpuType::Save ( int /*Index*/, const stdstr & /*Value*/ ) +void CSettingTypeRDBCpuType::Save (uint32_t /*Index*/, const std::string & /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBCpuType::Save ( int /*Index*/, const char * /*Value*/ ) +void CSettingTypeRDBCpuType::Save (uint32_t /*Index*/, const char * /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBCpuType::Delete( int /*Index*/ ) +void CSettingTypeRDBCpuType::Delete(uint32_t /*Index*/ ) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.h index 085602efc..bdcdea7da 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.h @@ -15,27 +15,27 @@ class CSettingTypeRDBCpuType : { public: CSettingTypeRDBCpuType(const char * Name, SettingID DefaultSetting ); - CSettingTypeRDBCpuType(const char * Name, int32_t DefaultValue ); + CSettingTypeRDBCpuType(const char * Name, uint32_t DefaultValue ); ~CSettingTypeRDBCpuType(); //return the values - virtual bool Load ( int32_t Index, bool & Value ) const; - virtual bool Load ( int32_t Index, uint32_t & Value ) const; - virtual bool Load ( int32_t Index, stdstr & Value ) const; + virtual bool Load (uint32_t Index, bool & Value ) const; + virtual bool Load (uint32_t Index, uint32_t & Value ) const; + virtual bool Load (uint32_t Index, std::string & Value ) const; //return the default values - virtual void LoadDefault ( int32_t Index, bool & Value ) const; - virtual void LoadDefault ( int32_t Index, uint32_t & Value ) const; - virtual void LoadDefault ( int32_t Index, stdstr & Value ) const; + virtual void LoadDefault (uint32_t Index, bool & Value ) const; + virtual void LoadDefault (uint32_t Index, uint32_t & Value ) const; + virtual void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - virtual void Save ( int32_t Index, bool Value ); - virtual void Save ( int32_t Index, uint32_t Value ); - virtual void Save ( int32_t Index, const stdstr & Value ); - virtual void Save ( int32_t Index, const char * Value ); + virtual void Save (uint32_t Index, bool Value ); + virtual void Save (uint32_t Index, uint32_t Value ); + virtual void Save (uint32_t Index, const std::string & Value ); + virtual void Save (uint32_t Index, const char * Value ); // Delete the setting - virtual void Delete ( int32_t Index ); + virtual void Delete (uint32_t Index ); private: CSettingTypeRDBCpuType(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp index 0a9e6e3f6..17c27a033 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp @@ -17,7 +17,7 @@ CSettingTypeRDBOnOff::CSettingTypeRDBOnOff(const char * Name, SettingID DefaultS { } -CSettingTypeRDBOnOff::CSettingTypeRDBOnOff(const char * Name, int DefaultValue ) : +CSettingTypeRDBOnOff::CSettingTypeRDBOnOff(const char * Name, uint32_t DefaultValue ) : CSettingTypeRomDatabase(Name,DefaultValue) { } @@ -26,7 +26,7 @@ CSettingTypeRDBOnOff::~CSettingTypeRDBOnOff() { } -bool CSettingTypeRDBOnOff::Load ( int Index, bool & Value ) const +bool CSettingTypeRDBOnOff::Load (uint32_t Index, bool & Value ) const { stdstr strValue; bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue); @@ -49,20 +49,20 @@ bool CSettingTypeRDBOnOff::Load ( int Index, bool & Value ) const return true; } -bool CSettingTypeRDBOnOff::Load ( int /*Index*/, uint32_t & /*Value*/ ) const +bool CSettingTypeRDBOnOff::Load (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeRDBOnOff::Load ( int /*Index*/, stdstr & /*Value*/ ) const +bool CSettingTypeRDBOnOff::Load (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values -void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, bool & Value ) const +void CSettingTypeRDBOnOff::LoadDefault (uint32_t /*Index*/, bool & Value ) const { if (m_DefaultSetting != Default_None) { @@ -75,38 +75,38 @@ void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, bool & Value ) const } } -void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const +void CSettingTypeRDBOnOff::LoadDefault (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const +void CSettingTypeRDBOnOff::LoadDefault (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings -void CSettingTypeRDBOnOff::Save ( int /*Index*/, bool Value ) +void CSettingTypeRDBOnOff::Save (uint32_t /*Index*/, bool Value ) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),Value? "On" : "Off"); } -void CSettingTypeRDBOnOff::Save ( int /*Index*/, uint32_t /*Value*/ ) +void CSettingTypeRDBOnOff::Save (uint32_t /*Index*/, uint32_t /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBOnOff::Save ( int /*Index*/, const stdstr & /*Value*/ ) +void CSettingTypeRDBOnOff::Save (uint32_t /*Index*/, const std::string & /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBOnOff::Save ( int /*Index*/, const char * /*Value*/ ) +void CSettingTypeRDBOnOff::Save (uint32_t /*Index*/, const char * /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBOnOff::Delete( int /*Index*/ ) +void CSettingTypeRDBOnOff::Delete(uint32_t /*Index*/ ) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.h index 7fbc99b28..859c706a1 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.h @@ -14,28 +14,28 @@ class CSettingTypeRDBOnOff : public CSettingTypeRomDatabase { public: - CSettingTypeRDBOnOff(const char * Name, SettingID DefaultSetting ); - CSettingTypeRDBOnOff(const char * Name, int32_t DefaultValue ); + CSettingTypeRDBOnOff(const char * Name, SettingID DefaultSetting); + CSettingTypeRDBOnOff(const char * Name, uint32_t DefaultValue); ~CSettingTypeRDBOnOff(); //return the values - virtual bool Load ( int32_t Index, bool & Value ) const; - virtual bool Load ( int32_t Index, uint32_t & Value ) const; - virtual bool Load ( int32_t Index, stdstr & Value ) const; + virtual bool Load (uint32_t Index, bool & Value) const; + virtual bool Load (uint32_t Index, uint32_t & Value) const; + virtual bool Load (uint32_t Index, std::string & Value) const; //return the default values - virtual void LoadDefault ( int32_t Index, bool & Value ) const; - virtual void LoadDefault ( int32_t Index, uint32_t & Value ) const; - virtual void LoadDefault ( int32_t Index, stdstr & Value ) const; + virtual void LoadDefault (uint32_t Index, bool & Value) const; + virtual void LoadDefault (uint32_t Index, uint32_t & Value) const; + virtual void LoadDefault (uint32_t Index, std::string & Value) const; //Update the settings - virtual void Save ( int32_t Index, bool Value ); - virtual void Save ( int32_t Index, uint32_t Value ); - virtual void Save ( int32_t Index, const stdstr & Value ); - virtual void Save ( int32_t Index, const char * Value ); + virtual void Save (uint32_t Index, bool Value ); + virtual void Save (uint32_t Index, uint32_t Value ); + virtual void Save (uint32_t Index, const std::string & Value ); + virtual void Save (uint32_t Index, const char * Value ); // Delete the setting - virtual void Delete ( int32_t Index ); + virtual void Delete (uint32_t Index ); private: CSettingTypeRDBOnOff(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp index 482213d31..cb3711ff5 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp @@ -19,7 +19,7 @@ CSettingTypeRDBRDRamSize::CSettingTypeRDBRDRamSize(const char * Name, SettingID { } -CSettingTypeRDBRDRamSize::CSettingTypeRDBRDRamSize(const char * Name, int DefaultValue ) : +CSettingTypeRDBRDRamSize::CSettingTypeRDBRDRamSize(const char * Name, uint32_t DefaultValue ) : CSettingTypeRomDatabase(Name,DefaultValue) { } @@ -28,13 +28,13 @@ CSettingTypeRDBRDRamSize::~CSettingTypeRDBRDRamSize() { } -bool CSettingTypeRDBRDRamSize::Load ( int /*Index*/, bool & /*Value*/ ) const +bool CSettingTypeRDBRDRamSize::Load (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeRDBRDRamSize::Load ( int Index, uint32_t & Value ) const +bool CSettingTypeRDBRDRamSize::Load (uint32_t Index, uint32_t & Value ) const { uint32_t ulValue; bool bRes = m_SettingsIniFile->GetNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultValue,ulValue); @@ -50,50 +50,50 @@ bool CSettingTypeRDBRDRamSize::Load ( int Index, uint32_t & Value ) const return bRes; } -bool CSettingTypeRDBRDRamSize::Load ( int /*Index*/, stdstr & /*Value*/ ) const +bool CSettingTypeRDBRDRamSize::Load (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values -void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const +void CSettingTypeRDBRDRamSize::LoadDefault (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, uint32_t & Value ) const +void CSettingTypeRDBRDRamSize::LoadDefault (uint32_t /*Index*/, uint32_t & Value ) const { Value = m_DefaultValue; } -void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const +void CSettingTypeRDBRDRamSize::LoadDefault (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings -void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, bool /*Value*/ ) +void CSettingTypeRDBRDRamSize::Save (uint32_t /*Index*/, bool /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, uint32_t Value ) +void CSettingTypeRDBRDRamSize::Save (uint32_t /*Index*/, uint32_t Value ) { m_SettingsIniFile->SaveNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),Value == 0x800000 ? 8 : 4); } -void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, const stdstr & /*Value*/ ) +void CSettingTypeRDBRDRamSize::Save (uint32_t /*Index*/, const std::string & /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, const char * /*Value*/ ) +void CSettingTypeRDBRDRamSize::Save (uint32_t /*Index*/, const char * /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBRDRamSize::Delete( int /*Index*/ ) +void CSettingTypeRDBRDRamSize::Delete(uint32_t /*Index*/ ) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.h index e452c6769..9a5bb991c 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.h @@ -15,27 +15,27 @@ class CSettingTypeRDBRDRamSize : { public: CSettingTypeRDBRDRamSize(const char * Name, SettingID DefaultSetting ); - CSettingTypeRDBRDRamSize(const char * Name, int32_t DefaultValue ); + CSettingTypeRDBRDRamSize(const char * Name, uint32_t DefaultValue ); ~CSettingTypeRDBRDRamSize(); //return the values - virtual bool Load ( int32_t Index, bool & Value ) const; - virtual bool Load ( int32_t Index, uint32_t & Value ) const; - virtual bool Load ( int32_t Index, stdstr & Value ) const; + virtual bool Load (uint32_t Index, bool & Value ) const; + virtual bool Load (uint32_t Index, uint32_t & Value ) const; + virtual bool Load (uint32_t Index, std::string & Value ) const; //return the default values - virtual void LoadDefault ( int32_t Index, bool & Value ) const; - virtual void LoadDefault ( int32_t Index, uint32_t & Value ) const; - virtual void LoadDefault ( int32_t Index, stdstr & Value ) const; + virtual void LoadDefault (uint32_t Index, bool & Value ) const; + virtual void LoadDefault (uint32_t Index, uint32_t & Value ) const; + virtual void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - virtual void Save ( int32_t Index, bool Value ); - virtual void Save ( int32_t Index, uint32_t Value ); - virtual void Save ( int32_t Index, const stdstr & Value ); - virtual void Save ( int32_t Index, const char * Value ); + virtual void Save (uint32_t Index, bool Value ); + virtual void Save (uint32_t Index, uint32_t Value ); + virtual void Save (uint32_t Index, const std::string & Value ); + virtual void Save (uint32_t Index, const char * Value ); // Delete the setting - virtual void Delete ( int32_t Index ); + virtual void Delete (uint32_t Index ); private: CSettingTypeRDBRDRamSize(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp index 3ffae5dfb..fb85b0507 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp @@ -18,7 +18,7 @@ CSettingTypeRDBSaveChip::CSettingTypeRDBSaveChip(const char * Name, SettingID De { } -CSettingTypeRDBSaveChip::CSettingTypeRDBSaveChip(const char * Name, int DefaultValue ) : +CSettingTypeRDBSaveChip::CSettingTypeRDBSaveChip(const char * Name, uint32_t DefaultValue ) : CSettingTypeRomDatabase(Name,DefaultValue) { } @@ -27,13 +27,13 @@ CSettingTypeRDBSaveChip::~CSettingTypeRDBSaveChip() { } -bool CSettingTypeRDBSaveChip::Load ( int /*Index*/, bool & /*Value*/ ) const +bool CSettingTypeRDBSaveChip::Load (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeRDBSaveChip::Load ( int Index, uint32_t & Value ) const +bool CSettingTypeRDBSaveChip::Load (uint32_t Index, uint32_t & Value ) const { stdstr strValue; bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue); @@ -60,19 +60,19 @@ bool CSettingTypeRDBSaveChip::Load ( int Index, uint32_t & Value ) const return true; } -bool CSettingTypeRDBSaveChip::Load ( int /*Index*/, stdstr & /*Value*/ ) const +bool CSettingTypeRDBSaveChip::Load (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values -void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const +void CSettingTypeRDBSaveChip::LoadDefault (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, uint32_t & Value ) const +void CSettingTypeRDBSaveChip::LoadDefault (uint32_t /*Index*/, uint32_t & Value ) const { if (m_DefaultSetting != Default_None) { @@ -85,18 +85,18 @@ void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, uint32_t & Value ) c } } -void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const +void CSettingTypeRDBSaveChip::LoadDefault (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings -void CSettingTypeRDBSaveChip::Save ( int /*Index*/, bool /*Value*/ ) +void CSettingTypeRDBSaveChip::Save (uint32_t /*Index*/, bool /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBSaveChip::Save ( int /*Index*/, uint32_t Value ) +void CSettingTypeRDBSaveChip::Save (uint32_t /*Index*/, uint32_t Value ) { switch (Value) { @@ -110,17 +110,17 @@ void CSettingTypeRDBSaveChip::Save ( int /*Index*/, uint32_t Value ) } } -void CSettingTypeRDBSaveChip::Save ( int /*Index*/, const stdstr & /*Value*/ ) +void CSettingTypeRDBSaveChip::Save (uint32_t /*Index*/, const std::string & /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBSaveChip::Save ( int /*Index*/, const char * /*Value*/ ) +void CSettingTypeRDBSaveChip::Save (uint32_t /*Index*/, const char * /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBSaveChip::Delete( int /*Index*/ ) +void CSettingTypeRDBSaveChip::Delete(uint32_t /*Index*/ ) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.h index 2be7d281b..0ce99bcbf 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.h @@ -15,27 +15,27 @@ class CSettingTypeRDBSaveChip : { public: CSettingTypeRDBSaveChip(const char * Name, SettingID DefaultSetting ); - CSettingTypeRDBSaveChip(const char * Name, int32_t DefaultValue ); + CSettingTypeRDBSaveChip(const char * Name, uint32_t DefaultValue ); ~CSettingTypeRDBSaveChip(); //return the values - virtual bool Load ( int32_t Index, bool & Value ) const; - virtual bool Load ( int32_t Index, uint32_t & Value ) const; - virtual bool Load ( int32_t Index, stdstr & Value ) const; + virtual bool Load (uint32_t Index, bool & Value ) const; + virtual bool Load (uint32_t Index, uint32_t & Value ) const; + virtual bool Load (uint32_t Index, std::string & Value ) const; //return the default values - virtual void LoadDefault ( int32_t Index, bool & Value ) const; - virtual void LoadDefault ( int32_t Index, uint32_t & Value ) const; - virtual void LoadDefault ( int32_t Index, stdstr & Value ) const; + virtual void LoadDefault (uint32_t Index, bool & Value ) const; + virtual void LoadDefault (uint32_t Index, uint32_t & Value ) const; + virtual void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - virtual void Save ( int32_t Index, bool Value ); - virtual void Save ( int32_t Index, uint32_t Value ); - virtual void Save ( int32_t Index, const stdstr & Value ); - virtual void Save ( int32_t Index, const char * Value ); + virtual void Save (uint32_t Index, bool Value ); + virtual void Save (uint32_t Index, uint32_t Value ); + virtual void Save (uint32_t Index, const std::string & Value ); + virtual void Save (uint32_t Index, const char * Value ); // Delete the setting - virtual void Delete ( int32_t Index ); + virtual void Delete (uint32_t Index ); private: CSettingTypeRDBSaveChip(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp index 31230708b..0597a345d 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp @@ -17,7 +17,7 @@ CSettingTypeRomDatabase(Name, DefaultSetting) { } -CSettingTypeRDBYesNo::CSettingTypeRDBYesNo(const char * Name, int DefaultValue) : +CSettingTypeRDBYesNo::CSettingTypeRDBYesNo(const char * Name, uint32_t DefaultValue) : CSettingTypeRomDatabase(Name, DefaultValue) { } @@ -26,7 +26,7 @@ CSettingTypeRDBYesNo::~CSettingTypeRDBYesNo() { } -bool CSettingTypeRDBYesNo::Load(int Index, bool & Value) const +bool CSettingTypeRDBYesNo::Load(uint32_t Index, bool & Value) const { stdstr strValue; bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(), m_KeyName.c_str(), m_DefaultStr, strValue); @@ -60,20 +60,20 @@ bool CSettingTypeRDBYesNo::Load(int Index, bool & Value) const return true; } -bool CSettingTypeRDBYesNo::Load(int /*Index*/, uint32_t & /*Value*/) const +bool CSettingTypeRDBYesNo::Load(uint32_t /*Index*/, uint32_t & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeRDBYesNo::Load(int /*Index*/, stdstr & /*Value*/) const +bool CSettingTypeRDBYesNo::Load(uint32_t /*Index*/, std::string & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values -void CSettingTypeRDBYesNo::LoadDefault(int /*Index*/, bool & Value) const +void CSettingTypeRDBYesNo::LoadDefault(uint32_t /*Index*/, bool & Value) const { if (m_DefaultSetting != Default_None) { @@ -87,38 +87,38 @@ void CSettingTypeRDBYesNo::LoadDefault(int /*Index*/, bool & Value) const } } -void CSettingTypeRDBYesNo::LoadDefault(int /*Index*/, uint32_t & /*Value*/) const +void CSettingTypeRDBYesNo::LoadDefault(uint32_t /*Index*/, uint32_t & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBYesNo::LoadDefault(int /*Index*/, stdstr & /*Value*/) const +void CSettingTypeRDBYesNo::LoadDefault(uint32_t /*Index*/, std::string & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings -void CSettingTypeRDBYesNo::Save(int /*Index*/, bool Value) +void CSettingTypeRDBYesNo::Save(uint32_t /*Index*/, bool Value) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(), m_KeyName.c_str(), Value ? "Yes" : "No"); } -void CSettingTypeRDBYesNo::Save(int /*Index*/, uint32_t Value) +void CSettingTypeRDBYesNo::Save(uint32_t /*Index*/, uint32_t Value) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(), m_KeyName.c_str(), Value ? "Yes" : "No"); } -void CSettingTypeRDBYesNo::Save(int /*Index*/, const stdstr & /*Value*/) +void CSettingTypeRDBYesNo::Save(uint32_t /*Index*/, const std::string & /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBYesNo::Save(int /*Index*/, const char * /*Value*/) +void CSettingTypeRDBYesNo::Save(uint32_t /*Index*/, const char * /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRDBYesNo::Delete(int /*Index*/) +void CSettingTypeRDBYesNo::Delete(uint32_t /*Index*/) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(), m_KeyName.c_str(), NULL); } \ No newline at end of file diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.h index 79da55cbc..c20329859 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.h @@ -15,27 +15,27 @@ class CSettingTypeRDBYesNo : { public: CSettingTypeRDBYesNo(const char * Name, SettingID DefaultSetting ); - CSettingTypeRDBYesNo(const char * Name, int32_t DefaultValue ); + CSettingTypeRDBYesNo(const char * Name, uint32_t DefaultValue ); ~CSettingTypeRDBYesNo(); //return the values - virtual bool Load ( int32_t Index, bool & Value ) const; - virtual bool Load ( int32_t Index, uint32_t & Value ) const; - virtual bool Load ( int32_t Index, stdstr & Value ) const; + virtual bool Load (uint32_t Index, bool & Value ) const; + virtual bool Load (uint32_t Index, uint32_t & Value ) const; + virtual bool Load (uint32_t Index, std::string & Value ) const; //return the default values - virtual void LoadDefault ( int32_t Index, bool & Value ) const; - virtual void LoadDefault ( int32_t Index, uint32_t & Value ) const; - virtual void LoadDefault ( int32_t Index, stdstr & Value ) const; + virtual void LoadDefault (uint32_t Index, bool & Value ) const; + virtual void LoadDefault (uint32_t Index, uint32_t & Value ) const; + virtual void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - virtual void Save ( int32_t Index, bool Value ); - virtual void Save ( int32_t Index, uint32_t Value ); - virtual void Save ( int32_t Index, const stdstr & Value ); - virtual void Save ( int32_t Index, const char * Value ); + virtual void Save (uint32_t Index, bool Value ); + virtual void Save (uint32_t Index, uint32_t Value ); + virtual void Save (uint32_t Index, const std::string & Value ); + virtual void Save (uint32_t Index, const char * Value ); // Delete the setting - virtual void Delete ( int32_t Index ); + virtual void Delete (uint32_t Index ); private: CSettingTypeRDBYesNo(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp index b45dff655..2899c8e7e 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp @@ -24,53 +24,53 @@ CSettingTypeRelativePath::~CSettingTypeRelativePath(void) g_Settings->UnregisterChangeCB(Cmd_BaseDirectory, this, RefreshSettings); } -bool CSettingTypeRelativePath::Load(int /*Index*/, stdstr & value) const +bool CSettingTypeRelativePath::Load(uint32_t /*Index*/, std::string & value) const { value = m_FullPath; return true; } //return the default values -void CSettingTypeRelativePath::LoadDefault(int /*Index*/, bool & /*Value*/) const +void CSettingTypeRelativePath::LoadDefault(uint32_t /*Index*/, bool & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRelativePath::LoadDefault(int /*Index*/, uint32_t & /*Value*/) const +void CSettingTypeRelativePath::LoadDefault(uint32_t /*Index*/, uint32_t & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRelativePath::LoadDefault(int /*Index*/, stdstr & /*Value*/) const +void CSettingTypeRelativePath::LoadDefault(uint32_t /*Index*/, std::string & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRelativePath::Save(int /*Index*/, bool /*Value*/) +void CSettingTypeRelativePath::Save(uint32_t /*Index*/, bool /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRelativePath::Save(int /*Index*/, uint32_t /*Value*/) +void CSettingTypeRelativePath::Save(uint32_t /*Index*/, uint32_t /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRelativePath::Save(int /*Index*/, const stdstr & Value) +void CSettingTypeRelativePath::Save(uint32_t /*Index*/, const std::string & Value) { m_Directory = ""; m_FileName = Value; BuildPath(); } -void CSettingTypeRelativePath::Save(int /*Index*/, const char * Value) +void CSettingTypeRelativePath::Save(uint32_t /*Index*/, const char * Value) { m_Directory = ""; m_FileName = Value; BuildPath(); } -void CSettingTypeRelativePath::Delete(int /*Index*/) +void CSettingTypeRelativePath::Delete(uint32_t /*Index*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.h b/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.h index fa7298626..22b8d857e 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.h @@ -19,28 +19,28 @@ public: CSettingTypeRelativePath(const char * Directory, const char * FileName); ~CSettingTypeRelativePath(); - bool IndexBasedSetting ( void ) const { return false; } - SettingType GetSettingType ( void ) const { return SettingType_RelativePath; } - bool IsSettingSet(void) const { return false; } + bool IndexBasedSetting ( void ) const { return false; } + SettingType GetSettingType ( void ) const { return SettingType_RelativePath; } + bool IsSettingSet(void) const { return false; } //return the values - bool Load ( int32_t /*Index*/, bool & /*Value*/ ) const { return false; }; - bool Load ( int32_t /*Index*/, uint32_t & /*Value*/ ) const { return false; }; - bool Load ( int32_t Index, stdstr & Value ) const; + bool Load (uint32_t /*Index*/, bool & /*Value*/ ) const { return false; }; + bool Load (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { return false; }; + bool Load (uint32_t Index, std::string & Value ) const; //return the default values - void LoadDefault ( int32_t Index, bool & Value ) const; - void LoadDefault ( int32_t Index, uint32_t & Value ) const; - void LoadDefault ( int32_t Index, stdstr & Value ) const; + void LoadDefault (uint32_t Index, bool & Value ) const; + void LoadDefault (uint32_t Index, uint32_t & Value ) const; + void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - void Save ( int32_t Index, bool Value ); - void Save ( int32_t Index, uint32_t Value ); - void Save ( int32_t Index, const stdstr & Value ); - void Save ( int32_t Index, const char * Value ); + void Save (uint32_t Index, bool Value ); + void Save (uint32_t Index, uint32_t Value ); + void Save (uint32_t Index, const std::string & Value ); + void Save (uint32_t Index, const char * Value ); // Delete the setting - void Delete ( int32_t Index ); + void Delete (uint32_t Index ); private: CSettingTypeRelativePath(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp index 907806b96..78e774f93 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp @@ -14,9 +14,9 @@ CIniFile * CSettingTypeRomDatabase::m_SettingsIniFile = NULL; CIniFile * CSettingTypeRomDatabase::m_VideoIniFile = NULL; CIniFile * CSettingTypeRomDatabase::m_AudioIniFile = NULL; -stdstr * CSettingTypeRomDatabase::m_SectionIdent = NULL; +std::string * CSettingTypeRomDatabase::m_SectionIdent = NULL; -CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, int DefaultValue, bool DeleteOnDefault) : +CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, uint32_t DefaultValue, bool DeleteOnDefault) : m_KeyName(StripNameSection(Name)), m_DefaultStr(""), m_DefaultValue(DefaultValue), @@ -135,7 +135,7 @@ void CSettingTypeRomDatabase::GameChanged(void * /*Data */) } } -bool CSettingTypeRomDatabase::Load(int Index, bool & Value) const +bool CSettingTypeRomDatabase::Load(uint32_t Index, bool & Value) const { uint32_t temp_value = Value; bool bRes = Load(Index, temp_value); @@ -143,7 +143,7 @@ bool CSettingTypeRomDatabase::Load(int Index, bool & Value) const return bRes; } -bool CSettingTypeRomDatabase::Load(int Index, uint32_t & Value) const +bool CSettingTypeRomDatabase::Load(uint32_t Index, uint32_t & Value) const { bool bRes = false; if (m_VideoSetting) @@ -165,7 +165,7 @@ bool CSettingTypeRomDatabase::Load(int Index, uint32_t & Value) const return bRes; } -bool CSettingTypeRomDatabase::Load(int Index, stdstr & Value) const +bool CSettingTypeRomDatabase::Load(uint32_t Index, std::string & Value) const { stdstr temp_value; bool bRes = false; @@ -193,7 +193,7 @@ bool CSettingTypeRomDatabase::Load(int Index, stdstr & Value) const } //return the default values -void CSettingTypeRomDatabase::LoadDefault(int /*Index*/, bool & Value) const +void CSettingTypeRomDatabase::LoadDefault(uint32_t /*Index*/, bool & Value) const { if (m_DefaultSetting != Default_None) { @@ -207,7 +207,7 @@ void CSettingTypeRomDatabase::LoadDefault(int /*Index*/, bool & Value) const } } -void CSettingTypeRomDatabase::LoadDefault(int /*Index*/, uint32_t & Value) const +void CSettingTypeRomDatabase::LoadDefault(uint32_t /*Index*/, uint32_t & Value) const { if (m_DefaultSetting != Default_None) { @@ -221,7 +221,7 @@ void CSettingTypeRomDatabase::LoadDefault(int /*Index*/, uint32_t & Value) const } } -void CSettingTypeRomDatabase::LoadDefault(int /*Index*/, stdstr & Value) const +void CSettingTypeRomDatabase::LoadDefault(uint32_t /*Index*/, std::string & Value) const { if (m_DefaultSetting != Default_None) { @@ -236,7 +236,7 @@ void CSettingTypeRomDatabase::LoadDefault(int /*Index*/, stdstr & Value) const } //Update the settings -void CSettingTypeRomDatabase::Save(int /*Index*/, bool Value) +void CSettingTypeRomDatabase::Save(uint32_t /*Index*/, bool Value) { if (!g_Settings->LoadBool(Setting_RdbEditor)) { @@ -260,7 +260,7 @@ void CSettingTypeRomDatabase::Save(int /*Index*/, bool Value) } } -void CSettingTypeRomDatabase::Save(int Index, uint32_t Value) +void CSettingTypeRomDatabase::Save(uint32_t Index, uint32_t Value) { if (!g_Settings->LoadBool(Setting_RdbEditor)) { @@ -290,7 +290,7 @@ void CSettingTypeRomDatabase::Save(int Index, uint32_t Value) } } -void CSettingTypeRomDatabase::Save(int /*Index*/, const stdstr & Value) +void CSettingTypeRomDatabase::Save(uint32_t /*Index*/, const std::string & Value) { if (!g_Settings->LoadBool(Setting_RdbEditor)) { @@ -310,7 +310,7 @@ void CSettingTypeRomDatabase::Save(int /*Index*/, const stdstr & Value) } } -void CSettingTypeRomDatabase::Save(int /*Index*/, const char * Value) +void CSettingTypeRomDatabase::Save(uint32_t /*Index*/, const char * Value) { if (!g_Settings->LoadBool(Setting_RdbEditor)) { @@ -330,7 +330,7 @@ void CSettingTypeRomDatabase::Save(int /*Index*/, const char * Value) } } -void CSettingTypeRomDatabase::Delete(int /*Index*/) +void CSettingTypeRomDatabase::Delete(uint32_t /*Index*/) { if (!g_Settings->LoadBool(Setting_RdbEditor)) { diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h index 13631f64c..21ed7f663 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h @@ -19,33 +19,33 @@ class CSettingTypeRomDatabase : public: CSettingTypeRomDatabase(const char * Name, const char * DefaultValue, bool DeleteOnDefault = false); CSettingTypeRomDatabase(const char * Name, bool DefaultValue, bool DeleteOnDefault = false); - CSettingTypeRomDatabase(const char * Name, int32_t DefaultValue, bool DeleteOnDefault = false); + CSettingTypeRomDatabase(const char * Name, uint32_t DefaultValue, bool DeleteOnDefault = false); CSettingTypeRomDatabase(const char * Name, SettingID DefaultSetting, bool DeleteOnDefault = false); virtual ~CSettingTypeRomDatabase(); - virtual bool IndexBasedSetting(void) const { return false; } + virtual bool IndexBasedSetting(void) const { return false; } virtual SettingType GetSettingType(void) const { return SettingType_RomDatabase; } - virtual bool IsSettingSet(void) const { return false; } + virtual bool IsSettingSet(void) const { return false; } //return the values - virtual bool Load(int32_t Index, bool & Value) const; - virtual bool Load(int32_t Index, uint32_t & Value) const; - virtual bool Load(int32_t Index, stdstr & Value) const; + virtual bool Load(uint32_t Index, bool & Value) const; + virtual bool Load(uint32_t Index, uint32_t & Value) const; + virtual bool Load(uint32_t Index, std::string & Value) const; //return the default values - virtual void LoadDefault(int32_t Index, bool & Value) const; - virtual void LoadDefault(int32_t Index, uint32_t & Value) const; - virtual void LoadDefault(int32_t Index, stdstr & Value) const; + virtual void LoadDefault(uint32_t Index, bool & Value) const; + virtual void LoadDefault(uint32_t Index, uint32_t & Value) const; + virtual void LoadDefault(uint32_t Index, std::string & Value) const; //Update the settings - virtual void Save(int32_t Index, bool Value); - virtual void Save(int32_t Index, uint32_t Value); - virtual void Save(int32_t Index, const stdstr & Value); - virtual void Save(int32_t Index, const char * Value); + virtual void Save(uint32_t Index, bool Value); + virtual void Save(uint32_t Index, uint32_t Value); + virtual void Save(uint32_t Index, const std::string & Value); + virtual void Save(uint32_t Index, const char * Value); // Delete the setting - virtual void Delete(int32_t Index); + virtual void Delete(uint32_t Index); static void Initialize(void); static void CleanUp(void); @@ -59,15 +59,15 @@ protected: static const char * StripNameSection(const char * Name); virtual const char * Section(void) const { return m_SectionIdent->c_str(); } - mutable stdstr m_KeyName; + mutable std::string m_KeyName; const char *const m_DefaultStr; - const int32_t m_DefaultValue; - const SettingID m_DefaultSetting; - const bool m_DeleteOnDefault; - bool m_VideoSetting; - bool m_AudioSetting; + const int32_t m_DefaultValue; + const SettingID m_DefaultSetting; + const bool m_DeleteOnDefault; + bool m_VideoSetting; + bool m_AudioSetting; - static stdstr * m_SectionIdent; + static std::string * m_SectionIdent; static CIniFile * m_SettingsIniFile; static CIniFile * m_VideoIniFile; static CIniFile * m_AudioIniFile; diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp index 8c02eb3b3..3a388b02b 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp @@ -26,8 +26,8 @@ CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(const char * PreIndex { } -CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, int DefaultValue ) : - CSettingTypeRomDatabase("",DefaultValue), +CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, uint32_t DefaultValue ) : + CSettingTypeRomDatabase("",DefaultValue, false), m_PreIndex(PreIndex), m_PostIndex(PostIndex) { @@ -44,63 +44,63 @@ CSettingTypeRomDatabaseIndex::~CSettingTypeRomDatabaseIndex() { } -bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, bool & /*Value*/ ) const +bool CSettingTypeRomDatabaseIndex::Load (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, uint32_t & /*Value*/ ) const +bool CSettingTypeRomDatabaseIndex::Load (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeRomDatabaseIndex::Load ( int Index, stdstr & Value ) const +bool CSettingTypeRomDatabaseIndex::Load (uint32_t Index, std::string & Value ) const { - m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyName = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); return CSettingTypeRomDatabase::Load(0,Value); } -void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, bool & Value ) const +void CSettingTypeRomDatabaseIndex::LoadDefault (uint32_t Index, bool & Value ) const { - m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyName = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); CSettingTypeRomDatabase::LoadDefault(0,Value); } -void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, uint32_t & Value ) const +void CSettingTypeRomDatabaseIndex::LoadDefault (uint32_t Index, uint32_t & Value ) const { - m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyName = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); CSettingTypeRomDatabase::LoadDefault(0,Value); } -void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, stdstr & Value ) const +void CSettingTypeRomDatabaseIndex::LoadDefault (uint32_t Index, std::string & Value ) const { - m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); + m_KeyName = stdstr_f("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str()); CSettingTypeRomDatabase::LoadDefault(0,Value); } -void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, bool /*Value*/ ) +void CSettingTypeRomDatabaseIndex::Save (uint32_t /*Index*/, bool /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, uint32_t /*Value*/ ) +void CSettingTypeRomDatabaseIndex::Save (uint32_t /*Index*/, uint32_t /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, const stdstr & /*Value*/ ) +void CSettingTypeRomDatabaseIndex::Save (uint32_t /*Index*/, const std::string & /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, const char * /*Value*/ ) +void CSettingTypeRomDatabaseIndex::Save (uint32_t /*Index*/, const char * /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeRomDatabaseIndex::Delete ( int /*Index*/ ) +void CSettingTypeRomDatabaseIndex::Delete (uint32_t /*Index*/ ) { m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.h index 2d638a12f..56e8f277f 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.h @@ -16,36 +16,36 @@ class CSettingTypeRomDatabaseIndex : public: CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, const char * DefaultValue ); CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, bool DefaultValue ); - CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, int32_t DefaultValue ); + CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, uint32_t DefaultValue ); CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, SettingID DefaultSetting ); virtual ~CSettingTypeRomDatabaseIndex(); - virtual bool IndexBasedSetting ( void ) const { return true; } + virtual bool IndexBasedSetting ( void ) const { return true; } //return the values - virtual bool Load ( int32_t Index, bool & Value ) const; - virtual bool Load ( int32_t Index, uint32_t & Value ) const; - virtual bool Load ( int32_t Index, stdstr & Value ) const; + virtual bool Load (uint32_t Index, bool & Value ) const; + virtual bool Load (uint32_t Index, uint32_t & Value ) const; + virtual bool Load (uint32_t Index, std::string & Value ) const; //return the default values - virtual void LoadDefault ( int32_t Index, bool & Value ) const; - virtual void LoadDefault ( int32_t Index, uint32_t & Value ) const; - virtual void LoadDefault ( int32_t Index, stdstr & Value ) const; + virtual void LoadDefault (uint32_t Index, bool & Value ) const; + virtual void LoadDefault (uint32_t Index, uint32_t & Value ) const; + virtual void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - virtual void Save ( int32_t Index, bool Value ); - virtual void Save ( int32_t Index, uint32_t Value ); - virtual void Save ( int32_t Index, const stdstr & Value ); - virtual void Save ( int32_t Index, const char * Value ); + virtual void Save (uint32_t Index, bool Value ); + virtual void Save (uint32_t Index, uint32_t Value ); + virtual void Save (uint32_t Index, const std::string & Value ); + virtual void Save (uint32_t Index, const char * Value ); // Delete the setting - virtual void Delete ( int32_t Index ); + virtual void Delete (uint32_t Index ); private: CSettingTypeRomDatabaseIndex(void); // Disable default constructor CSettingTypeRomDatabaseIndex(const CSettingTypeRomDatabaseIndex&); // Disable copy constructor CSettingTypeRomDatabaseIndex& operator=(const CSettingTypeRomDatabaseIndex&); // Disable assignment - stdstr m_PreIndex, m_PostIndex; + std::string m_PreIndex, m_PostIndex; }; diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp index 0ceae78aa..3349a1268 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp @@ -11,7 +11,7 @@ #include "stdafx.h" #include "SettingsType-RomDatabaseSetting.h" -CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, int DefaultValue, bool DeleteOnDefault) : +CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, uint32_t DefaultValue, bool DeleteOnDefault) : CSettingTypeRomDatabase(Name, DefaultValue, DeleteOnDefault), m_SectionIdent(SectionIdent) { diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.h index 3e7920162..c86a78437 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.h @@ -18,7 +18,7 @@ class CSettingTypeRomDatabaseSetting : public: CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, const char * DefaultValue, bool DeleteOnDefault = false ); CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, bool DefaultValue, bool DeleteOnDefault = false ); - CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, int DefaultValue, bool DeleteOnDefault = false ); + CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, uint32_t DefaultValue, bool DeleteOnDefault = false ); CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, SettingID DefaultSetting, bool DeleteOnDefault = false ); virtual ~CSettingTypeRomDatabaseSetting(); diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp index 059b0419e..b3015c570 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp @@ -36,63 +36,63 @@ bool CSettingTypeSelectedDirectory::IsSettingSet(void) const return g_Settings->IsSettingSet(DirSettingId); } -bool CSettingTypeSelectedDirectory::Load(int /*Index*/, bool & /*Value*/) const +bool CSettingTypeSelectedDirectory::Load(uint32_t /*Index*/, bool & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeSelectedDirectory::Load(int /*Index*/, uint32_t & /*Value*/) const +bool CSettingTypeSelectedDirectory::Load(uint32_t /*Index*/, uint32_t & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeSelectedDirectory::Load(int /*Index*/, stdstr & Value) const +bool CSettingTypeSelectedDirectory::Load(uint32_t /*Index*/, std::string & Value) const { SettingID DirSettingId = g_Settings->LoadBool(m_UseSelected) ? m_SelectedDir : m_InitialDir; return g_Settings->LoadStringVal(DirSettingId, Value); } //return the default values -void CSettingTypeSelectedDirectory::LoadDefault(int /*Index*/, bool & /*Value*/) const +void CSettingTypeSelectedDirectory::LoadDefault(uint32_t /*Index*/, bool & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeSelectedDirectory::LoadDefault(int /*Index*/, uint32_t & /*Value*/) const +void CSettingTypeSelectedDirectory::LoadDefault(uint32_t /*Index*/, uint32_t & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeSelectedDirectory::LoadDefault(int /*Index*/, stdstr & /*Value*/) const +void CSettingTypeSelectedDirectory::LoadDefault(uint32_t /*Index*/, std::string & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings -void CSettingTypeSelectedDirectory::Save(int /*Index*/, bool /*Value*/) +void CSettingTypeSelectedDirectory::Save(uint32_t /*Index*/, bool /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeSelectedDirectory::Save(int /*Index*/, uint32_t /*Value*/) +void CSettingTypeSelectedDirectory::Save(uint32_t /*Index*/, uint32_t /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeSelectedDirectory::Save(int Index, const stdstr & Value) +void CSettingTypeSelectedDirectory::Save(uint32_t Index, const std::string & Value) { Save(Index, Value.c_str()); } -void CSettingTypeSelectedDirectory::Save(int /*Index*/, const char * Value) +void CSettingTypeSelectedDirectory::Save(uint32_t /*Index*/, const char * Value) { g_Settings->SaveBool(m_UseSelected, true); g_Settings->SaveString(m_SelectedDir, Value); } -void CSettingTypeSelectedDirectory::Delete(int /*Index*/) +void CSettingTypeSelectedDirectory::Delete(uint32_t /*Index*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.h b/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.h index 144507058..d47fc58dd 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.h @@ -19,30 +19,30 @@ public: CSettingTypeSelectedDirectory(const char * Name, SettingID InitialDir, SettingID SelectedDir, SettingID UseSelected, SettingID NotifyChangeId); ~CSettingTypeSelectedDirectory(); - virtual bool IndexBasedSetting(void) const { return false; } + virtual bool IndexBasedSetting(void) const { return false; } virtual SettingType GetSettingType(void) const { return SettingType_SelectedDirectory; } - virtual bool IsSettingSet(void) const; + virtual bool IsSettingSet(void) const; const char * GetName(void) const { return m_Name.c_str(); } //return the values - virtual bool Load(int32_t Index, bool & Value) const; - virtual bool Load(int32_t Index, uint32_t & Value) const; - virtual bool Load(int32_t Index, stdstr & Value) const; + virtual bool Load(uint32_t Index, bool & Value) const; + virtual bool Load(uint32_t Index, uint32_t & Value) const; + virtual bool Load(uint32_t Index, std::string & Value) const; //return the default values - virtual void LoadDefault(int32_t Index, bool & Value) const; - virtual void LoadDefault(int32_t Index, uint32_t & Value) const; - virtual void LoadDefault(int32_t Index, stdstr & Value) const; + virtual void LoadDefault(uint32_t Index, bool & Value) const; + virtual void LoadDefault(uint32_t Index, uint32_t & Value) const; + virtual void LoadDefault(uint32_t Index, std::string & Value) const; //Update the settings - virtual void Save(int32_t Index, bool Value); - virtual void Save(int32_t Index, uint32_t Value); - virtual void Save(int32_t Index, const stdstr & Value); - virtual void Save(int32_t Index, const char * Value); + virtual void Save(uint32_t Index, bool Value); + virtual void Save(uint32_t Index, uint32_t Value); + virtual void Save(uint32_t Index, const std::string & Value); + virtual void Save(uint32_t Index, const char * Value); // Delete the setting - virtual void Delete(int32_t Index); + virtual void Delete(uint32_t Index); private: CSettingTypeSelectedDirectory(void); // Disable default constructor @@ -56,4 +56,4 @@ private: SettingID m_SelectedDir; SettingID m_UseSelected; SettingID m_NotifyChangeId; -}; +}; \ No newline at end of file diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp index 13a0231d8..7011821a6 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp @@ -21,61 +21,61 @@ CSettingTypeTempBool::~CSettingTypeTempBool(void) { } -bool CSettingTypeTempBool::Load(int /*Index*/, bool & Value) const +bool CSettingTypeTempBool::Load(uint32_t /*Index*/, bool & Value) const { Value = m_value; return true; } -bool CSettingTypeTempBool::Load(int /*Index*/, uint32_t & Value) const +bool CSettingTypeTempBool::Load(uint32_t /*Index*/, uint32_t & Value) const { Value = m_value ? 1 : 0; return true; } -bool CSettingTypeTempBool::Load(int /*Index*/, stdstr & /*Value*/) const +bool CSettingTypeTempBool::Load(uint32_t /*Index*/, std::string & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values -void CSettingTypeTempBool::LoadDefault(int /*Index*/, bool & /*Value*/) const +void CSettingTypeTempBool::LoadDefault(uint32_t /*Index*/, bool & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempBool::LoadDefault(int /*Index*/, uint32_t & /*Value*/) const +void CSettingTypeTempBool::LoadDefault(uint32_t /*Index*/, uint32_t & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempBool::LoadDefault(int /*Index*/, stdstr & /*Value*/) const +void CSettingTypeTempBool::LoadDefault(uint32_t /*Index*/, std::string & /*Value*/) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempBool::Save(int /*Index*/, bool Value) +void CSettingTypeTempBool::Save(uint32_t /*Index*/, bool Value) { m_value = Value; } -void CSettingTypeTempBool::Save(int /*Index*/, uint32_t /*Value*/) +void CSettingTypeTempBool::Save(uint32_t /*Index*/, uint32_t /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempBool::Save(int /*Index*/, const stdstr & /*Value*/) +void CSettingTypeTempBool::Save(uint32_t /*Index*/, const std::string & /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempBool::Save(int /*Index*/, const char * /*Value*/) +void CSettingTypeTempBool::Save(uint32_t /*Index*/, const char * /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempBool::Delete(int /*Index*/) +void CSettingTypeTempBool::Delete(uint32_t /*Index*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } \ No newline at end of file diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.h b/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.h index 51218c40c..81891a00a 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.h @@ -19,30 +19,30 @@ public: CSettingTypeTempBool(bool initialValue, const char * name = NULL); ~CSettingTypeTempBool(); - bool IndexBasedSetting(void) const { return false; } + bool IndexBasedSetting(void) const { return false; } SettingType GetSettingType(void) const { return SettingType_BoolVariable; } - bool IsSettingSet(void) const { return false; } + bool IsSettingSet(void) const { return false; } const char * GetName(void) const { return m_Name.c_str(); } //return the values - bool Load(int32_t Index, bool & Value) const; - bool Load(int32_t Index, uint32_t & Value) const; - bool Load(int32_t Index, stdstr & Value) const; + bool Load(uint32_t Index, bool & Value) const; + bool Load(uint32_t Index, uint32_t & Value) const; + bool Load(uint32_t Index, std::string & Value) const; //return the default values - void LoadDefault(int32_t Index, bool & Value) const; - void LoadDefault(int32_t Index, uint32_t & Value) const; - void LoadDefault(int32_t Index, stdstr & Value) const; + void LoadDefault(uint32_t Index, bool & Value) const; + void LoadDefault(uint32_t Index, uint32_t & Value) const; + void LoadDefault(uint32_t Index, std::string & Value) const; //Update the settings - void Save(int32_t Index, bool Value); - void Save(int32_t Index, uint32_t Value); - void Save(int32_t Index, const stdstr & Value); - void Save(int32_t Index, const char * Value); + void Save(uint32_t Index, bool Value); + void Save(uint32_t Index, uint32_t Value); + void Save(uint32_t Index, const std::string & Value); + void Save(uint32_t Index, const char * Value); // Delete the setting - void Delete(int32_t Index); + void Delete(uint32_t Index); private: CSettingTypeTempBool(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp index 45381bca5..e84ba45e4 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp @@ -21,61 +21,61 @@ CSettingTypeTempNumber::~CSettingTypeTempNumber ( void ) { } -bool CSettingTypeTempNumber::Load ( int /*Index*/, bool & /*Value*/ ) const +bool CSettingTypeTempNumber::Load (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return true; } -bool CSettingTypeTempNumber::Load ( int /*Index*/, uint32_t & Value ) const +bool CSettingTypeTempNumber::Load (uint32_t /*Index*/, uint32_t & Value ) const { Value = m_value; return false; } -bool CSettingTypeTempNumber::Load ( int /*Index*/, stdstr & /*Value*/ ) const +bool CSettingTypeTempNumber::Load (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values -void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const +void CSettingTypeTempNumber::LoadDefault (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, uint32_t & Value ) const +void CSettingTypeTempNumber::LoadDefault (uint32_t /*Index*/, uint32_t & Value ) const { Value = m_initialValue; } -void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const +void CSettingTypeTempNumber::LoadDefault (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempNumber::Save ( int /*Index*/, bool /*Value*/ ) +void CSettingTypeTempNumber::Save (uint32_t /*Index*/, bool /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempNumber::Save ( int /*Index*/, uint32_t Value ) +void CSettingTypeTempNumber::Save (uint32_t /*Index*/, uint32_t Value ) { m_value = Value; } -void CSettingTypeTempNumber::Save ( int /*Index*/, const stdstr & /*Value*/ ) +void CSettingTypeTempNumber::Save (uint32_t /*Index*/, const std::string & /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempNumber::Save ( int /*Index*/, const char * /*Value*/ ) +void CSettingTypeTempNumber::Save (uint32_t /*Index*/, const char * /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempNumber::Delete( int /*Index*/ ) +void CSettingTypeTempNumber::Delete(uint32_t /*Index*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.h b/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.h index 03423744d..47931361c 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.h @@ -19,28 +19,28 @@ public: CSettingTypeTempNumber(uint32_t initialValue); ~CSettingTypeTempNumber(); - bool IndexBasedSetting ( void ) const { return false; } - SettingType GetSettingType ( void ) const { return SettingType_NumberVariable; } - bool IsSettingSet(void) const { return false; } + bool IndexBasedSetting ( void ) const { return false; } + SettingType GetSettingType ( void ) const { return SettingType_NumberVariable; } + bool IsSettingSet(void) const { return false; } //return the values - bool Load ( int32_t Index, bool & Value ) const; - bool Load ( int32_t Index, uint32_t & Value ) const; - bool Load ( int32_t Index, stdstr & Value ) const; + bool Load (uint32_t Index, bool & Value ) const; + bool Load (uint32_t Index, uint32_t & Value ) const; + bool Load (uint32_t Index, std::string & Value ) const; //return the default values - void LoadDefault ( int32_t Index, bool & Value ) const; - void LoadDefault ( int32_t Index, uint32_t & Value ) const; - void LoadDefault ( int32_t Index, stdstr & Value ) const; + void LoadDefault (uint32_t Index, bool & Value ) const; + void LoadDefault (uint32_t Index, uint32_t & Value ) const; + void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - void Save ( int32_t Index, bool Value ); - void Save ( int32_t Index, uint32_t Value ); - void Save ( int32_t Index, const stdstr & Value ); - void Save ( int32_t Index, const char * Value ); + void Save (uint32_t Index, bool Value ); + void Save (uint32_t Index, uint32_t Value ); + void Save (uint32_t Index, const std::string & Value ); + void Save (uint32_t Index, const char * Value ); // Delete the setting - void Delete ( int32_t Index ); + void Delete (uint32_t Index ); private: CSettingTypeTempNumber(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp index 940365701..f85fca2fe 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp @@ -20,61 +20,61 @@ CSettingTypeTempString::~CSettingTypeTempString ( void ) { } -bool CSettingTypeTempString::Load ( int /*Index*/, bool & /*Value*/ ) const +bool CSettingTypeTempString::Load (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeTempString::Load ( int /*Index*/, uint32_t & /*Value*/ ) const +bool CSettingTypeTempString::Load (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -bool CSettingTypeTempString::Load ( int /*Index*/, stdstr & Value ) const +bool CSettingTypeTempString::Load (uint32_t /*Index*/, std::string & Value ) const { Value = m_value; return true; } //return the default values -void CSettingTypeTempString::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const +void CSettingTypeTempString::LoadDefault (uint32_t /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempString::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const +void CSettingTypeTempString::LoadDefault (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempString::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const +void CSettingTypeTempString::LoadDefault (uint32_t /*Index*/, std::string & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempString::Save ( int /*Index*/, bool /*Value*/ ) +void CSettingTypeTempString::Save (uint32_t /*Index*/, bool /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempString::Save ( int /*Index*/, uint32_t /*Value*/ ) +void CSettingTypeTempString::Save (uint32_t /*Index*/, uint32_t /*Value*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettingTypeTempString::Save ( int /*Index*/, const stdstr & Value ) +void CSettingTypeTempString::Save (uint32_t /*Index*/, const std::string & Value ) { m_value = Value; } -void CSettingTypeTempString::Save ( int /*Index*/, const char * Value ) +void CSettingTypeTempString::Save (uint32_t /*Index*/, const char * Value ) { m_value = Value; } -void CSettingTypeTempString::Delete( int /*Index*/ ) +void CSettingTypeTempString::Delete(uint32_t /*Index*/ ) { g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h index f33bc6bb7..9976adb8a 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h @@ -19,28 +19,28 @@ public: CSettingTypeTempString(const char * initialValue); ~CSettingTypeTempString(); - bool IndexBasedSetting ( void ) const { return false; } - SettingType GetSettingType ( void ) const { return SettingType_StringVariable; } - bool IsSettingSet(void) const { return false; } + bool IndexBasedSetting ( void ) const { return false; } + SettingType GetSettingType ( void ) const { return SettingType_StringVariable; } + bool IsSettingSet(void) const { return false; } //return the values - bool Load ( int32_t Index, bool & Value ) const; - bool Load ( int32_t Index, uint32_t & Value ) const; - bool Load ( int32_t Index, stdstr & Value ) const; + bool Load (uint32_t Index, bool & Value ) const; + bool Load (uint32_t Index, uint32_t & Value ) const; + bool Load (uint32_t Index, std::string & Value ) const; //return the default values - void LoadDefault ( int32_t Index, bool & Value ) const; - void LoadDefault ( int32_t Index, uint32_t & Value ) const; - void LoadDefault ( int32_t Index, stdstr & Value ) const; + void LoadDefault (uint32_t Index, bool & Value ) const; + void LoadDefault (uint32_t Index, uint32_t & Value ) const; + void LoadDefault (uint32_t Index, std::string & Value ) const; //Update the settings - void Save ( int32_t Index, bool Value ); - void Save ( int32_t Index, uint32_t Value ); - void Save ( int32_t Index, const stdstr & Value ); - void Save ( int32_t Index, const char * Value ); + void Save (uint32_t Index, bool Value ); + void Save (uint32_t Index, uint32_t Value ); + void Save (uint32_t Index, const std::string & Value ); + void Save (uint32_t Index, const char * Value ); // Delete the setting - void Delete ( int32_t Index ); + void Delete (uint32_t Index ); private: CSettingTypeTempString(void); // Disable default constructor diff --git a/Source/Project64-core/Settings/SettingsClass.cpp b/Source/Project64-core/Settings/SettingsClass.cpp index d9c184fd7..fda4c6b3e 100644 --- a/Source/Project64-core/Settings/SettingsClass.cpp +++ b/Source/Project64-core/Settings/SettingsClass.cpp @@ -129,14 +129,14 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Setting_LanguageDir, new CSettingTypeApplicationPath("Lang Directory", "Directory", Setting_LanguageDirDefault)); AddHandler(Rdb_GoodName, new CSettingTypeRomDatabase("Good Name", Game_GameName)); - AddHandler(Rdb_SaveChip, new CSettingTypeRDBSaveChip("Save Type", SaveChip_Auto)); + AddHandler(Rdb_SaveChip, new CSettingTypeRDBSaveChip("Save Type", (uint32_t)SaveChip_Auto)); #ifdef _DEBUG AddHandler(Rdb_CpuType, new CSettingTypeRDBCpuType("CPU Type", CPU_SyncCores)); #else AddHandler(Rdb_CpuType, new CSettingTypeRDBCpuType("CPU Type", CPU_Recompiler)); #endif AddHandler(Rdb_RDRamSize, new CSettingTypeRDBRDRamSize("RDRAM Size", 0x400000)); - AddHandler(Rdb_CounterFactor, new CSettingTypeRomDatabase("Counter Factor", 2)); + AddHandler(Rdb_CounterFactor, new CSettingTypeRomDatabase("Counter Factor", (uint32_t)2)); AddHandler(Rdb_UseTlb, new CSettingTypeRDBYesNo("Use TLB", true)); AddHandler(Rdb_DelayDP, new CSettingTypeRDBYesNo("Delay DP", true)); AddHandler(Rdb_DelaySi, new CSettingTypeRDBYesNo("Delay SI", false)); @@ -145,14 +145,14 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Rdb_FixedAudio, new CSettingTypeRomDatabase("Fixed Audio", true)); AddHandler(Rdb_SyncViaAudio, new CSettingTypeRomDatabase("Audio-Sync Audio", true)); AddHandler(Rdb_RspAudioSignal, new CSettingTypeRDBYesNo("Audio Signal", false)); - AddHandler(Rdb_TLB_VAddrStart, new CSettingTypeRomDatabase("TLB: Vaddr Start", 0)); - AddHandler(Rdb_TLB_VAddrLen, new CSettingTypeRomDatabase("TLB: Vaddr Len", 0)); - AddHandler(Rdb_TLB_PAddrStart, new CSettingTypeRomDatabase("TLB: PAddr Start", 0)); + AddHandler(Rdb_TLB_VAddrStart, new CSettingTypeRomDatabase("TLB: Vaddr Start", (uint32_t)0)); + AddHandler(Rdb_TLB_VAddrLen, new CSettingTypeRomDatabase("TLB: Vaddr Len", (uint32_t)0)); + AddHandler(Rdb_TLB_PAddrStart, new CSettingTypeRomDatabase("TLB: PAddr Start", (uint32_t)0)); AddHandler(Rdb_UseHleGfx, new CSettingTypeRomDatabase("HLE GFX", Plugin_UseHleGfx)); AddHandler(Rdb_UseHleAudio, new CSettingTypeRomDatabase("HLE Audio", Plugin_UseHleAudio)); AddHandler(Rdb_LoadRomToMemory, new CSettingTypeRomDatabase("Rom In Memory", false)); - AddHandler(Rdb_ScreenHertz, new CSettingTypeRomDatabase("ScreenHertz", 0)); - AddHandler(Rdb_FuncLookupMode, new CSettingTypeRomDatabase("FuncFind", FuncFind_PhysicalLookup)); + AddHandler(Rdb_ScreenHertz, new CSettingTypeRomDatabase("ScreenHertz", (uint32_t)0)); + AddHandler(Rdb_FuncLookupMode, new CSettingTypeRomDatabase("FuncFind", (uint32_t)FuncFind_PhysicalLookup)); AddHandler(Rdb_RegCache, new CSettingTypeRDBYesNo("Reg Cache", true)); AddHandler(Rdb_BlockLinking, new CSettingTypeRDBOnOff("Linking", true)); AddHandler(Rdb_SMM_Cache, new CSettingTypeRomDatabase("SMM-Cache", true)); @@ -163,12 +163,12 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Rdb_SMM_ValidFunc, new CSettingTypeRomDatabase("SMM-FUNC", true)); AddHandler(Rdb_GameCheatFix, new CSettingTypeRomDatabaseIndex("Cheat", "", "")); AddHandler(Rdb_GameCheatFixPlugin, new CSettingTypeRomDatabaseIndex("CheatPlugin", "", "")); - AddHandler(Rdb_ViRefreshRate, new CSettingTypeRomDatabase("ViRefresh", 1500)); - AddHandler(Rdb_AiCountPerBytes, new CSettingTypeRomDatabase("AiCountPerBytes", 0)); + AddHandler(Rdb_ViRefreshRate, new CSettingTypeRomDatabase("ViRefresh", (uint32_t)1500)); + AddHandler(Rdb_AiCountPerBytes, new CSettingTypeRomDatabase("AiCountPerBytes", (uint32_t)0)); AddHandler(Rdb_AudioResetOnLoad, new CSettingTypeRDBYesNo("AudioResetOnLoad", false)); AddHandler(Rdb_AllowROMWrites, new CSettingTypeRDBYesNo("AllowROMWrites", false)); AddHandler(Rdb_CRC_Recalc, new CSettingTypeRDBYesNo("CRC-Recalc", false)); - AddHandler(Rdb_OverClockModifier, new CSettingTypeRomDatabase("OverClockModifier", 1)); + AddHandler(Rdb_OverClockModifier, new CSettingTypeRomDatabase("OverClockModifier", (uint32_t)1)); AddHandler(Game_IniKey, new CSettingTypeTempString("")); AddHandler(Game_File, new CSettingTypeTempString("")); @@ -479,7 +479,7 @@ uint32_t CSettings::GetSetting(CSettings * _this, SettingID Type) return _this->LoadDword(Type); } -const char * CSettings::GetSettingSz(CSettings * _this, SettingID Type, char * Buffer, int BufferSize) +const char * CSettings::GetSettingSz(CSettings * _this, SettingID Type, char * Buffer, uint32_t BufferSize) { if (Buffer && BufferSize > 0) { @@ -561,7 +561,7 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau _this->m_NextAutoSettingId += 1; if (DefaultID == Default_None) { - _this->AddHandler(RdbSetting, new CSettingTypeRomDatabase(Name.c_str(), (int)Value)); + _this->AddHandler(RdbSetting, new CSettingTypeRomDatabase(Name.c_str(), Value)); _this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), RdbSetting)); } else @@ -594,7 +594,7 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau case Data_DWORD: if (DefaultID == Default_None) { - _this->AddHandler(ID, new CSettingTypeRomDatabase(DefaultStr, (int)Value, true)); + _this->AddHandler(ID, new CSettingTypeRomDatabase(DefaultStr, Value, true)); } else { @@ -621,7 +621,7 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau case Data_DWORD: if (DefaultID == Default_None) { - _this->AddHandler(ID, new CSettingTypeRomDatabaseSetting(Category, DefaultStr, (int)Value, true)); + _this->AddHandler(ID, new CSettingTypeRomDatabaseSetting(Category, DefaultStr, Value, true)); } else { @@ -681,14 +681,14 @@ bool CSettings::LoadBool(SettingID Type, bool & Value) return false; } -bool CSettings::LoadBoolIndex(SettingID Type, int index) +bool CSettings::LoadBoolIndex(SettingID Type, uint32_t index) { bool Value = false; LoadBoolIndex(Type, index, Value); return Value; } -bool CSettings::LoadBoolIndex(SettingID Type, int index, bool & Value) +bool CSettings::LoadBoolIndex(SettingID Type, uint32_t index, bool & Value) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -735,14 +735,14 @@ bool CSettings::LoadDword(SettingID Type, uint32_t & Value) return false; } -uint32_t CSettings::LoadDwordIndex(SettingID Type, int index) +uint32_t CSettings::LoadDwordIndex(SettingID Type, uint32_t index) { uint32_t Value; LoadDwordIndex(Type, index, Value); return Value; } -bool CSettings::LoadDwordIndex(SettingID Type, int index, uint32_t & Value) +bool CSettings::LoadDwordIndex(SettingID Type, uint32_t index, uint32_t & Value) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -762,14 +762,14 @@ bool CSettings::LoadDwordIndex(SettingID Type, int index, uint32_t & Value) return false; } -stdstr CSettings::LoadStringVal(SettingID Type) +std::string CSettings::LoadStringVal(SettingID Type) { - stdstr Value; + std::string Value; LoadStringVal(Type, Value); return Value; } -bool CSettings::LoadStringVal(SettingID Type, stdstr & Value) +bool CSettings::LoadStringVal(SettingID Type, std::string & Value) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -789,7 +789,7 @@ bool CSettings::LoadStringVal(SettingID Type, stdstr & Value) return false; } -bool CSettings::LoadStringVal(SettingID Type, char * Buffer, int BufferSize) +bool CSettings::LoadStringVal(SettingID Type, char * Buffer, uint32_t BufferSize) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -817,14 +817,14 @@ bool CSettings::LoadStringVal(SettingID Type, char * Buffer, int BufferSize) return bRes; } -stdstr CSettings::LoadStringIndex(SettingID Type, int index) +std::string CSettings::LoadStringIndex(SettingID Type, uint32_t index) { - stdstr Value; + std::string Value; LoadStringIndex(Type, index, Value); return Value; } -bool CSettings::LoadStringIndex(SettingID Type, int index, stdstr & Value) +bool CSettings::LoadStringIndex(SettingID Type, uint32_t index, std::string & Value) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -844,7 +844,7 @@ bool CSettings::LoadStringIndex(SettingID Type, int index, stdstr & Value) return false; } -bool CSettings::LoadStringIndex(SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/) +bool CSettings::LoadStringIndex(SettingID /*Type*/, uint32_t /*index*/, char * /*Buffer*/, uint32_t /*BufferSize*/) { g_Notify->BreakPoint(__FILE__, __LINE__); return false; @@ -879,13 +879,13 @@ void CSettings::LoadDefaultBool(SettingID Type, bool & Value) } } -bool CSettings::LoadDefaultBoolIndex(SettingID /*Type*/, int /*index*/) +bool CSettings::LoadDefaultBoolIndex(SettingID /*Type*/, uint32_t /*index*/) { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -void CSettings::LoadDefaultBoolIndex(SettingID /*Type*/, int /*index*/, bool & /*Value*/) +void CSettings::LoadDefaultBoolIndex(SettingID /*Type*/, uint32_t /*index*/, bool & /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } @@ -918,25 +918,25 @@ void CSettings::LoadDefaultDword(SettingID Type, uint32_t & Value) } } -uint32_t CSettings::LoadDefaultDwordIndex(SettingID /*Type*/, int /*index*/) +uint32_t CSettings::LoadDefaultDwordIndex(SettingID /*Type*/, uint32_t /*index*/) { g_Notify->BreakPoint(__FILE__, __LINE__); return false; } -void CSettings::LoadDefaultDwordIndex(SettingID /*Type*/, int /*index*/, uint32_t & /*Value*/) +void CSettings::LoadDefaultDwordIndex(SettingID /*Type*/, uint32_t /*index*/, uint32_t & /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -stdstr CSettings::LoadDefaultString(SettingID Type) +std::string CSettings::LoadDefaultString(SettingID Type) { stdstr Value; LoadDefaultString(Type, Value); return Value; } -void CSettings::LoadDefaultString(SettingID Type, stdstr & Value) +void CSettings::LoadDefaultString(SettingID Type, std::string & Value) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -957,23 +957,23 @@ void CSettings::LoadDefaultString(SettingID Type, stdstr & Value) } } -void CSettings::LoadDefaultString(SettingID /*Type*/, char * /*Buffer*/, int /*BufferSize*/) +void CSettings::LoadDefaultString(SettingID /*Type*/, char * /*Buffer*/, uint32_t /*BufferSize*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -stdstr CSettings::LoadDefaultStringIndex(SettingID /*Type*/, int /*index*/) +std::string CSettings::LoadDefaultStringIndex(SettingID /*Type*/, uint32_t /*index*/) { g_Notify->BreakPoint(__FILE__, __LINE__); return ""; } -void CSettings::LoadDefaultStringIndex(SettingID /*Type*/, int /*index*/, stdstr & /*Value*/) +void CSettings::LoadDefaultStringIndex(SettingID /*Type*/, uint32_t /*index*/, std::string & /*Value*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } -void CSettings::LoadDefaultStringIndex(SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/) +void CSettings::LoadDefaultStringIndex(SettingID /*Type*/, uint32_t /*index*/, char * /*Buffer*/, uint32_t /*BufferSize*/) { g_Notify->BreakPoint(__FILE__, __LINE__); } @@ -998,7 +998,7 @@ void CSettings::SaveBool(SettingID Type, bool Value) NotifyCallBacks(Type); } -void CSettings::SaveBoolIndex(SettingID Type, int index, bool Value) +void CSettings::SaveBoolIndex(SettingID Type, uint32_t index, bool Value) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -1038,7 +1038,7 @@ void CSettings::SaveDword(SettingID Type, uint32_t Value) NotifyCallBacks(Type); } -void CSettings::SaveDwordIndex(SettingID Type, int index, uint32_t Value) +void CSettings::SaveDwordIndex(SettingID Type, uint32_t index, uint32_t Value) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -1058,7 +1058,7 @@ void CSettings::SaveDwordIndex(SettingID Type, int index, uint32_t Value) NotifyCallBacks(Type); } -void CSettings::SaveString(SettingID Type, const stdstr & Value) +void CSettings::SaveString(SettingID Type, const std::string & Value) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -1097,7 +1097,7 @@ void CSettings::SaveString(SettingID Type, const char * Buffer) NotifyCallBacks(Type); } -void CSettings::SaveStringIndex(SettingID Type, int index, const char * Buffer) +void CSettings::SaveStringIndex(SettingID Type, uint32_t index, const char * Buffer) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) @@ -1116,7 +1116,7 @@ void CSettings::SaveStringIndex(SettingID Type, int index, const char * Buffer) NotifyCallBacks(Type); } -void CSettings::SaveStringIndex(SettingID Type, int index, const stdstr & Value) +void CSettings::SaveStringIndex(SettingID Type, uint32_t index, const std::string & Value) { SaveStringIndex(Type, index, Value.c_str()); } @@ -1140,7 +1140,7 @@ void CSettings::DeleteSetting(SettingID Type) NotifyCallBacks(Type); } -void CSettings::DeleteSettingIndex(SettingID Type, int index) +void CSettings::DeleteSettingIndex(SettingID Type, uint32_t index) { SETTING_HANDLER FindInfo = m_SettingInfo.find(Type); if (FindInfo == m_SettingInfo.end()) diff --git a/Source/Project64-core/Settings/SettingsClass.h b/Source/Project64-core/Settings/SettingsClass.h index d88482714..fed426783 100644 --- a/Source/Project64-core/Settings/SettingsClass.h +++ b/Source/Project64-core/Settings/SettingsClass.h @@ -36,69 +36,68 @@ public: bool Initialize(const char * BaseDirectory, const char * AppName); //return the values - bool LoadBool(SettingID Type); - bool LoadBool(SettingID Type, bool & Value); - bool LoadBoolIndex(SettingID Type, int32_t index); - bool LoadBoolIndex(SettingID Type, int32_t index, bool & Value); + bool LoadBool(SettingID Type); + bool LoadBool(SettingID Type, bool & Value); + bool LoadBoolIndex(SettingID Type, uint32_t index); + bool LoadBoolIndex(SettingID Type, uint32_t index, bool & Value); uint32_t LoadDword(SettingID Type); - bool LoadDword(SettingID Type, uint32_t & Value); - uint32_t LoadDwordIndex(SettingID Type, int32_t index); - bool LoadDwordIndex(SettingID Type, int32_t index, uint32_t & Value); - stdstr LoadStringVal(SettingID Type); - bool LoadStringVal(SettingID Type, stdstr & Value); - bool LoadStringVal(SettingID Type, char * Buffer, int32_t BufferSize); - stdstr LoadStringIndex(SettingID Type, int32_t index); - bool LoadStringIndex(SettingID Type, int32_t index, stdstr & Value); - bool LoadStringIndex(SettingID Type, int32_t index, char * Buffer, int32_t BufferSize); + bool LoadDword(SettingID Type, uint32_t & Value); + uint32_t LoadDwordIndex(SettingID Type, uint32_t index); + bool LoadDwordIndex(SettingID Type, uint32_t index, uint32_t & Value); + std::string LoadStringVal(SettingID Type); + bool LoadStringVal(SettingID Type, std::string & Value); + bool LoadStringVal(SettingID Type, char * Buffer, uint32_t BufferSize); + std::string LoadStringIndex(SettingID Type, uint32_t index); + bool LoadStringIndex(SettingID Type, uint32_t index, std::string & Value); + bool LoadStringIndex(SettingID Type, uint32_t index, char * Buffer, uint32_t BufferSize); //Load the default value for the setting - bool LoadDefaultBool(SettingID Type); - void LoadDefaultBool(SettingID Type, bool & Value); - bool LoadDefaultBoolIndex(SettingID Type, int32_t index); - void LoadDefaultBoolIndex(SettingID Type, int32_t index, bool & Value); + bool LoadDefaultBool(SettingID Type); + void LoadDefaultBool(SettingID Type, bool & Value); + bool LoadDefaultBoolIndex(SettingID Type, uint32_t index); + void LoadDefaultBoolIndex(SettingID Type, uint32_t index, bool & Value); uint32_t LoadDefaultDword(SettingID Type); - void LoadDefaultDword(SettingID Type, uint32_t & Value); - uint32_t LoadDefaultDwordIndex(SettingID Type, int32_t index); - void LoadDefaultDwordIndex(SettingID Type, int32_t index, uint32_t & Value); - stdstr LoadDefaultString(SettingID Type); - void LoadDefaultString(SettingID Type, stdstr & Value); - void LoadDefaultString(SettingID Type, char * Buffer, int32_t BufferSize); - stdstr LoadDefaultStringIndex(SettingID Type, int32_t index); - void LoadDefaultStringIndex(SettingID Type, int32_t index, stdstr & Value); - void LoadDefaultStringIndex(SettingID Type, int32_t index, char * Buffer, int32_t BufferSize); + void LoadDefaultDword(SettingID Type, uint32_t & Value); + uint32_t LoadDefaultDwordIndex(SettingID Type, uint32_t index); + void LoadDefaultDwordIndex(SettingID Type, uint32_t index, uint32_t & Value); + std::string LoadDefaultString(SettingID Type); + void LoadDefaultString(SettingID Type, std::string & Value); + void LoadDefaultString(SettingID Type, char * Buffer, uint32_t BufferSize); + std::string LoadDefaultStringIndex(SettingID Type, uint32_t index); + void LoadDefaultStringIndex(SettingID Type, uint32_t index, std::string & Value); + void LoadDefaultStringIndex(SettingID Type, uint32_t index, char * Buffer, uint32_t BufferSize); //Update the settings - void SaveBool(SettingID Type, bool Value); - void SaveBoolIndex(SettingID Type, int32_t index, bool Value); - void SaveDword(SettingID Type, uint32_t Value); - void SaveDwordIndex(SettingID Type, int32_t index, uint32_t Value); - void SaveString(SettingID Type, const stdstr & Value); - void SaveStringIndex(SettingID Type, int32_t index, const stdstr & Value); - void SaveString(SettingID Type, const char * Buffer); - void SaveStringIndex(SettingID Type, int32_t index, const char * Buffer); + void SaveBool(SettingID Type, bool Value); + void SaveBoolIndex(SettingID Type, uint32_t index, bool Value); + void SaveDword(SettingID Type, uint32_t Value); + void SaveDwordIndex(SettingID Type, uint32_t index, uint32_t Value); + void SaveString(SettingID Type, const std::string & Value); + void SaveStringIndex(SettingID Type, uint32_t index, const std::string & Value); + void SaveString(SettingID Type, const char * Buffer); + void SaveStringIndex(SettingID Type, uint32_t index, const char * Buffer); // Delete a setting void DeleteSetting(SettingID Type); - void DeleteSettingIndex(SettingID Type, int32_t index); + void DeleteSettingIndex(SettingID Type, uint32_t index); //Register Notification of change void RegisterChangeCB(SettingID Type, void * Data, SettingChangedFunc Func); void UnregisterChangeCB(SettingID Type, void * Data, SettingChangedFunc Func); // information about setting - SettingType GetSettingType(SettingID Type); - bool IndexBasedSetting(SettingID Type); - void SettingTypeChanged(SettingType Type); - bool IsSettingSet(SettingID Type); + SettingType GetSettingType(SettingID Type); + bool IndexBasedSetting(SettingID Type); + void SettingTypeChanged(SettingType Type); + bool IsSettingSet(SettingID Type); // static functions for plugins static uint32_t GetSetting(CSettings * _this, SettingID Type); - static const char * GetSettingSz(CSettings * _this, SettingID Type, char * Buffer, int32_t BufferSize); + static const char * GetSettingSz(CSettings * _this, SettingID Type, char * Buffer, uint32_t BufferSize); static void SetSetting(CSettings * _this, SettingID ID, uint32_t Value); static void SetSettingSz(CSettings * _this, SettingID ID, const char * Value); static void RegisterSetting(CSettings * _this, SettingID ID, SettingID DefaultID, SettingDataType DataType, - SettingType Type, const char * Category, const char * DefaultStr, - uint32_t Value); + SettingType Type, const char * Category, const char * DefaultStr, uint32_t Value); static uint32_t FindSetting(CSettings * _this, const char * Name); static void FlushSettings(CSettings * _this); static void sRegisterChangeCB(CSettings * _this, SettingID Type, void * Data, SettingChangedFunc Func); @@ -114,8 +113,8 @@ private: struct SETTING_CHANGED_CB { - void * Data; - SettingChangedFunc Func; + void * Data; + SettingChangedFunc Func; SETTING_CHANGED_CB * Next; }; @@ -123,9 +122,9 @@ private: typedef std::map SETTING_MAP; typedef SETTING_MAP::iterator SETTING_HANDLER; - SETTING_MAP m_SettingInfo; + SETTING_MAP m_SettingInfo; SETTING_CALLBACK m_Callback; - int32_t m_NextAutoSettingId; + uint32_t m_NextAutoSettingId; }; extern CSettings * g_Settings; diff --git a/Source/Project64/UserInterface/MainMenu.cpp b/Source/Project64/UserInterface/MainMenu.cpp index 6b58dc09a..0b47e87b6 100644 --- a/Source/Project64/UserInterface/MainMenu.cpp +++ b/Source/Project64/UserInterface/MainMenu.cpp @@ -222,7 +222,7 @@ void CMainMenu::OnLodState(HWND hWnd) const char * Filter = "PJ64 Saves (*.zip, *.pj)\0*.pj?;*.pj;*.zip;"; if (SaveFile.SelectFile(hWnd, Directory, Filter, false)) { - g_Settings->SaveString(GameRunning_InstantSaveFile, SaveFile); + g_Settings->SaveString(GameRunning_InstantSaveFile, (const char *)SaveFile); if (!SaveFile.DirectoryExists()) { SaveFile.DirectoryCreate();