From 8a23148ae6ba49e834c896f6e74d7b9d3719be15 Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Thu, 1 Nov 2018 11:19:40 +0300 Subject: [PATCH] [routing] Remove editor header includes from routing --- routing/bicycle_directions.cpp | 2 -- routing/bicycle_directions.hpp | 2 -- routing/features_road_graph.cpp | 3 +-- routing/geometry.cpp | 3 +-- routing/index_road_graph.cpp | 2 +- routing/routing_tests/CMakeLists.txt | 1 - 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp index cb91c090c2..ed5b56eeb6 100644 --- a/routing/bicycle_directions.cpp +++ b/routing/bicycle_directions.cpp @@ -12,8 +12,6 @@ #include "routing_common/car_model.hpp" -#include "editor/editable_data_source.hpp" - #include "indexer/ftypes_matcher.hpp" #include "indexer/scales.hpp" diff --git a/routing/bicycle_directions.hpp b/routing/bicycle_directions.hpp index f9cd50b24e..8071984233 100644 --- a/routing/bicycle_directions.hpp +++ b/routing/bicycle_directions.hpp @@ -7,8 +7,6 @@ #include "routing_common/num_mwm_id.hpp" -#include "editor/editable_data_source.hpp" - #include "indexer/data_source.hpp" #include diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp index fc98327786..de9e90fecb 100644 --- a/routing/features_road_graph.cpp +++ b/routing/features_road_graph.cpp @@ -4,9 +4,8 @@ #include "routing_common/vehicle_model.hpp" -#include "editor/editable_data_source.hpp" - #include "indexer/classificator.hpp" +#include "indexer/data_source.hpp" #include "indexer/ftypes_matcher.hpp" #include "indexer/scales.hpp" diff --git a/routing/geometry.cpp b/routing/geometry.cpp index 9c9ee0c0a4..d6292f7d74 100644 --- a/routing/geometry.cpp +++ b/routing/geometry.cpp @@ -3,9 +3,8 @@ #include "routing/city_roads.hpp" #include "routing/routing_exceptions.hpp" -#include "editor/editable_data_source.hpp" - #include "indexer/altitude_loader.hpp" +#include "indexer/data_source.hpp" #include "geometry/mercator.hpp" diff --git a/routing/index_road_graph.cpp b/routing/index_road_graph.cpp index d95340bc40..dcda53793e 100644 --- a/routing/index_road_graph.cpp +++ b/routing/index_road_graph.cpp @@ -3,7 +3,7 @@ #include "routing/routing_exceptions.hpp" #include "routing/transit_graph.hpp" -#include "editor/editable_data_source.hpp" +#include "indexer/data_source.hpp" #include diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt index d18962f383..eb41b2389b 100644 --- a/routing/routing_tests/CMakeLists.txt +++ b/routing/routing_tests/CMakeLists.txt @@ -45,7 +45,6 @@ omim_link_libraries( routing_common transit kml - editor indexer platform oauthcpp