COMMON: Cleanup ConfigManager code

* get rid of ConfigManager::_emptyString
* get rid of ConfigManager::Domain::get (use getVal instead)
* remove some dead code

svn-id: r48417

2 files changed, 2 insertions, 27 deletions

diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index 5bb764bbb2..9bef6b37a6 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -390,10 +390,8 @@ const String & ConfigManager::get(const String &key) const {
 		return (*_activeDomain)[key];
 	else if (_appDomain.contains(key))
 		return _appDomain[key];
-	else if (_defaultsDomain.contains(key))
-		return _defaultsDomain[key];
 
-	return _emptyString;
+	return _defaultsDomain.getVal(key);
 }
 
 const String & ConfigManager::get(const String &key, const String &domName) const {
@@ -412,18 +410,7 @@ const String & ConfigManager::get(const String &key, const String &domName) cons
 	if (domain->contains(key))
 		return (*domain)[key];
 
-	return _defaultsDomain.get(key);
-
-	if (!domain->contains(key)) {
-#if 1
-		return _emptyString;
-#else
-		error("ConfigManager::get(%s,%s) called on non-existent key",
-					key.c_str(), domName.c_str());
-#endif
-	}
-
-	return (*domain)[key];
+	return _defaultsDomain.getVal(key);
 }
 
 int ConfigManager::getInt(const String &key, const String &domName) const {
@@ -614,14 +601,6 @@ bool ConfigManager::hasGameDomain(const String &domName) const {
 #pragma mark -
 
 
-const String &ConfigManager::Domain::get(const String &key) const {
-	const_iterator iter(find(key));
-	if (iter != end())
-		return iter->_value;
-
-	return ConfMan._emptyString;
-}
-
 void ConfigManager::Domain::setDomainComment(const String &comment) {
 	_domainComment = comment;
 }
diff --git a/common/config-manager.h b/common/config-manager.h
index 68c6c4f5ee..350b88b531 100644
--- a/common/config-manager.h
+++ b/common/config-manager.h
@@ -56,8 +56,6 @@ public:
 		String _domainComment;
 
 	public:
-		const String &get(const String &key) const;
-
 		void setDomainComment(const String &comment);
 		const String &getDomainComment() const;
 
@@ -165,8 +163,6 @@ private:
 	Domain *		_activeDomain;
 
 	String			_filename;
-
-	const String	_emptyString;
 };
 
 }	// End of namespace Common