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
path: root/editor
diff options
context:
space:
mode:
authorVladiMihaylenko <vxmihaylenko@gmail.com>2016-04-27 17:07:07 +0300
committerAlex Zolotarev <alex@maps.me>2016-05-01 10:28:03 +0300
commit21e50e2d5e3f2fca71cc4da012e6d2687ed773a2 (patch)
tree75d7ca72b65b36452c85da23fc6e53a32dce066e /editor
parent60f44c06991d632771a6ed7c83077c312f5cd65f (diff)
[indexer] Added move assignment operator for CategoriesIndex.
Diffstat (limited to 'editor')
-rw-r--r--editor/new_feature_categories.cpp4
-rw-r--r--editor/new_feature_categories.hpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/editor/new_feature_categories.cpp b/editor/new_feature_categories.cpp
index 8b235d1db8..90f033a728 100644
--- a/editor/new_feature_categories.cpp
+++ b/editor/new_feature_categories.cpp
@@ -36,7 +36,7 @@ void NewFeatureCategories::AddLanguage(string const & lang)
for (auto const & type : m_types)
{
m_index.AddCategoryByTypeAndLang(type, langCode);
- names.push_back(m_index.GetCategoriesHolder().GetReadableFeatureType(type, langCode));
+ names.push_back(m_index.GetCategoriesHolder()->GetReadableFeatureType(type, langCode));
}
my::SortUnique(names);
m_categoryNames[lang] = names;
@@ -50,7 +50,7 @@ vector<string> NewFeatureCategories::Search(string const & query, string const &
vector<string> result(resultTypes.size());
for (size_t i = 0; i < result.size(); ++i)
- result[i] = m_index.GetCategoriesHolder().GetReadableFeatureType(resultTypes[i], langCode);
+ result[i] = m_index.GetCategoriesHolder()->GetReadableFeatureType(resultTypes[i], langCode);
my::SortUnique(result);
return result;
}
diff --git a/editor/new_feature_categories.hpp b/editor/new_feature_categories.hpp
index eb4d45f3c6..66f604dc2e 100644
--- a/editor/new_feature_categories.hpp
+++ b/editor/new_feature_categories.hpp
@@ -27,6 +27,10 @@ public:
{
}
+ NewFeatureCategories() = default;
+
+ NewFeatureCategories & operator=(NewFeatureCategories && other) = default;
+
// Adds all known synonyms in language |lang| for all categories that
// can be applied to a newly added feature.
void AddLanguage(string const & lang);