[base] Unified stl_add and stl_helpers.

10 files changed, 26 insertions, 26 deletions

diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp
index f5d7b58212..66ac6ec91b 100644
--- a/drape_frontend/apply_feature_functors.cpp
+++ b/drape_frontend/apply_feature_functors.cpp
@@ -314,16 +314,16 @@ dp::FontDecl GetRoadShieldTextFont(dp::FontDecl const & baseFont, ftypes::RoadSh
   using ftypes::RoadShieldType;
 
   static std::unordered_map<int, df::ColorConstant> kColors = {
-      {my::Key(RoadShieldType::Generic_Green), kRoadShieldWhiteTextColor},
-      {my::Key(RoadShieldType::Generic_Blue), kRoadShieldWhiteTextColor},
-      {my::Key(RoadShieldType::UK_Highway), kRoadShieldUKYellowTextColor},
-      {my::Key(RoadShieldType::US_Interstate), kRoadShieldWhiteTextColor},
-      {my::Key(RoadShieldType::US_Highway), kRoadShieldBlackTextColor},
-      {my::Key(RoadShieldType::Generic_Red), kRoadShieldWhiteTextColor},
-      {my::Key(RoadShieldType::Generic_Orange), kRoadShieldBlackTextColor}
+      {base::Key(RoadShieldType::Generic_Green), kRoadShieldWhiteTextColor},
+      {base::Key(RoadShieldType::Generic_Blue), kRoadShieldWhiteTextColor},
+      {base::Key(RoadShieldType::UK_Highway), kRoadShieldUKYellowTextColor},
+      {base::Key(RoadShieldType::US_Interstate), kRoadShieldWhiteTextColor},
+      {base::Key(RoadShieldType::US_Highway), kRoadShieldBlackTextColor},
+      {base::Key(RoadShieldType::Generic_Red), kRoadShieldWhiteTextColor},
+      {base::Key(RoadShieldType::Generic_Orange), kRoadShieldBlackTextColor}
   };
 
-  auto it = kColors.find(my::Key(shield.m_type));
+  auto it = kColors.find(base::Key(shield.m_type));
   if (it != kColors.end())
     f.m_color = df::GetColorConstant(it->second);
 
@@ -335,14 +335,14 @@ dp::Color GetRoadShieldColor(dp::Color const & baseColor, ftypes::RoadShield con
   using ftypes::RoadShieldType;
 
   static std::unordered_map<int, df::ColorConstant> kColors = {
-      {my::Key(RoadShieldType::Generic_Green), kRoadShieldGreenBackgroundColor},
-      {my::Key(RoadShieldType::Generic_Blue), kRoadShieldBlueBackgroundColor},
-      {my::Key(RoadShieldType::UK_Highway), kRoadShieldGreenBackgroundColor},
-      {my::Key(RoadShieldType::Generic_Red), kRoadShieldRedBackgroundColor},
-      {my::Key(RoadShieldType::Generic_Orange), kRoadShieldOrangeBackgroundColor}
+      {base::Key(RoadShieldType::Generic_Green), kRoadShieldGreenBackgroundColor},
+      {base::Key(RoadShieldType::Generic_Blue), kRoadShieldBlueBackgroundColor},
+      {base::Key(RoadShieldType::UK_Highway), kRoadShieldGreenBackgroundColor},
+      {base::Key(RoadShieldType::Generic_Red), kRoadShieldRedBackgroundColor},
+      {base::Key(RoadShieldType::Generic_Orange), kRoadShieldOrangeBackgroundColor}
   };
 
-  auto it = kColors.find(my::Key(shield.m_type));
+  auto it = kColors.find(base::Key(shield.m_type));
   if (it != kColors.end())
     return df::GetColorConstant(it->second);
 
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 7ff07c64a3..f8d481b089 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -29,10 +29,10 @@
 
 #include "geometry/any_rect2d.hpp"
 
-#include "base/timer.hpp"
 #include "base/assert.hpp"
 #include "base/logging.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
+#include "base/timer.hpp"
 
 #include <algorithm>
 #include <chrono>
diff --git a/drape_frontend/gui/gui_text.cpp b/drape_frontend/gui/gui_text.cpp
index 8f7b4c77e1..a4f7d98668 100644
--- a/drape_frontend/gui/gui_text.cpp
+++ b/drape_frontend/gui/gui_text.cpp
@@ -4,8 +4,8 @@
 
 #include "shaders/programs.hpp"
 
+#include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
-#include "base/stl_add.hpp"
 
 #include "drape/bidi.hpp"
 #include "drape/glsl_func.hpp"
diff --git a/drape_frontend/gui/layer_render.cpp b/drape_frontend/gui/layer_render.cpp
index 75c24fe7d3..15bf497f1c 100644
--- a/drape_frontend/gui/layer_render.cpp
+++ b/drape_frontend/gui/layer_render.cpp
@@ -18,7 +18,7 @@
 #include "geometry/mercator.hpp"
 #include "geometry/point2d.hpp"
 
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 #include <ios>
 #include <functional>
diff --git a/drape_frontend/message_queue.cpp b/drape_frontend/message_queue.cpp
index 8ff981910e..5d6b1c27f8 100644
--- a/drape_frontend/message_queue.cpp
+++ b/drape_frontend/message_queue.cpp
@@ -1,7 +1,7 @@
 #include "drape_frontend/message_queue.hpp"
 
 #include "base/assert.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/path_text_shape.cpp b/drape_frontend/path_text_shape.cpp
index d8e046c715..9795a38de4 100644
--- a/drape_frontend/path_text_shape.cpp
+++ b/drape_frontend/path_text_shape.cpp
@@ -8,12 +8,12 @@
 #include "drape/batcher.hpp"
 #include "drape/overlay_handle.hpp"
 
-#include "base/math.hpp"
 #include "base/logging.hpp"
-#include "base/stl_add.hpp"
+#include "base/math.hpp"
+#include "base/matrix.hpp"
+#include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
 #include "base/timer.hpp"
-#include "base/matrix.hpp"
 
 #include "geometry/transformations.hpp"
 
diff --git a/drape_frontend/read_manager.cpp b/drape_frontend/read_manager.cpp
index af3339670a..3a336b1705 100755
--- a/drape_frontend/read_manager.cpp
+++ b/drape_frontend/read_manager.cpp
@@ -6,7 +6,7 @@
 #include "drape/constants.hpp"
 
 #include "base/buffer_vector.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 #include <algorithm>
 #include <functional>
diff --git a/drape_frontend/render_group.cpp b/drape_frontend/render_group.cpp
index 8791b15235..c7723d1716 100755
--- a/drape_frontend/render_group.cpp
+++ b/drape_frontend/render_group.cpp
@@ -8,7 +8,7 @@
 
 #include "geometry/screenbase.hpp"
 
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 #include <algorithm>
 #include <sstream>
diff --git a/drape_frontend/scenario_manager.hpp b/drape_frontend/scenario_manager.hpp
index a174a62095..d158c1fdc4 100644
--- a/drape_frontend/scenario_manager.hpp
+++ b/drape_frontend/scenario_manager.hpp
@@ -6,7 +6,7 @@
 
 #include "geometry/point2d.hpp"
 
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 #include "base/thread.hpp"
 
 #include <chrono>
diff --git a/drape_frontend/tile_utils.cpp b/drape_frontend/tile_utils.cpp
index b29cf02e90..e8bdcaf2db 100755
--- a/drape_frontend/tile_utils.cpp
+++ b/drape_frontend/tile_utils.cpp
@@ -5,7 +5,7 @@
 #include "geometry/mercator.hpp"
 
 #include "base/assert.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 namespace df
 {