From 05602d1939d18563273a8e4f1d04f0f0b70393f9 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 24 Dec 2015 10:23:49 +1100 Subject: [PATCH] [Project64] Remove m_UseRegistry --- .../SettingType/SettingsType-Application.cpp | 75 ++++--------------- .../SettingType/SettingsType-Application.h | 47 ++++++------ .../SettingType/SettingsType-RomSetting.h | 1 - 3 files changed, 37 insertions(+), 86 deletions(-) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp index 2f4a4965d..137a824fc 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp @@ -12,7 +12,6 @@ #include "SettingsType-Application.h" #include -bool CSettingTypeApplication::m_UseRegistry = false; CIniFile * CSettingTypeApplication::m_SettingsIniFile = NULL; CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, uint32_t DefaultValue ) : @@ -88,7 +87,6 @@ void CSettingTypeApplication::Initialize( const char * /*AppName*/ ) } m_SettingsIniFile->SetAutoFlush(false); - m_UseRegistry = g_Settings->LoadBool(Setting_UseFromRegistry); } void CSettingTypeApplication::Flush() @@ -113,16 +111,11 @@ bool CSettingTypeApplication::Load ( int /*Index*/, bool & Value ) const { bool bRes = false; - if (!m_UseRegistry) + uint32_t dwValue; + bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,dwValue); + if (bRes) { - uint32_t dwValue; - bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,dwValue); - if (bRes) - { - Value = dwValue != 0; - } - } else { - g_Notify->BreakPoint(__FILE__, __LINE__); + Value = dwValue != 0; } if (!bRes && m_DefaultSetting != Default_None) @@ -139,13 +132,7 @@ bool CSettingTypeApplication::Load ( int /*Index*/, bool & Value ) const bool CSettingTypeApplication::Load ( int /*Index*/, uint32_t & Value ) const { - bool bRes = false; - if (!m_UseRegistry) - { - bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,Value); - } else { - g_Notify->BreakPoint(__FILE__, __LINE__); - } + bool bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,Value); if (!bRes && m_DefaultSetting != Default_None) { if (m_DefaultSetting == Default_Constant) @@ -165,13 +152,7 @@ const char * CSettingTypeApplication::SectionName ( void ) const bool CSettingTypeApplication::Load ( int Index, stdstr & Value ) const { - bool bRes = false; - if (!m_UseRegistry) - { - bRes = m_SettingsIniFile ? m_SettingsIniFile->GetString(SectionName(),m_KeyNameIdex.c_str(),m_DefaultStr,Value) : false; - } else { - g_Notify->BreakPoint(__FILE__, __LINE__); - } + bool bRes = m_SettingsIniFile ? m_SettingsIniFile->GetString(SectionName(),m_KeyNameIdex.c_str(),m_DefaultStr,Value) : false; if (!bRes) { CSettingTypeApplication::LoadDefault(Index,Value); @@ -222,65 +203,37 @@ void CSettingTypeApplication::LoadDefault ( int /*Index*/, stdstr & Value ) cons //Update the settings void CSettingTypeApplication::Save ( int /*Index*/, bool Value ) { - if (!m_UseRegistry) - { - m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value); - } else { - g_Notify->BreakPoint(__FILE__, __LINE__); - } + m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value); } void CSettingTypeApplication::Save ( int /*Index*/, uint32_t Value ) { - if (!m_UseRegistry) - { - m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value); - } else { - g_Notify->BreakPoint(__FILE__, __LINE__); - } + m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value); } void CSettingTypeApplication::Save ( int /*Index*/, const stdstr & Value ) { - if (!m_UseRegistry) - { - m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value.c_str()); - } else { - g_Notify->BreakPoint(__FILE__, __LINE__); - } + m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value.c_str()); } void CSettingTypeApplication::Save ( int /*Index*/, const char * Value ) { - if (!m_UseRegistry) - { - m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value); - } else { - g_Notify->BreakPoint(__FILE__, __LINE__); - } + m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value); } stdstr CSettingTypeApplication::FixSectionName(const char * Section) { stdstr SectionName(Section); - if (!m_UseRegistry) + if (SectionName.empty()) { - if (SectionName.empty()) - { - SectionName = "default"; - } - SectionName.Replace("\\","-"); + SectionName = "default"; } + SectionName.Replace("\\","-"); return SectionName; } void CSettingTypeApplication::Delete( int /*Index*/ ) { - if (!m_UseRegistry) - { - m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),NULL); - } else { - g_Notify->BreakPoint(__FILE__, __LINE__); - } + m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),NULL); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Application.h b/Source/Project64-core/Settings/SettingType/SettingsType-Application.h index 71ab71e53..06dd2726e 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Application.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Application.h @@ -17,55 +17,54 @@ class CSettingTypeApplication : public CSettingType { public: - CSettingTypeApplication(const char * Section, const char * Name, const char * DefaultValue ); - CSettingTypeApplication(const char * Section, const char * Name, bool DefaultValue ); - CSettingTypeApplication(const char * Section, const char * Name, uint32_t DefaultValue ); - CSettingTypeApplication(const char * Section, const char * Name, SettingID DefaultSetting ); + CSettingTypeApplication(const char * Section, const char * Name, const char * DefaultValue); + CSettingTypeApplication(const char * Section, const char * Name, bool DefaultValue); + CSettingTypeApplication(const char * Section, const char * Name, uint32_t DefaultValue); + CSettingTypeApplication(const char * Section, const char * Name, SettingID DefaultSetting); virtual ~CSettingTypeApplication(); - virtual bool IndexBasedSetting ( void ) const { return false; } - virtual SettingType GetSettingType ( void ) const { return m_UseRegistry ? SettingType_Registry : SettingType_CfgFile; } + virtual bool IndexBasedSetting(void) const { return false; } + virtual SettingType GetSettingType(void) const { return SettingType_CfgFile; } //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(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; //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(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; //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(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); // Delete the setting - virtual void Delete ( int32_t Index ); + virtual void Delete(int32_t Index); // Initialize this class to use ini or registry - static void Initialize( const char * AppName ); - static void CleanUp ( void ); - static void Flush ( void ); + static void Initialize(const char * AppName); + static void CleanUp(void); + static void Flush(void); - const char * GetKeyName ( void) const { return m_KeyName.c_str(); } + const char * GetKeyName(void) const { return m_KeyName.c_str(); } protected: const char * m_DefaultStr; const uint32_t m_DefaultValue; const SettingID m_DefaultSetting; - stdstr FixSectionName (const char * Section); + stdstr FixSectionName(const char * Section); static CIniFile * m_SettingsIniFile; - static bool m_UseRegistry; const stdstr m_Section; const stdstr m_KeyName; mutable stdstr m_KeyNameIdex; - virtual const char * SectionName ( void ) const; + virtual const char * SectionName(void) const; private: CSettingTypeApplication(const CSettingTypeApplication&); // Disable copy constructor diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomSetting.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomSetting.h index 98e60bd92..dcee7573b 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomSetting.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomSetting.h @@ -36,6 +36,5 @@ private: const SettingID m_DefaultSetting; static CIniFile * m_SettingsIniFile; - static bool m_UseRegistry; stdstr m_SectionIdent; };