2 files changed, 8 insertions, 10 deletions
diff --git a/map/transit/transit_reader.cpp b/map/transit/transit_reader.cpp
index 6c039ca436..6a6ee0fe43 100644
--- a/map/transit/transit_reader.cpp
+++ b/map/transit/transit_reader.cpp
@@ -137,11 +137,10 @@ unique_ptr<TransitDisplayInfo> && ReadTransitTask::GetTransitInfo()
   return move(m_transitInfo);
 }
 
-TransitReadManager::TransitReadManager(DataSourceBase & dataSource, TReadFeaturesFn const & readFeaturesFn,
+TransitReadManager::TransitReadManager(DataSource & dataSource,
+                                       TReadFeaturesFn const & readFeaturesFn,
                                        GetMwmsByRectFn const & getMwmsByRectFn)
-  : m_dataSource(dataSource)
-  , m_readFeaturesFn(readFeaturesFn)
-  , m_getMwmsByRectFn(getMwmsByRectFn)
+  : m_dataSource(dataSource), m_readFeaturesFn(readFeaturesFn), m_getMwmsByRectFn(getMwmsByRectFn)
 {
   Start();
 }
diff --git a/map/transit/transit_reader.hpp b/map/transit/transit_reader.hpp
index 2df70dda9d..4b6a8c81b1 100644
--- a/map/transit/transit_reader.hpp
+++ b/map/transit/transit_reader.hpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-class DataSourceBase;
+class DataSource;
 
 using FeatureCallback = std::function<void (FeatureType const &)>;
 using TReadFeaturesFn = std::function<void (FeatureCallback const & , std::vector<FeatureID> const &)>;
@@ -31,8 +31,7 @@ using TReadFeaturesFn = std::function<void (FeatureCallback const & , std::vecto
 class ReadTransitTask: public threads::IRoutine
 {
 public:
-  ReadTransitTask(DataSourceBase & dataSource,
-                  TReadFeaturesFn const & readFeaturesFn)
+  ReadTransitTask(DataSource & dataSource, TReadFeaturesFn const & readFeaturesFn)
     : m_dataSource(dataSource), m_readFeaturesFn(readFeaturesFn)
   {}
 
@@ -65,7 +64,7 @@ private:
     }
   };
 
-  DataSourceBase & m_dataSource;
+  DataSource & m_dataSource;
   TReadFeaturesFn m_readFeaturesFn;
 
   uint64_t m_id = 0;
@@ -90,7 +89,7 @@ public:
   using GetMwmsByRectFn = function<vector<MwmSet::MwmId>(m2::RectD const &)>;
   using TransitStateChangedFn = function<void(TransitSchemeState)>;
 
-  TransitReadManager(DataSourceBase & dataSource, TReadFeaturesFn const & readFeaturesFn,
+  TransitReadManager(DataSource & dataSource, TReadFeaturesFn const & readFeaturesFn,
                      GetMwmsByRectFn const & getMwmsByRectFn);
   ~TransitReadManager();
 
@@ -122,7 +121,7 @@ private:
   uint64_t m_nextTasksGroupId = 0;
   std::map<uint64_t, size_t> m_tasksGroups;
 
-  DataSourceBase & m_dataSource;
+  DataSource & m_dataSource;
   TReadFeaturesFn m_readFeaturesFn;
 
   df::DrapeEngineSafePtr m_drapeEngine;