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:
authorAlex Zolotarev <alex@maps.me>2016-02-16 19:58:28 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:21:20 +0300
commitef52d80f847be0e9c6996905bd7d82c0cbe980a2 (patch)
tree2e86a8a560303afd2fb60233a0cdc7c06875d117 /indexer/categories_holder.cpp
parent49b7fc3226865d6c56163c4532b2489dd38413bc (diff)
Minor CategoriesHolder renaming.
Diffstat (limited to 'indexer/categories_holder.cpp')
-rw-r--r--indexer/categories_holder.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 51ffd6de4f..4c222c9931 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -41,7 +41,7 @@ void CategoriesHolder::AddCategory(Category & cat, vector<uint32_t> & types)
for (size_t i = 0; i < p->m_synonyms.size(); ++i)
{
- ASSERT(p->m_synonyms[i].m_locale != UNSUPPORTED_LOCALE_CODE, ());
+ ASSERT(p->m_synonyms[i].m_locale != kUnsupportedLocaleCode, ());
StringT const uniName = search::NormalizeAndSimplifyString(p->m_synonyms[i].m_name);
@@ -128,7 +128,7 @@ void CategoriesHolder::LoadFromStream(istream & s)
}
int8_t const langCode = MapLocaleToInteger(*iter);
- CHECK(langCode != UNSUPPORTED_LOCALE_CODE, ("Invalid language code:", *iter, "at line:", lineNumber));
+ CHECK(langCode != kUnsupportedLocaleCode, ("Invalid language code:", *iter, "at line:", lineNumber));
while (++iter)
{
@@ -148,7 +148,7 @@ void CategoriesHolder::LoadFromStream(istream & s)
name.m_name = name.m_name.substr(1);
}
else
- name.m_prefixLengthToSuggest = Category::EMPTY_PREFIX_LENGTH;
+ name.m_prefixLengthToSuggest = Category::kEmptyPrefixLength;
// Process emoji symbols.
using namespace strings;
@@ -263,5 +263,5 @@ int8_t CategoriesHolder::MapLocaleToInteger(string const & locale)
return 17; // Simplified Chinese by default for all other cases
}
- return UNSUPPORTED_LOCALE_CODE;
+ return kUnsupportedLocaleCode;
}