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:
authorMaxim Pimenov <m@maps.me>2018-09-12 14:22:15 +0300
committerVlad Mihaylenko <vxmihaylenko@gmail.com>2018-09-14 15:14:36 +0300
commitc7e09657fa5cc6fd5600252b41e9774b83c0a45d (patch)
tree0c1636a81a6afba6ae87b3040096bb86bf862c81 /editor
parent4a44e1d009cf30dbb9fe759260aeef221a7be561 (diff)
[base] Unified stl_add and stl_helpers.
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_config.cpp2
-rw-r--r--editor/editor_tests/editor_config_test.cpp4
-rw-r--r--editor/edits_migration.cpp4
-rw-r--r--editor/new_feature_categories.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/editor/editor_config.cpp b/editor/editor_config.cpp
index bd77345010..d34172189f 100644
--- a/editor/editor_config.cpp
+++ b/editor/editor_config.cpp
@@ -88,7 +88,7 @@ bool TypeDescriptionFromXml(pugi::xml_node const & root, pugi::xml_node const &
handleField(fieldName);
}
- my::SortUnique(outDesc.m_editableFields);
+ base::SortUnique(outDesc.m_editableFields);
return true;
}
diff --git a/editor/editor_tests/editor_config_test.cpp b/editor/editor_tests/editor_config_test.cpp
index c8fbd02f4a..7666d23a2a 100644
--- a/editor/editor_tests/editor_config_test.cpp
+++ b/editor/editor_tests/editor_config_test.cpp
@@ -46,7 +46,7 @@ UNIT_TEST(EditorConfig_TypeDescription)
TEST(desc.IsAddressEditable(), ());
auto fields = poi;
fields.push_back(EType::FMD_INTERNET);
- my::SortUnique(fields);
+ base::SortUnique(fields);
TEST_EQUAL(desc.GetEditableFields(), fields, ());
}
{
@@ -57,7 +57,7 @@ UNIT_TEST(EditorConfig_TypeDescription)
TEST(desc.IsAddressEditable(), ());
auto fields = poi;
fields.push_back(EType::FMD_OPERATOR);
- my::SortUnique(fields);
+ base::SortUnique(fields);
TEST_EQUAL(desc.GetEditableFields(), fields, ());
}
{
diff --git a/editor/edits_migration.cpp b/editor/edits_migration.cpp
index fb5ae5627e..d04738efe7 100644
--- a/editor/edits_migration.cpp
+++ b/editor/edits_migration.cpp
@@ -78,8 +78,8 @@ FeatureID MigrateWayOrRelatonFeatureIndex(
{
// Support migration for old application versions.
// TODO(a): To remove it when version 8.0.x will no longer be supported.
- my::SortUnique(geometry);
- my::SortUnique(ftGeometry);
+ base::SortUnique(geometry);
+ base::SortUnique(ftGeometry);
score = matcher::ScoreTriangulatedGeometriesByPoints(geometry, ftGeometry);
}
diff --git a/editor/new_feature_categories.cpp b/editor/new_feature_categories.cpp
index cc67efb220..7ac92c84fc 100644
--- a/editor/new_feature_categories.cpp
+++ b/editor/new_feature_categories.cpp
@@ -56,7 +56,7 @@ void NewFeatureCategories::AddLanguage(string lang)
m_index.AddCategoryByTypeAndLang(type, langCode);
names.emplace_back(m_index.GetCategoriesHolder()->GetReadableFeatureType(type, langCode), type);
}
- my::SortUnique(names);
+ base::SortUnique(names);
m_categoriesByLang[lang] = names;
}
@@ -78,7 +78,7 @@ NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query,
m_index.GetCategoriesHolder()->GetReadableFeatureType(resultTypes[i], langCode);
result[i].second = resultTypes[i];
}
- my::SortUnique(result);
+ base::SortUnique(result);
alohalytics::TStringMap const stats = {
{"query", query}, {"lang", lang}};