[base] Replaced the namespace my with base.

15 files changed, 34 insertions, 34 deletions

diff --git a/drape_frontend/animation/interpolators.cpp b/drape_frontend/animation/interpolators.cpp
index 7036a0eeef..369bf87225 100644
--- a/drape_frontend/animation/interpolators.cpp
+++ b/drape_frontend/animation/interpolators.cpp
@@ -12,7 +12,7 @@ double CalcAnimSpeedDuration(double pxDiff, double pxSpeed)
 {
   double constexpr kEps = 1e-5;
 
-  if (my::AlmostEqualAbs(pxDiff, 0.0, kEps))
+  if (base::AlmostEqualAbs(pxDiff, 0.0, kEps))
     return 0.0;
 
   return fabs(pxDiff) / pxSpeed;
diff --git a/drape_frontend/color_constants.cpp b/drape_frontend/color_constants.cpp
index 1ce41f1c3c..0eea536971 100644
--- a/drape_frontend/color_constants.cpp
+++ b/drape_frontend/color_constants.cpp
@@ -51,7 +51,7 @@ public:
 
     try
     {
-      my::Json root(data);
+      base::Json root(data);
 
       if (root.get() == nullptr)
         return;
@@ -77,7 +77,7 @@ public:
         m_nightColors[df::GetTransitTextColorName(name)] = ParseColor(strValue);
       }
     }
-    catch (my::Json::Exception const & e)
+    catch (base::Json::Exception const & e)
     {
       LOG(LWARNING, ("Reading transit colors failed:", e.Msg()));
     }
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index 448c2753e2..a2974dac95 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -49,7 +49,7 @@ DrapeEngine::DrapeEngine(Params && params)
   double timeInBackground = 0.0;
   double lastEnterBackground = 0.0;
   if (settings::Get("LastEnterBackground", lastEnterBackground))
-    timeInBackground = my::Timer::LocalTime() - lastEnterBackground;
+    timeInBackground = base::Timer::LocalTime() - lastEnterBackground;
 
   std::vector<PostprocessRenderer::Effect> effects;
 
@@ -760,7 +760,7 @@ void DrapeEngine::SetFontScaleFactor(double scaleFactor)
   double const kMinScaleFactor = 0.5;
   double const kMaxScaleFactor = 2.0;
 
-  scaleFactor = my::clamp(scaleFactor, kMinScaleFactor, kMaxScaleFactor);
+  scaleFactor = base::clamp(scaleFactor, kMinScaleFactor, kMaxScaleFactor);
 
   VisualParams::Instance().SetFontScale(scaleFactor);
 }
diff --git a/drape_frontend/drape_frontend_tests/navigator_test.cpp b/drape_frontend/drape_frontend_tests/navigator_test.cpp
index d129a8b50f..d182517117 100644
--- a/drape_frontend/drape_frontend_tests/navigator_test.cpp
+++ b/drape_frontend/drape_frontend_tests/navigator_test.cpp
@@ -61,8 +61,8 @@ namespace
       P const & pxP = arr[i];
       P const gP = nav.PtoG(pxP);
       P const pxP2 = nav.GtoP(gP);
-      TEST(my::AlmostEqualAbs(pxP.x, pxP2.x, 0.00001), (pxP.x, pxP2.x));
-      TEST(my::AlmostEqualAbs(pxP.y, pxP2.y, 0.00001), (pxP.y, pxP2.y));
+      TEST(base::AlmostEqualAbs(pxP.x, pxP2.x, 0.00001), (pxP.x, pxP2.x));
+      TEST(base::AlmostEqualAbs(pxP.y, pxP2.y, 0.00001), (pxP.y, pxP2.y));
     }
   }
 }
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index f8d481b089..412a4f0614 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -1941,7 +1941,7 @@ void FrontendRenderer::Routine::Do()
 
   m_renderer.OnContextCreate();
 
-  my::Timer timer;
+  base::Timer timer;
   double frameTime = 0.0;
   bool modelViewChanged = true;
   bool viewportChanged = true;
diff --git a/drape_frontend/gps_track_renderer.cpp b/drape_frontend/gps_track_renderer.cpp
index 9d78c195fd..dd37e53480 100644
--- a/drape_frontend/gps_track_renderer.cpp
+++ b/drape_frontend/gps_track_renderer.cpp
@@ -159,7 +159,7 @@ dp::Color GpsTrackRenderer::CalculatePointColor(size_t pointIndex, m2::PointD co
     endAlpha = kMaxNightAlpha;
   }
 
-  double const ta = my::clamp(lengthFromStart / fullLength, 0.0, 1.0);
+  double const ta = base::clamp(lengthFromStart / fullLength, 0.0, 1.0);
   double const alpha = startAlpha * (1.0 - ta) + endAlpha * ta;
 
   if ((end.m_timestamp - start.m_timestamp) > kUnknownDistanceTime)
@@ -171,7 +171,7 @@ dp::Color GpsTrackRenderer::CalculatePointColor(size_t pointIndex, m2::PointD co
 
   double const length = (end.m_point - start.m_point).Length();
   double const dist = (curPoint - start.m_point).Length();
-  double const td = my::clamp(dist / length, 0.0, 1.0);
+  double const td = base::clamp(dist / length, 0.0, 1.0);
 
   double const speed = max(start.m_speedMPS * (1.0 - td) + end.m_speedMPS * td, 0.0);
   dp::Color const color = GetColorBySpeed(speed);
diff --git a/drape_frontend/gui/compass.cpp b/drape_frontend/gui/compass.cpp
index 92c9fdca7f..002592c7c2 100644
--- a/drape_frontend/gui/compass.cpp
+++ b/drape_frontend/gui/compass.cpp
@@ -33,8 +33,8 @@ struct CompassVertex
 class CompassHandle : public TappableHandle
 {
   using TBase = TappableHandle;
-  double const kVisibleStartAngle = my::DegToRad(5.0);
-  double const kVisibleEndAngle = my::DegToRad(355.0);
+  double const kVisibleStartAngle = base::DegToRad(5.0);
+  double const kVisibleEndAngle = base::DegToRad(355.0);
 
 public:
   CompassHandle(uint32_t id, m2::PointF const & pivot, m2::PointF const & size,
diff --git a/drape_frontend/gui/ruler_helper.cpp b/drape_frontend/gui/ruler_helper.cpp
index ba48c7e7c1..f0fcff1510 100644
--- a/drape_frontend/gui/ruler_helper.cpp
+++ b/drape_frontend/gui/ruler_helper.cpp
@@ -110,7 +110,7 @@ RulerHelper::RulerHelper()
 void RulerHelper::Update(ScreenBase const & screen)
 {
   m2::PointD pivot = screen.PixelRect().Center();
-  int const minPxWidth = my::rounds(kMinPixelWidth * df::VisualParams::Instance().GetVisualScale());
+  int const minPxWidth = base::rounds(kMinPixelWidth * df::VisualParams::Instance().GetVisualScale());
   m2::PointD pt1 = screen.PtoG(pivot);
   m2::PointD pt0 = screen.PtoG(pivot - m2::PointD(minPxWidth, 0));
 
@@ -130,7 +130,7 @@ void RulerHelper::Update(ScreenBase const & screen)
     double const a = ang::AngleTo(pt1, pt0);
     pt0 = MercatorBounds::GetSmPoint(pt1, cos(a) * metersDiff, sin(a) * metersDiff);
 
-    m_pixelLength = my::rounds(pivot.Length(screen.GtoP(pt0)));
+    m_pixelLength = base::rounds(pivot.Length(screen.GtoP(pt0)));
   }
 
   int drawScale = df::GetDrawTileScale(screen);
diff --git a/drape_frontend/gui/scale_fps_helper.hpp b/drape_frontend/gui/scale_fps_helper.hpp
index a59acfa341..55ce30d03a 100644
--- a/drape_frontend/gui/scale_fps_helper.hpp
+++ b/drape_frontend/gui/scale_fps_helper.hpp
@@ -48,7 +48,7 @@ private:
   int m_scale = 1;
   bool m_isVisible = false;
 
-  my::Timer m_fpsAggregationTimer;
+  base::Timer m_fpsAggregationTimer;
   double m_aggregatedFrameTime = 0.0;
   uint32_t m_framesCounter = 1;
   bool m_isPaused = false;
diff --git a/drape_frontend/line_shape_helper.cpp b/drape_frontend/line_shape_helper.cpp
index 7013b81541..bbd9015ea2 100644
--- a/drape_frontend/line_shape_helper.cpp
+++ b/drape_frontend/line_shape_helper.cpp
@@ -266,7 +266,7 @@ float GetProjectionLength(glsl::vec2 const & newPoint, glsl::vec2 const & startP
   glsl::vec2 const v2 = newPoint - startPoint;
   float const squareLen = glsl::dot(v1, v1);
   float const proj = glsl::dot(v1, v2) / squareLen;
-  return sqrt(squareLen) * my::clamp(proj, 0.0f, 1.0f);
+  return sqrt(squareLen) * base::clamp(proj, 0.0f, 1.0f);
 }
 }  // namespace df
 
diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp
index 566ffac37a..27cac70d95 100644
--- a/drape_frontend/my_position_controller.cpp
+++ b/drape_frontend/my_position_controller.cpp
@@ -428,7 +428,7 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool
   if ((isNavigable && hasBearing) ||
       (!isNavigable && hasBearing && info.HasSpeed() && info.m_speedMpS > kMinSpeedThresholdMps))
   {
-    SetDirection(my::DegToRad(info.m_bearing));
+    SetDirection(base::DegToRad(info.m_bearing));
     m_lastGPSBearing.Reset();
   }
 
@@ -657,7 +657,7 @@ bool MyPositionController::AlmostCurrentPosition(m2::PointD const & pos) const
 bool MyPositionController::AlmostCurrentAzimut(double azimut) const
 {
   double const kDirectionEqualityDelta = 1e-5;
-  return my::AlmostEqualAbs(azimut, m_drawDirection, kDirectionEqualityDelta);
+  return base::AlmostEqualAbs(azimut, m_drawDirection, kDirectionEqualityDelta);
 }
 
 void MyPositionController::SetDirection(double bearing)
diff --git a/drape_frontend/my_position_controller.hpp b/drape_frontend/my_position_controller.hpp
index f7e211bbab..238a5b2d3c 100644
--- a/drape_frontend/my_position_controller.hpp
+++ b/drape_frontend/my_position_controller.hpp
@@ -184,12 +184,12 @@ private:
   double m_autoScale2d;
   double m_autoScale3d;
 
-  my::Timer m_lastGPSBearing;
-  my::Timer m_pendingTimer;
-  my::Timer m_routingNotFollowTimer;
+  base::Timer m_lastGPSBearing;
+  base::Timer m_pendingTimer;
+  base::Timer m_routingNotFollowTimer;
   bool m_blockRoutingNotFollowTimer = false;
-  my::Timer m_blockAutoZoomTimer;
-  my::Timer m_updateLocationTimer;
+  base::Timer m_blockAutoZoomTimer;
+  base::Timer m_updateLocationTimer;
   double m_lastLocationTimestamp;
 
   m2::RectD m_pixelRect;
diff --git a/drape_frontend/traffic_renderer.cpp b/drape_frontend/traffic_renderer.cpp
index b220aa32c6..51dc400a02 100644
--- a/drape_frontend/traffic_renderer.cpp
+++ b/drape_frontend/traffic_renderer.cpp
@@ -316,7 +316,7 @@ bool TrafficRenderer::CanBeRenderedAsLine(RoadClass const & roadClass, int zoomL
   if (it == lineDrawer->end())
     return false;
 
-  width = max(1, my::rounds(TrafficRenderer::GetPixelWidthInternal(roadClass, zoomLevel)));
+  width = max(1, base::rounds(TrafficRenderer::GetPixelWidthInternal(roadClass, zoomLevel)));
   return width <= dp::SupportManager::Instance().GetMaxLineWidth();
 }
 }  // namespace df
diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp
index ff27e1ba0e..836c26cc73 100644
--- a/drape_frontend/user_event_stream.hpp
+++ b/drape_frontend/user_event_stream.hpp
@@ -59,7 +59,7 @@ class TouchEvent : public UserEvent
 public:
   TouchEvent()
     : m_type(TOUCH_CANCEL)
-    , m_timeStamp(my::Timer::LocalTime())
+    , m_timeStamp(base::Timer::LocalTime())
     , m_pointersMask(0xFFFF)
   {}
 
@@ -477,7 +477,7 @@ private:
   bool m_needTrackCenter = false;
 
   Navigator m_navigator;
-  my::Timer m_touchTimer;
+  base::Timer m_touchTimer;
   enum ERecognitionState
   {
     STATE_EMPTY,
@@ -507,7 +507,7 @@ private:
   m2::PointD m_startDoubleTapAndHold;
 
   KineticScroller m_scroller;
-  my::Timer m_kineticTimer;
+  base::Timer m_kineticTimer;
   bool m_kineticScrollEnabled = true;
 };
 }  // namespace df
diff --git a/drape_frontend/visual_params.cpp b/drape_frontend/visual_params.cpp
index b954d46707..db74bf8bd4 100644
--- a/drape_frontend/visual_params.cpp
+++ b/drape_frontend/visual_params.cpp
@@ -195,7 +195,7 @@ int GetTileScaleBase(ScreenBase const & s)
 int GetTileScaleBase(m2::RectD const & r)
 {
   double const sz = std::max(r.SizeX(), r.SizeY());
-  return std::max(1, my::rounds(log((MercatorBounds::maxX - MercatorBounds::minX) / sz) / log(2.0)));
+  return std::max(1, base::rounds(log((MercatorBounds::maxX - MercatorBounds::minX) / sz) / log(2.0)));
 }
 
 double GetTileScaleBase(double drawScale)
@@ -235,12 +235,12 @@ m2::RectD GetRectForDrawScale(int drawScale, m2::PointD const & center)
 
 m2::RectD GetRectForDrawScale(double drawScale, m2::PointD const & center, uint32_t tileSize, double visualScale)
 {
-  return GetRectForDrawScale(my::rounds(drawScale), center, tileSize, visualScale);
+  return GetRectForDrawScale(base::rounds(drawScale), center, tileSize, visualScale);
 }
 
 m2::RectD GetRectForDrawScale(double drawScale, m2::PointD const & center)
 {
-  return GetRectForDrawScale(my::rounds(drawScale), center);
+  return GetRectForDrawScale(base::rounds(drawScale), center);
 }
 
 uint32_t CalculateTileSize(uint32_t screenWidth, uint32_t screenHeight)
@@ -268,9 +268,9 @@ uint32_t CalculateTileSize(uint32_t screenWidth, uint32_t screenHeight)
   }
 
 #ifndef OMIM_OS_DESKTOP
-  return static_cast<uint32_t>(my::clamp(res / 2, 256, 1024));
+  return static_cast<uint32_t>(base::clamp(res / 2, 256, 1024));
 #else
-  return static_cast<uint32_t>(my::clamp(res / 2, 512, 1024));
+  return static_cast<uint32_t>(base::clamp(res / 2, 512, 1024));
 #endif
 }
 
@@ -341,7 +341,7 @@ m2::PointF InterpolateByZoomLevels(int index, float lerpCoef, std::vector<m2::Po
 double GetNormalizedZoomLevel(double screenScale, int minZoom)
 {
   double const kMaxZoom = scales::GetUpperStyleScale() + 1.0;
-  return my::clamp((GetZoomLevel(screenScale) - minZoom) / (kMaxZoom - minZoom), 0.0, 1.0);
+  return base::clamp((GetZoomLevel(screenScale) - minZoom) / (kMaxZoom - minZoom), 0.0, 1.0);
 }
 
 double GetScreenScale(double zoomLevel)
@@ -360,6 +360,6 @@ double GetZoomLevel(double screenScale)
   auto const len = pxLen * screenScale;
   auto const factor = (MercatorBounds::maxX - MercatorBounds::minX) / len;
   static double const kLog2 = log(2.0);
-  return my::clamp(GetDrawTileScale(fabs(log(factor) / kLog2)), 1.0, scales::GetUpperStyleScale() + 1.0);
+  return base::clamp(GetDrawTileScale(fabs(log(factor) / kLog2)), 1.0, scales::GetUpperStyleScale() + 1.0);
 }
 }  // namespace df