Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsentiy Milchakov <a.milchakov@corp.mail.ru>2016-07-20 22:51:27 +0300
committerArsentiy Milchakov <a.milchakov@corp.mail.ru>2016-07-20 22:51:27 +0300
commit99f189642f6c5ae0139cc36ba5ba5106680d9de5 (patch)
tree6fa3ee843f0d2d3646d0acb619fc9bc788f03f89 /indexer/editable_map_object.hpp
parentae5272bc4708f55a946163a4228ad38138af82d0 (diff)
review fixes
Diffstat (limited to 'indexer/editable_map_object.hpp')
-rw-r--r--indexer/editable_map_object.hpp19
1 files changed, 4 insertions, 15 deletions
diff --git a/indexer/editable_map_object.hpp b/indexer/editable_map_object.hpp
index e89aa543ad..d033bc3d04 100644
--- a/indexer/editable_map_object.hpp
+++ b/indexer/editable_map_object.hpp
@@ -49,8 +49,7 @@ struct LocalizedName
// Class which contains vector of localized names with following priority:
// 1. Names for Mwm languages
// 2. User`s language name
-// 3. International name
-// 4. Other names
+// 3. Other names
// and mandatoryNamesCount - count of names which should be always shown.
struct NamesDataSource
{
@@ -130,23 +129,13 @@ public:
static bool ValidateWebsite(string const & site);
static bool ValidateEmail(string const & email);
- // TODO dummy, should be removed.
- static vector<string> const & GetMwmLanguages()
- {
- static vector<string> const kNativelanguagesForMwm = {"de", "fr"};
-
- return kNativelanguagesForMwm;
- }
- // TODO dummy, should be removed.
-
// Check whether langCode can be used as default name.
- static bool CanUseAsDefaultName(int8_t const langCode, StringUtf8Multilang const & name,
- vector<string> const & nativeMwmLanguages);
+ static bool CanUseAsDefaultName(int8_t const langCode, vector<int8_t> const & nativeMwmLanguages);
// See comment for NamesDataSource class.
static NamesDataSource GetNamesDataSource(StringUtf8Multilang const & source,
- vector<string> const & nativeMwmLanguages,
- string const & userLanguage);
+ vector<int8_t> const & nativeMwmLanguages,
+ int8_t const userLanguage);
private:
string m_houseNumber;