[search] Fix spelling and code style.

4 files changed, 31 insertions, 30 deletions

diff --git a/data/synonims.txt b/data/synonyms.txt
index 7f9abf23ff..7f9abf23ff 100644
--- a/data/synonims.txt
+++ b/data/synonyms.txt
diff --git a/indexer/search_index_builder.cpp b/indexer/search_index_builder.cpp
index 4c681b25a7..aa305d3401 100644
--- a/indexer/search_index_builder.cpp
+++ b/indexer/search_index_builder.cpp
@@ -29,18 +29,18 @@
 #include "../std/unordered_map.hpp"
 #include "../std/fstream.hpp"
 
-#define SYNONIMS_FILE "synonims.txt"
+#define SYNONYMS_FILE "synonyms.txt"
 
 
 namespace
 {
 
-class SynonimsHolder
+class SynonymsHolder
 {
   unordered_multimap<string, string> m_map;
 
 public:
-  SynonimsHolder(string const & fPath)
+  SynonymsHolder(string const & fPath)
   {
     ifstream stream(fPath.c_str());
 
@@ -62,7 +62,7 @@ public:
         for (size_t i = 1; i < tokens.size(); ++i)
         {
           strings::Trim(tokens[i]);
-          // synonim should not has any spaces
+          // synonym should not has any spaces
           ASSERT ( tokens[i].find_first_of(" \t") == string::npos, () );
           m_map.insert(make_pair(tokens[0], tokens[i]));
         }
@@ -85,12 +85,12 @@ public:
 
 struct FeatureNameInserter
 {
-  SynonimsHolder * m_synonims;
+  SynonymsHolder * m_synonyms;
   StringsFile & m_names;
   StringsFile::ValueT m_val;
 
-  FeatureNameInserter(SynonimsHolder * synonims, StringsFile & names)
-    : m_synonims(synonims), m_names(names)
+  FeatureNameInserter(SynonymsHolder * synonyms, StringsFile & names)
+    : m_synonyms(synonyms), m_names(names)
   {
   }
 
@@ -102,11 +102,11 @@ struct FeatureNameInserter
 private:
   typedef buffer_vector<strings::UniString, 32> TokensArrayT;
 
-  class PushSynonims
+  class PushSynonyms
   {
     TokensArrayT & m_tokens;
   public:
-    PushSynonims(TokensArrayT & tokens) : m_tokens(tokens) {}
+    PushSynonyms(TokensArrayT & tokens) : m_tokens(tokens) {}
     void operator() (string const & utf8str) const
     {
       m_tokens.push_back(search::NormalizeAndSimplifyString(utf8str));
@@ -122,9 +122,9 @@ public:
     buffer_vector<strings::UniString, 32> tokens;
     SplitUniString(uniName, MakeBackInsertFunctor(tokens), search::Delimiters());
 
-    // add synonims for input native string
-    if (m_synonims)
-      m_synonims->ForEach(name, PushSynonims(tokens));
+    // add synonyms for input native string
+    if (m_synonyms)
+      m_synonyms->ForEach(name, PushSynonyms(tokens));
 
     int const maxTokensCount = search::MAX_TOKENS - 1;
     if (tokens.size() > maxTokensCount)
@@ -142,7 +142,7 @@ public:
 
 class FeatureInserter
 {
-  SynonimsHolder * m_synonims;
+  SynonymsHolder * m_synonyms;
   StringsFile & m_names;
 
   CategoriesHolder const & m_categories;
@@ -372,11 +372,11 @@ class FeatureInserter
   };
 
 public:
-  FeatureInserter(SynonimsHolder * synonims, StringsFile & names,
+  FeatureInserter(SynonymsHolder * synonyms, StringsFile & names,
                   CategoriesHolder const & catHolder,
                   serial::CodingParams const & cp,
                   pair<int, int> const & scales)
-    : m_synonims(synonims), m_names(names),
+    : m_synonyms(synonyms), m_names(names),
       m_categories(catHolder), m_valueSaver(cp), m_scales(scales)
   {
   }
@@ -393,7 +393,7 @@ public:
     }
 
     // init inserter with serialized value
-    FeatureNameInserter inserter(m_synonims, m_names);
+    FeatureNameInserter inserter(m_synonyms, m_names);
     MakeValue(f, types, pos, inserter.m_val);
 
     // add names of the feature
@@ -445,13 +445,13 @@ void BuildSearchIndex(FilesContainerR const & cont, CategoriesHolder const & cat
 
     serial::CodingParams cp(search::GetCPForTrie(header.GetDefCodingParams()));
 
-    scoped_ptr<SynonimsHolder> synonims;
+    scoped_ptr<SynonymsHolder> synonyms;
     if (header.GetType() == feature::DataHeader::world)
-      synonims.reset(new SynonimsHolder(GetPlatform().WritablePathForFile(SYNONIMS_FILE)));
+      synonyms.reset(new SynonymsHolder(GetPlatform().WritablePathForFile(SYNONYMS_FILE)));
 
     StringsFile names(tmpFilePath);
 
-    featuresV.ForEachOffset(FeatureInserter(synonims.get(), names,
+    featuresV.ForEachOffset(FeatureInserter(synonyms.get(), names,
                                             catHolder, cp, header.GetScaleRange()));
 
     names.EndAdding();
diff --git a/search/search_query.cpp b/search/search_query.cpp
index 7b6a407431..235d5a1553 100644
--- a/search/search_query.cpp
+++ b/search/search_query.cpp
@@ -695,7 +695,7 @@ Query::Params::Params(Query const & q, bool isLocalities/* = false*/)
   for (size_t i = 0; i < tokensCount; ++i)
     m_tokens[i].push_back(q.m_tokens[i]);
 
-  // Add names of categories (and synonims).
+  // Add names of categories (and synonyms).
   if (q.m_pCategories && !isLocalities)
   {
     for (size_t i = 0; i < tokensCount; ++i)
@@ -795,9 +795,9 @@ namespace impl
     typedef strings::UniString StringT;
     typedef buffer_vector<StringT, 32> TokensArrayT;
 
-    size_t GetSynonimTokenLength(TokensArrayT const & tokens, StringT const & prefix) const
+    size_t GetSynonymTokenLength(TokensArrayT const & tokens, StringT const & prefix) const
     {
-      // check only one token as a synonim
+      // check only one token as a synonym
       if (m_matchedTokens.size() == 1)
       {
         size_t const index = m_matchedTokens[0];
@@ -824,12 +824,12 @@ namespace impl
       switch (m_index)
       {
       case 0:   // USA state
-        // USA states has 2-symbol synonims
-        return (isMatched || GetSynonimTokenLength(tokens, prefix) == 2);
+        // USA states has 2-symbol synonyms
+        return (isMatched || GetSynonymTokenLength(tokens, prefix) == 2);
 
       case 1:   // country
-        // USA has synonims: "US" or "USA"
-        return (isMatched || (m_enName == "usa" && GetSynonimTokenLength(tokens, prefix) <= 3));
+        // USA has synonyms: "US" or "USA"
+        return (isMatched || (m_enName == "usa" && GetSynonymTokenLength(tokens, prefix) <= 3));
 
       case 2:   // city
         // need full name match for cities
@@ -901,7 +901,7 @@ void Query::SearchAddress()
         }
         else
         {
-          // Add founded locality as a result if nothing left to match.
+          // Add found locality as a result if nothing left to match.
           AddResultFromTrie(loc.m_value, mwmId);
         }
       }
@@ -1121,7 +1121,8 @@ namespace impl
       Locality * p1st = 0;
       for (vector<Locality>::reverse_iterator i = arr.rbegin(); i != arr.rend(); ++i)
       {
-        if (!i->IsSuitable(m_query.m_tokens, m_query.m_prefix)) continue;
+        if (!i->IsSuitable(m_query.m_tokens, m_query.m_prefix))
+          continue;
 
         if (!regions.empty())
         {
@@ -1139,7 +1140,8 @@ namespace impl
           if (p == 0)
           {
             // remember first suitable locality for the last chance
-            if (p1st == 0) p1st = &(*i);
+            if (p1st == 0)
+              p1st = &(*i);
 
             // locality doesn't belong to region - goto next
             continue;
diff --git a/search/search_query.hpp b/search/search_query.hpp
index dec68c3973..76ad0a1755 100644
--- a/search/search_query.hpp
+++ b/search/search_query.hpp
@@ -128,7 +128,6 @@ private:
     bool IsLangExist(int8_t l) const { return (m_langs.count(l) > 0); }
 
   private:
-    void AddSynonims(Query const & q, bool isLocalities);
     void FillLanguages(Query const & q);
   };