Merge pull request #500 from lioncash/ini

Use only section-based ini reading.

1 files changed, 2 insertions, 25 deletions

diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h
index 6e80611f1d..1d006b802f 100644
--- a/Source/Core/Common/IniFile.h
+++ b/Source/Core/Common/IniFile.h
@@ -95,34 +95,11 @@ public:
 	// Returns true if key exists in section
 	bool Exists(const std::string& sectionName, const std::string& key) const;
 
-	// TODO: Get rid of these, in favor of the Section ones.
-	void Set(const std::string& sectionName, const std::string& key, const std::string& newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue);
-	}
-	void Set(const std::string& sectionName, const std::string& key, int newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue);
-	}
-	void Set(const std::string& sectionName, const std::string& key, u32 newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue);
-	}
-	void Set(const std::string& sectionName, const std::string& key, bool newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue);
-	}
-	void Set(const std::string& sectionName, const std::string& key, const std::vector<std::string>& newValues) {
-		GetOrCreateSection(sectionName)->Set(key, newValues);
-	}
-
-	// TODO: Get rid of these, in favor of the Section ones.
-	bool Get(const std::string& sectionName, const std::string& key, int* value, int defaultValue = 0);
-	bool Get(const std::string& sectionName, const std::string& key, u32* value, u32 defaultValue = 0);
-	bool Get(const std::string& sectionName, const std::string& key, bool* value, bool defaultValue = false);
-	bool Get(const std::string& sectionName, const std::string& key, std::vector<std::string>* values);
-	bool Get(const std::string& sectionName, const std::string& key, std::string* value, const std::string& defaultValue = NULL_STRING);
-
 	template<typename T> bool GetIfExists(const std::string& sectionName, const std::string& key, T value)
 	{
 		if (Exists(sectionName, key))
-			return Get(sectionName, key, value);
+			return GetOrCreateSection(sectionName)->Get(key, value);
+
 		return false;
 	}