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/search
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2019-03-19 13:11:53 +0300
committerArsentiy Milchakov <milcars@mapswithme.com>2019-03-19 15:06:58 +0300
commitdb525bf9088dc134f78d5f5ee930765a31b8a4c8 (patch)
tree0a6f7995e70773df57d0fc28cd9ddd539b2dc908 /search
parent939620a534af3d58288c4734fa99f3a85f4b587e (diff)
[coding] Removed JoinFoldersToPath.
Diffstat (limited to 'search')
-rw-r--r--search/pysearch/bindings.cpp2
-rw-r--r--search/search_quality/features_collector_tool/features_collector_tool.cpp2
-rw-r--r--search/search_quality/search_quality_tool/search_quality_tool.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/search/pysearch/bindings.cpp b/search/pysearch/bindings.cpp
index 5859ef9745..85da7a0115 100644
--- a/search/pysearch/bindings.cpp
+++ b/search/pysearch/bindings.cpp
@@ -68,7 +68,7 @@ void Init(string const & resource_path, string const & mwm_path)
if (!resource_path.empty())
{
platform.SetResourceDir(resource_path);
- countriesFile = base::JoinFoldersToPath(resource_path, COUNTRIES_FILE);
+ countriesFile = base::JoinPath(resource_path, COUNTRIES_FILE);
}
if (!mwm_path.empty())
diff --git a/search/search_quality/features_collector_tool/features_collector_tool.cpp b/search/search_quality/features_collector_tool/features_collector_tool.cpp
index db92f2e903..5d306931f4 100644
--- a/search/search_quality/features_collector_tool/features_collector_tool.cpp
+++ b/search/search_quality/features_collector_tool/features_collector_tool.cpp
@@ -116,7 +116,7 @@ int main(int argc, char * argv[])
if (!FLAGS_data_path.empty())
{
platform.SetResourceDir(FLAGS_data_path);
- countriesFile = base::JoinFoldersToPath(FLAGS_data_path, COUNTRIES_FILE);
+ countriesFile = base::JoinPath(FLAGS_data_path, COUNTRIES_FILE);
}
if (!FLAGS_mwm_path.empty())
diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/search/search_quality/search_quality_tool/search_quality_tool.cpp
index 5bac6a20ce..823046329b 100644
--- a/search/search_quality/search_quality_tool/search_quality_tool.cpp
+++ b/search/search_quality/search_quality_tool/search_quality_tool.cpp
@@ -362,7 +362,7 @@ int main(int argc, char * argv[])
if (!FLAGS_data_path.empty())
{
platform.SetResourceDir(FLAGS_data_path);
- countriesFile = base::JoinFoldersToPath(FLAGS_data_path, COUNTRIES_FILE);
+ countriesFile = base::JoinPath(FLAGS_data_path, COUNTRIES_FILE);
}
if (!FLAGS_mwm_path.empty())
@@ -435,7 +435,7 @@ int main(int argc, char * argv[])
vector<string> queries;
string queriesPath = FLAGS_queries_path;
if (queriesPath.empty())
- queriesPath = base::JoinFoldersToPath(platform.WritableDir(), kDefaultQueriesPathSuffix);
+ queriesPath = base::JoinPath(platform.WritableDir(), kDefaultQueriesPathSuffix);
ReadStringsFromFile(queriesPath, queries);
vector<unique_ptr<TestSearchRequest>> requests;