From fc0193c4b108d9a914b841829b1c0f0306b609b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 3 Jun 2018 14:10:52 +0200 Subject: Move Config ValueToString to StringUtil An identical implementation is used by IniFile, so move those functions to StringUtil. A future commit will modify IniFile to use them. --- Source/Core/Common/IniFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/Common/IniFile.cpp') diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp index ddaf64b0e3..d28092261c 100644 --- a/Source/Core/Common/IniFile.cpp +++ b/Source/Core/Common/IniFile.cpp @@ -103,7 +103,7 @@ void IniFile::Section::Set(const std::string& key, s64 newValue) void IniFile::Section::Set(const std::string& key, bool newValue) { - Set(key, StringFromBool(newValue)); + Set(key, ValueToString(newValue)); } bool IniFile::Section::Get(const std::string& key, std::string* value, -- cgit v1.2.3 From cba32b12e77c8f023ca5efeda7c386b856ad3f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 3 Jun 2018 14:18:58 +0200 Subject: IniFile: Use templates for Set() --- Source/Core/Common/IniFile.cpp | 44 ------------------------------------------ 1 file changed, 44 deletions(-) (limited to 'Source/Core/Common/IniFile.cpp') diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp index d28092261c..d24149b6da 100644 --- a/Source/Core/Common/IniFile.cpp +++ b/Source/Core/Common/IniFile.cpp @@ -57,55 +57,11 @@ void IniFile::Section::Set(const std::string& key, const std::string& newValue) } } -void IniFile::Section::Set(const std::string& key, const std::string& newValue, - const std::string& defaultValue) -{ - if (newValue != defaultValue) - Set(key, newValue); - else - Delete(key); -} - void IniFile::Section::Set(const std::string& key, const std::vector& newValues) { Set(key, JoinStrings(newValues, ",")); } -void IniFile::Section::Set(const std::string& key, u32 newValue) -{ - Set(key, StringFromFormat("0x%08x", newValue)); -} - -void IniFile::Section::Set(const std::string& key, u64 new_value) -{ - Set(key, StringFromFormat("0x%016" PRIx64, new_value)); -} - -void IniFile::Section::Set(const std::string& key, float newValue) -{ - Set(key, StringFromFormat("%#.9g", newValue)); -} - -void IniFile::Section::Set(const std::string& key, double newValue) -{ - Set(key, StringFromFormat("%#.17g", newValue)); -} - -void IniFile::Section::Set(const std::string& key, int newValue) -{ - Set(key, std::to_string(newValue)); -} - -void IniFile::Section::Set(const std::string& key, s64 newValue) -{ - Set(key, StringFromFormat("%" PRId64, newValue)); -} - -void IniFile::Section::Set(const std::string& key, bool newValue) -{ - Set(key, ValueToString(newValue)); -} - bool IniFile::Section::Get(const std::string& key, std::string* value, const std::string& defaultValue) const { -- cgit v1.2.3 From 7e79bf97abf57130d21d635d908ff3ca12e89fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 3 Jun 2018 14:39:38 +0200 Subject: IniFile: Use templates for Get() Gets rid of duplicated code. --- Source/Core/Common/IniFile.cpp | 84 ------------------------------------------ 1 file changed, 84 deletions(-) (limited to 'Source/Core/Common/IniFile.cpp') diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp index d24149b6da..604c4b0fc9 100644 --- a/Source/Core/Common/IniFile.cpp +++ b/Source/Core/Common/IniFile.cpp @@ -110,90 +110,6 @@ bool IniFile::Section::Get(const std::string& key, std::vector* out return true; } -bool IniFile::Section::Get(const std::string& key, int* value, int defaultValue) const -{ - std::string temp; - bool retval = Get(key, &temp); - - if (retval && TryParse(temp, value)) - return true; - - *value = defaultValue; - return false; -} - -bool IniFile::Section::Get(const std::string& key, s64* value, s64 default_value) const -{ - std::string temp; - bool retval = Get(key, &temp); - - if (retval && TryParse(temp, value)) - return true; - - *value = default_value; - return false; -} - -bool IniFile::Section::Get(const std::string& key, u32* value, u32 defaultValue) const -{ - std::string temp; - bool retval = Get(key, &temp); - - if (retval && TryParse(temp, value)) - return true; - - *value = defaultValue; - return false; -} - -bool IniFile::Section::Get(const std::string& key, u64* value, u64 default_value) const -{ - std::string temp; - bool retval = Get(key, &temp); - - if (retval && TryParse(temp, value)) - return true; - - *value = default_value; - return false; -} - -bool IniFile::Section::Get(const std::string& key, bool* value, bool defaultValue) const -{ - std::string temp; - bool retval = Get(key, &temp); - - if (retval && TryParse(temp, value)) - return true; - - *value = defaultValue; - return false; -} - -bool IniFile::Section::Get(const std::string& key, float* value, float defaultValue) const -{ - std::string temp; - bool retval = Get(key, &temp); - - if (retval && TryParse(temp, value)) - return true; - - *value = defaultValue; - return false; -} - -bool IniFile::Section::Get(const std::string& key, double* value, double defaultValue) const -{ - std::string temp; - bool retval = Get(key, &temp); - - if (retval && TryParse(temp, value)) - return true; - - *value = defaultValue; - return false; -} - bool IniFile::Section::Exists(const std::string& key) const { return values.find(key) != values.end(); -- cgit v1.2.3