[base] Changed the namespace of Cancellable from my to base.

10 files changed, 19 insertions, 19 deletions

diff --git a/routing/base/astar_algorithm.hpp b/routing/base/astar_algorithm.hpp
index 0e54fd4d8c..05407c3a24 100644
--- a/routing/base/astar_algorithm.hpp
+++ b/routing/base/astar_algorithm.hpp
@@ -56,7 +56,7 @@ public:
   struct Params
   {
     Params(Graph & graph, Vertex const & startVertex, Vertex const & finalVertex,
-           std::vector<Edge> const * prevRoute, my::Cancellable const & cancellable,
+           std::vector<Edge> const * prevRoute, base::Cancellable const & cancellable,
            OnVisitedVertexCallback const & onVisitedVertexCallback,
            CheckLengthCallback const & checkLengthCallback)
       : m_graph(graph)
@@ -78,7 +78,7 @@ public:
     Vertex const m_finalVertex;
     // Used for AdjustRoute.
     std::vector<Edge> const * const m_prevRoute;
-    my::Cancellable const & m_cancellable;
+    base::Cancellable const & m_cancellable;
     OnVisitedVertexCallback const m_onVisitedVertexCallback;
     CheckLengthCallback const m_checkLengthCallback;
   };
@@ -105,7 +105,7 @@ public:
     Vertex const m_finalVertex;
     // Used for AdjustRoute.
     std::vector<Edge> const * const m_prevRoute;
-    my::Cancellable const m_cancellable;
+    base::Cancellable const m_cancellable;
     OnVisitedVertexCallback const m_onVisitedVertexCallback;
     CheckLengthCallback const m_checkLengthCallback;
   };
@@ -181,7 +181,7 @@ private:
   class PeriodicPollCancellable final
   {
   public:
-    PeriodicPollCancellable(my::Cancellable const & cancellable) : m_cancellable(cancellable) {}
+    PeriodicPollCancellable(base::Cancellable const & cancellable) : m_cancellable(cancellable) {}
 
     bool IsCancelled()
     {
@@ -191,7 +191,7 @@ private:
     }
 
   private:
-    my::Cancellable const & m_cancellable;
+    base::Cancellable const & m_cancellable;
     uint32_t count = 0;
   };
 
diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp
index 8a504c8eba..94cda85cb0 100644
--- a/routing/bicycle_directions.cpp
+++ b/routing/bicycle_directions.cpp
@@ -166,7 +166,7 @@ BicycleDirectionsEngine::BicycleDirectionsEngine(Index const & index, shared_ptr
 }
 
 bool BicycleDirectionsEngine::Generate(IndexRoadGraph const & graph, vector<Junction> const & path,
-                                       my::Cancellable const & cancellable, Route::TTurns & turns,
+                                       base::Cancellable const & cancellable, Route::TTurns & turns,
                                        Route::TStreets & streetNames,
                                        vector<Junction> & routeGeometry, vector<Segment> & segments)
 {
@@ -304,7 +304,7 @@ void BicycleDirectionsEngine::GetEdges(RoadGraphBase const & graph, Junction con
 
 void BicycleDirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
     IndexRoadGraph const & graph, vector<Junction> const & path,
-    IRoadGraph::TEdgeVector const & routeEdges, my::Cancellable const & cancellable)
+    IRoadGraph::TEdgeVector const & routeEdges, base::Cancellable const & cancellable)
 {
   size_t const pathSize = path.size();
   CHECK_GREATER(pathSize, 1, ());
diff --git a/routing/bicycle_directions.hpp b/routing/bicycle_directions.hpp
index 7dd85e91f9..a21c82743c 100644
--- a/routing/bicycle_directions.hpp
+++ b/routing/bicycle_directions.hpp
@@ -32,7 +32,7 @@ public:
 
   // IDirectionsEngine override:
   bool Generate(IndexRoadGraph const & graph, vector<Junction> const & path,
-                my::Cancellable const & cancellable, Route::TTurns & turns,
+                base::Cancellable const & cancellable, Route::TTurns & turns,
                 Route::TStreets & streetNames, vector<Junction> & routeGeometry,
                 vector<Segment> & segments) override;
 
@@ -48,7 +48,7 @@ private:
   void FillPathSegmentsAndAdjacentEdgesMap(IndexRoadGraph const & graph,
                                            std::vector<Junction> const & path,
                                            IRoadGraph::TEdgeVector const & routeEdges,
-                                           my::Cancellable const & cancellable);
+                                           base::Cancellable const & cancellable);
 
   void GetEdges(RoadGraphBase const & graph, Junction const & currJunction,
                 bool isCurrJunctionFinish, IRoadGraph::TEdgeVector & outgoing,
diff --git a/routing/directions_engine.hpp b/routing/directions_engine.hpp
index 33d65bda0c..e2b2a2f2c0 100644
--- a/routing/directions_engine.hpp
+++ b/routing/directions_engine.hpp
@@ -24,7 +24,7 @@ public:
   /// \param path is points of the route. It should not be empty.
   /// \returns true if fields passed by reference are filled correctly and false otherwise.
   virtual bool Generate(IndexRoadGraph const & graph, vector<Junction> const & path,
-                        my::Cancellable const & cancellable, Route::TTurns & turns,
+                        base::Cancellable const & cancellable, Route::TTurns & turns,
                         Route::TStreets & streetNames, vector<Junction> & routeGeometry,
                         vector<Segment> & segments) = 0;
 };
diff --git a/routing/pedestrian_directions.cpp b/routing/pedestrian_directions.cpp
index 7694dea3ab..5f659d7c8a 100644
--- a/routing/pedestrian_directions.cpp
+++ b/routing/pedestrian_directions.cpp
@@ -41,7 +41,7 @@ PedestrianDirectionsEngine::PedestrianDirectionsEngine(shared_ptr<NumMwmIds> num
 
 bool PedestrianDirectionsEngine::Generate(IndexRoadGraph const & graph,
                                           vector<Junction> const & path,
-                                          my::Cancellable const & cancellable,
+                                          base::Cancellable const & cancellable,
                                           Route::TTurns & turns, Route::TStreets & streetNames,
                                           vector<Junction> & routeGeometry,
                                           vector<Segment> & segments)
@@ -67,7 +67,7 @@ bool PedestrianDirectionsEngine::Generate(IndexRoadGraph const & graph,
 void PedestrianDirectionsEngine::CalculateTurns(IndexRoadGraph const & graph,
                                                 vector<Edge> const & routeEdges,
                                                 Route::TTurns & turns,
-                                                my::Cancellable const & cancellable) const
+                                                base::Cancellable const & cancellable) const
 {
   for (size_t i = 0; i < routeEdges.size(); ++i)
   {
diff --git a/routing/pedestrian_directions.hpp b/routing/pedestrian_directions.hpp
index d772513483..ec889cc082 100644
--- a/routing/pedestrian_directions.hpp
+++ b/routing/pedestrian_directions.hpp
@@ -16,13 +16,13 @@ public:
 
   // IDirectionsEngine override:
   bool Generate(IndexRoadGraph const & graph, vector<Junction> const & path,
-                my::Cancellable const & cancellable, Route::TTurns & turns,
+                base::Cancellable const & cancellable, Route::TTurns & turns,
                 Route::TStreets & streetNames, vector<Junction> & routeGeometry,
                 vector<Segment> & segments) override;
 
 private:
   void CalculateTurns(IndexRoadGraph const & graph, std::vector<Edge> const & routeEdges,
-                      Route::TTurns & turnsDir, my::Cancellable const & cancellable) const;
+                      Route::TTurns & turnsDir, base::Cancellable const & cancellable) const;
 
   uint32_t const m_typeSteps;
   uint32_t const m_typeLiftGate;
diff --git a/routing/router_delegate.hpp b/routing/router_delegate.hpp
index 15303fa1a7..7e07a908c8 100644
--- a/routing/router_delegate.hpp
+++ b/routing/router_delegate.hpp
@@ -10,7 +10,7 @@
 
 namespace routing
 {
-class TimeoutCancellable : public my::Cancellable
+class TimeoutCancellable : public base::Cancellable
 {
 public:
   TimeoutCancellable();
diff --git a/routing/routing_algorithm.cpp b/routing/routing_algorithm.cpp
index 3da9cffc27..cc02d28a1c 100644
--- a/routing/routing_algorithm.cpp
+++ b/routing/routing_algorithm.cpp
@@ -154,7 +154,7 @@ IRoutingAlgorithm::Result AStarRoutingAlgorithm::CalculateRoute(IRoadGraph const
 
   };
 
-  my::Cancellable const & cancellable = delegate;
+  base::Cancellable const & cancellable = delegate;
   progress.Initialize(startPos.GetPoint(), finalPos.GetPoint());
   RoadGraph roadGraph(graph);
   TAlgorithmImpl::Params params(roadGraph, startPos, finalPos, nullptr /* prevRoute */, cancellable,
@@ -184,7 +184,7 @@ IRoutingAlgorithm::Result AStarBidirectionalRoutingAlgorithm::CalculateRoute(
       delegate.OnProgress(newValue);
   };
 
-  my::Cancellable const & cancellable = delegate;
+  base::Cancellable const & cancellable = delegate;
   progress.Initialize(startPos.GetPoint(), finalPos.GetPoint());
   RoadGraph roadGraph(graph);
   TAlgorithmImpl::Params params(roadGraph, startPos, finalPos, {} /* prevRoute */, cancellable,
diff --git a/routing/routing_helpers.cpp b/routing/routing_helpers.cpp
index c0b1101675..23679c3459 100644
--- a/routing/routing_helpers.cpp
+++ b/routing/routing_helpers.cpp
@@ -100,7 +100,7 @@ void FillSegmentInfo(vector<Segment> const & segments, vector<Junction> const &
 
 void ReconstructRoute(IDirectionsEngine & engine, IndexRoadGraph const & graph,
                       shared_ptr<TrafficStash> const & trafficStash,
-                      my::Cancellable const & cancellable, vector<Junction> const & path,
+                      base::Cancellable const & cancellable, vector<Junction> const & path,
                       Route::TTimes && times, Route & route)
 {
   if (path.empty())
diff --git a/routing/routing_helpers.hpp b/routing/routing_helpers.hpp
index f3dc3d752f..d266c2fbd3 100644
--- a/routing/routing_helpers.hpp
+++ b/routing/routing_helpers.hpp
@@ -36,7 +36,7 @@ void FillSegmentInfo(std::vector<Segment> const & segments, std::vector<Junction
 
 void ReconstructRoute(IDirectionsEngine & engine, IndexRoadGraph const & graph,
                       std::shared_ptr<TrafficStash> const & trafficStash,
-                      my::Cancellable const & cancellable, std::vector<Junction> const & path,
+                      base::Cancellable const & cancellable, std::vector<Junction> const & path,
                       Route::TTimes && times, Route & route);
 
 /// \brief Converts |edge| to |segment|.