From 8d5ef3b34829dcee8246670c171099a50df9b1ba Mon Sep 17 00:00:00 2001 From: Pauli Nieminen Date: Wed, 27 Aug 2008 09:13:11 +0000 Subject: [PATCH] Added typedef for list of languages --- src/language.cpp | 8 ++++---- src/language.hpp | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/language.cpp b/src/language.cpp index 6e1861dd663..ebce9c6886d 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -89,7 +89,7 @@ namespace { string_map strings_; } -static std::vector known_languages; +static language_list known_languages; std::string languagedef_name (const language_def& def) { @@ -177,7 +177,7 @@ bool load_language_list() return true; } -std::vector get_languages() +language_list get_languages() { // We sort every time, the local might have changed which can modify the // sort order. @@ -332,7 +332,7 @@ bool set_language(const language_def& locale) // end of string_table fill // Reset translations for the name of current languages - for (std::vector::iterator itor = known_languages.begin(); + for (language_list::iterator itor = known_languages.begin(); itor != known_languages.end(); ++itor) { itor->language.reset_translation(); @@ -352,7 +352,7 @@ const language_def& get_locale() const std::string& prefs_locale = preferences::language(); if(prefs_locale.empty() == false) { wesnoth_setlocale(LC_MESSAGES, prefs_locale, NULL); - for(std::vector::const_iterator i = known_languages.begin(); + for(language_list::const_iterator i = known_languages.begin(); i != known_languages.end(); ++i) { if (prefs_locale == i->localename) return *i; diff --git a/src/language.hpp b/src/language.hpp index 7e8182664bd..90841fc34f3 100644 --- a/src/language.hpp +++ b/src/language.hpp @@ -64,6 +64,8 @@ struct language_def bool available() const; }; +typedef std::vector language_list; + std::string languagedef_name (const language_def& def); struct symbol_table