From 5bd46a0144339fb35e9c1cba55050dcdadc7a67f Mon Sep 17 00:00:00 2001
From: Maxim Pimenov <m@maps.me>
Date: Wed, 12 Dec 2018 20:17:50 +0300
Subject: [coding] Renamed the StringUtf8Multilang files.

Also added some documentation on how StringUtf8Multilang is stored.
---
 indexer/brands_holder.cpp                 | 2 +-
 indexer/categories_holder.hpp             | 5 +++--
 indexer/editable_map_object.hpp           | 2 +-
 indexer/feature_data.hpp                  | 2 +-
 indexer/feature_meta.hpp                  | 2 +-
 indexer/feature_utils.cpp                 | 2 +-
 indexer/indexer_tests/brands_tests.cpp    | 2 +-
 indexer/indexer_tests/categories_test.cpp | 2 +-
 indexer/map_object.hpp                    | 2 +-
 9 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'indexer')

diff --git a/indexer/brands_holder.cpp b/indexer/brands_holder.cpp
index 1b9c68fd46..18c8e7d7dd 100644
--- a/indexer/brands_holder.cpp
+++ b/indexer/brands_holder.cpp
@@ -4,9 +4,9 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/multilang_utf8_string.hpp"
 #include "coding/reader.hpp"
 #include "coding/reader_streambuf.hpp"
+#include "coding/string_utf8_multilang.hpp"
 
 #include "base/logging.hpp"
 
diff --git a/indexer/categories_holder.hpp b/indexer/categories_holder.hpp
index e7adbc2874..2f385292df 100644
--- a/indexer/categories_holder.hpp
+++ b/indexer/categories_holder.hpp
@@ -26,8 +26,9 @@ public:
     struct Name
     {
       std::string m_name;
-      /// This language/locale code is completely different from our built-in langs in multilang_utf8_string.cpp
-      /// and is only used for mapping user's input language to our values in categories.txt file
+      /// This language/locale code is completely different from our built-in langs in
+      /// string_utf8_multilang.cpp and is only used for mapping user's input language to our values
+      /// in categories.txt file
       int8_t m_locale;
       uint8_t m_prefixLengthToSuggest;
     };
diff --git a/indexer/editable_map_object.hpp b/indexer/editable_map_object.hpp
index 6595615c24..a11624949b 100644
--- a/indexer/editable_map_object.hpp
+++ b/indexer/editable_map_object.hpp
@@ -8,7 +8,7 @@
 #include "geometry/latlon.hpp"
 #include "geometry/mercator.hpp"
 
-#include "coding/multilang_utf8_string.hpp"
+#include "coding/string_utf8_multilang.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index 7fecf628b5..8db386ddab 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -5,8 +5,8 @@
 
 #include "geometry/point2d.hpp"
 
-#include "coding/multilang_utf8_string.hpp"
 #include "coding/reader.hpp"
+#include "coding/string_utf8_multilang.hpp"
 #include "coding/value_opt_string.hpp"
 
 #include <algorithm>
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index b5a6e85102..2890ef7db2 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "coding/multilang_utf8_string.hpp"
 #include "coding/reader.hpp"
+#include "coding/string_utf8_multilang.hpp"
 
 #include <algorithm>
 #include <map>
diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp
index c0d0c0146d..70e8ff7e3d 100644
--- a/indexer/feature_utils.cpp
+++ b/indexer/feature_utils.cpp
@@ -7,7 +7,7 @@
 
 #include "geometry/point2d.hpp"
 
-#include "coding/multilang_utf8_string.hpp"
+#include "coding/string_utf8_multilang.hpp"
 #include "coding/transliteration.hpp"
 
 #include "base/base.hpp"
diff --git a/indexer/indexer_tests/brands_tests.cpp b/indexer/indexer_tests/brands_tests.cpp
index b2801495ab..d2b398be1d 100644
--- a/indexer/indexer_tests/brands_tests.cpp
+++ b/indexer/indexer_tests/brands_tests.cpp
@@ -2,8 +2,8 @@
 
 #include "indexer/brands_holder.hpp"
 
-#include "coding/multilang_utf8_string.hpp"
 #include "coding/reader.hpp"
+#include "coding/string_utf8_multilang.hpp"
 
 #include <memory>
 #include <set>
diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp
index 0e7d24fbcb..618eca832f 100644
--- a/indexer/indexer_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@@ -5,8 +5,8 @@
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
 
-#include "coding/multilang_utf8_string.hpp"
 #include "coding/reader.hpp"
+#include "coding/string_utf8_multilang.hpp"
 
 #include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp
index f431af2c16..92fba24246 100644
--- a/indexer/map_object.hpp
+++ b/indexer/map_object.hpp
@@ -8,7 +8,7 @@
 #include "geometry/latlon.hpp"
 #include "geometry/mercator.hpp"
 
-#include "coding/multilang_utf8_string.hpp"
+#include "coding/string_utf8_multilang.hpp"
 
 #include "base/stl_helpers.hpp"
 
-- 
cgit v1.2.3