From bab9d93ebbee1f9991a3fe858c0e8e850c4e4c1b Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 9 Apr 2018 18:03:38 +1000 Subject: [PATCH] [Project64] Make sure CSettingTypeApplicationIndex use uint32_t --- .../SettingsType-ApplicationIndex.cpp | 86 +++++++++---------- .../SettingsType-ApplicationIndex.h | 22 ++--- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp index 02df70ec9..fe0acf1d5 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp @@ -12,94 +12,94 @@ #include "SettingsType-Application.h" #include "SettingsType-ApplicationIndex.h" -CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, uint32_t DefaultValue ) : - CSettingTypeApplication(Section,Name,DefaultValue) +CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, uint32_t DefaultValue) : + CSettingTypeApplication(Section, Name, DefaultValue) { } -CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, bool DefaultValue ) : - CSettingTypeApplication(Section,Name,DefaultValue) +CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, bool DefaultValue) : + CSettingTypeApplication(Section, Name, DefaultValue) { } -CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, const char * DefaultValue ) : - CSettingTypeApplication(Section,Name,DefaultValue) +CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, const char * DefaultValue) : + CSettingTypeApplication(Section, Name, DefaultValue) { } -CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, SettingID DefaultSetting ) : - CSettingTypeApplication(Section,Name,DefaultSetting) +CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, SettingID DefaultSetting) : + CSettingTypeApplication(Section, Name, DefaultSetting) { } -CSettingTypeApplicationIndex::~CSettingTypeApplicationIndex ( void ) +CSettingTypeApplicationIndex::~CSettingTypeApplicationIndex(void) { } -bool CSettingTypeApplicationIndex::Load ( int Index, bool & Value ) const +bool CSettingTypeApplicationIndex::Load(uint32_t Index, bool & Value) const { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - return CSettingTypeApplication::Load(0,Value); + 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 +bool CSettingTypeApplicationIndex::Load(uint32_t Index, uint32_t & Value) const { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - return CSettingTypeApplication::Load(0,Value); + m_KeyNameIdex = stdstr_f("%s %d", m_KeyName.c_str(), Index); + return CSettingTypeApplication::Load(0, Value); } -bool CSettingTypeApplicationIndex::Load ( int Index, stdstr & Value ) const +bool CSettingTypeApplicationIndex::Load(uint32_t Index, std::string & Value) const { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - return CSettingTypeApplication::Load(0,Value); + 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 +void CSettingTypeApplicationIndex::LoadDefault(uint32_t Index, bool & Value) const { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - CSettingTypeApplication::LoadDefault(0,Value); + m_KeyNameIdex = stdstr_f("%s %d", m_KeyName.c_str(), Index); + CSettingTypeApplication::LoadDefault(0, Value); } -void CSettingTypeApplicationIndex::LoadDefault ( int Index, uint32_t & Value ) const +void CSettingTypeApplicationIndex::LoadDefault(uint32_t Index, uint32_t & Value) const { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - CSettingTypeApplication::LoadDefault(0,Value); + m_KeyNameIdex = stdstr_f("%s %d", m_KeyName.c_str(), Index); + CSettingTypeApplication::LoadDefault(0, Value); } -void CSettingTypeApplicationIndex::LoadDefault ( int Index, stdstr & Value ) const +void CSettingTypeApplicationIndex::LoadDefault(uint32_t Index, std::string & Value) const { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - CSettingTypeApplication::LoadDefault(0,Value); + 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 ) +void CSettingTypeApplicationIndex::Save(uint32_t Index, bool Value) { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - CSettingTypeApplication::Save(0,Value); + m_KeyNameIdex = stdstr_f("%s %d", m_KeyName.c_str(), Index); + CSettingTypeApplication::Save(0, Value); } -void CSettingTypeApplicationIndex::Save ( int Index, uint32_t Value ) +void CSettingTypeApplicationIndex::Save(uint32_t Index, uint32_t Value) { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - CSettingTypeApplication::Save(0,Value); + m_KeyNameIdex = stdstr_f("%s %d", m_KeyName.c_str(), Index); + CSettingTypeApplication::Save(0, Value); } -void CSettingTypeApplicationIndex::Save ( int Index, const stdstr & Value ) +void CSettingTypeApplicationIndex::Save(uint32_t Index, const std::string & Value) { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - CSettingTypeApplication::Save(0,Value); + m_KeyNameIdex = stdstr_f("%s %d", m_KeyName.c_str(), Index); + CSettingTypeApplication::Save(0, Value); } -void CSettingTypeApplicationIndex::Save ( int Index, const char * Value ) +void CSettingTypeApplicationIndex::Save(uint32_t Index, const char * Value) { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - CSettingTypeApplication::Save(0,Value); + m_KeyNameIdex = stdstr_f("%s %d", m_KeyName.c_str(), Index); + CSettingTypeApplication::Save(0, Value); } -void CSettingTypeApplicationIndex::Delete ( int Index ) +void CSettingTypeApplicationIndex::Delete(uint32_t Index) { - m_KeyNameIdex = stdstr_f("%s %d",m_KeyName.c_str(),Index); - CSettingTypeApplication::Save(0,(const char *)NULL); -} + m_KeyNameIdex = stdstr_f("%s %d", m_KeyName.c_str(), Index); + CSettingTypeApplication::Save(0, (const char *)NULL); +} \ No newline at end of file diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h index 60ebc94b2..bbeb50b78 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h @@ -23,23 +23,23 @@ public: 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: CSettingTypeApplicationIndex(void); // Disable default constructor