AURORA: Make LanguageManager::parseLanguage() take a const UString &

Yeah, we modify it (lowercasing), but the caller doesn't need to know that.
xoreos · Dec 4, 2016 · 8f53c33 · 8f53c33
1 parent 7ea0cbd
commit 8f53c33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/aurora/language.cpp b/src/aurora/language.cpp
@@ -249,18 +249,18 @@ Common::UString LanguageManager::getLanguageName(Language language) {
 	return kLanguageNames[language];
 }
 
-Language LanguageManager::parseLanguage(Common::UString str) {
+Language LanguageManager::parseLanguage(const Common::UString &str) {
 	if (str.empty())
 		return kLanguageInvalid;
 
-	str.makeLower();
+	Common::UString lowerStr = str.toLower();
 
 	for (size_t i = 0; i < ARRAYSIZE(kLanguageStrings); i++) {
 		for (size_t j = 0; j < ARRAYSIZE(kLanguageStrings[i].strings); j++) {
 			if (!kLanguageStrings[i].strings[j])
 				break;
 
-			if (str == Common::UString(kLanguageStrings[i].strings[j]))
+			if (lowerStr == Common::UString(kLanguageStrings[i].strings[j]))
 				return kLanguageStrings[i].language;
 		}
 	}

diff --git a/src/aurora/language.h b/src/aurora/language.h
@@ -216,7 +216,7 @@ class LanguageManager : public Common::Singleton<LanguageManager> {
 	static Common::UString getLanguageName(Language language);
 
 	/** Parse this string into a language. */
-	static Language parseLanguage(Common::UString str);
+	static Language parseLanguage(const Common::UString &str);
 
 	/** Convert an ungendered language ID to a gendered language ID. */
 	static uint32 convertLanguageIDToGendered(uint32 languageID, LanguageGender gender);