diff options
54 files changed, 351 insertions, 348 deletions
diff --git a/common.pri b/common.pri index 1d6798cf06..f7ce2ff887 100644 --- a/common.pri +++ b/common.pri @@ -17,9 +17,12 @@ VERSION_MINOR = 4 VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR} # Additional include directories, common to most projects. +INCLUDEPATH *= $$ROOT_DIR INCLUDEPATH *= $$ROOT_DIR/3party/boost INCLUDEPATH *= $$ROOT_DIR/3party/glm + + # hack for Qt5 qmake to make it faster CONFIG -= depend_includepath diff --git a/generator/borders_generator.cpp b/generator/borders_generator.cpp index 05d14e07bb..2ba4ca2304 100644 --- a/generator/borders_generator.cpp +++ b/generator/borders_generator.cpp @@ -1,12 +1,12 @@ -#include "borders_generator.hpp" +#include "generator/borders_generator.hpp" -#include "../indexer/mercator.hpp" +#include "indexer/mercator.hpp" -#include "../base/logging.hpp" -#include "../base/string_utils.hpp" -#include "../std/fstream.hpp" -#include "../std/iostream.hpp" -#include "../std/sstream.hpp" +#include "base/logging.hpp" +#include "base/string_utils.hpp" +#include "std/fstream.hpp" +#include "std/iostream.hpp" +#include "std/sstream.hpp" namespace osm { diff --git a/generator/borders_generator.hpp b/generator/borders_generator.hpp index 297973dcb3..8076c9c8a3 100644 --- a/generator/borders_generator.hpp +++ b/generator/borders_generator.hpp @@ -1,10 +1,10 @@ #pragma once -#include "../geometry/region2d.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/region2d.hpp" +#include "geometry/point2d.hpp" -#include "../std/vector.hpp" -#include "../std/string.hpp" +#include "std/vector.hpp" +#include "std/string.hpp" namespace osm { diff --git a/generator/borders_loader.cpp b/generator/borders_loader.cpp index 689c7e9fdf..f109d046fd 100644 --- a/generator/borders_loader.cpp +++ b/generator/borders_loader.cpp @@ -1,29 +1,29 @@ -#include "borders_loader.hpp" -#include "borders_generator.hpp" +#include "generator/borders_loader.hpp" +#include "generator/borders_generator.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../storage/country_polygon.hpp" +#include "storage/country_polygon.hpp" -#include "../indexer/geometry_serialization.hpp" -#include "../indexer/scales.hpp" -#include "../indexer/mercator.hpp" +#include "indexer/geometry_serialization.hpp" +#include "indexer/scales.hpp" +#include "indexer/mercator.hpp" -#include "../geometry/simplification.hpp" -#include "../geometry/distance.hpp" +#include "geometry/simplification.hpp" +#include "geometry/distance.hpp" -#include "../coding/file_container.hpp" -#include "../coding/read_write_utils.hpp" -#include "../coding/file_name_utils.hpp" +#include "coding/file_container.hpp" +#include "coding/read_write_utils.hpp" +#include "coding/file_name_utils.hpp" -#include "../base/logging.hpp" -#include "../base/string_utils.hpp" +#include "base/logging.hpp" +#include "base/string_utils.hpp" -#include "../std/fstream.hpp" -#include "../std/vector.hpp" -#include "../std/bind.hpp" +#include "std/fstream.hpp" +#include "std/vector.hpp" +#include "std/bind.hpp" namespace borders diff --git a/generator/borders_loader.hpp b/generator/borders_loader.hpp index bd94520d5d..0643b563b5 100644 --- a/generator/borders_loader.hpp +++ b/generator/borders_loader.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../geometry/region2d.hpp" -#include "../geometry/tree4d.hpp" +#include "geometry/region2d.hpp" +#include "geometry/tree4d.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" #define BORDERS_DIR "borders/" #define BORDERS_EXTENSION ".poly" diff --git a/generator/check_model.cpp b/generator/check_model.cpp index 25736bd017..4feed76d7b 100644 --- a/generator/check_model.cpp +++ b/generator/check_model.cpp @@ -1,12 +1,12 @@ -#include "check_model.hpp" +#include "generator/check_model.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../indexer/features_vector.hpp" -#include "../indexer/classificator.hpp" -#include "../indexer/feature_visibility.hpp" +#include "indexer/features_vector.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature_visibility.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" using namespace feature; diff --git a/generator/check_model.hpp b/generator/check_model.hpp index 94158d23d6..2728f29c83 100644 --- a/generator/check_model.hpp +++ b/generator/check_model.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../std/string.hpp" +#include "std/string.hpp" namespace check_model { diff --git a/generator/coastlines_generator.cpp b/generator/coastlines_generator.cpp index 7e0eea2f7e..7cb4e0ccd2 100644 --- a/generator/coastlines_generator.cpp +++ b/generator/coastlines_generator.cpp @@ -1,16 +1,16 @@ -#include "coastlines_generator.hpp" -#include "feature_builder.hpp" +#include "generator/coastlines_generator.hpp" +#include "generator/feature_builder.hpp" -#include "../indexer/point_to_int64.hpp" +#include "indexer/point_to_int64.hpp" -#include "../geometry/region2d/binary_operators.hpp" +#include "geometry/region2d/binary_operators.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" -#include "../3party/gflags/src/gflags/gflags.h" +#include "3party/gflags/src/gflags/gflags.h" -#include "../std/bind.hpp" +#include "std/bind.hpp" typedef m2::RegionI RegionT; diff --git a/generator/coastlines_generator.hpp b/generator/coastlines_generator.hpp index 40fb2ae9e2..892ce0eece 100644 --- a/generator/coastlines_generator.hpp +++ b/generator/coastlines_generator.hpp @@ -1,11 +1,11 @@ #pragma once -#include "feature_merger.hpp" +#include "generator/feature_merger.hpp" -#include "../indexer/cell_id.hpp" +#include "indexer/cell_id.hpp" -#include "../geometry/tree4d.hpp" -#include "../geometry/region2d.hpp" +#include "geometry/tree4d.hpp" +#include "geometry/region2d.hpp" class FeatureBuilder1; diff --git a/generator/data_cache_file.hpp b/generator/data_cache_file.hpp index e922e806e7..87357fcf58 100644 --- a/generator/data_cache_file.hpp +++ b/generator/data_cache_file.hpp @@ -1,17 +1,17 @@ #pragma once -#include "osm_decl.hpp" +#include "generator/osm_decl.hpp" -#include "../coding/file_reader_stream.hpp" -#include "../coding/file_writer_stream.hpp" +#include "coding/file_reader_stream.hpp" +#include "coding/file_writer_stream.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/utility.hpp" -#include "../std/vector.hpp" -#include "../std/algorithm.hpp" -#include "../std/limits.hpp" -#include "../std/exception.hpp" +#include "std/utility.hpp" +#include "std/vector.hpp" +#include "std/algorithm.hpp" +#include "std/limits.hpp" +#include "std/exception.hpp" /// Classes for reading and writing any data in file with map of offsets for diff --git a/generator/dumper.cpp b/generator/dumper.cpp index 342063755c..aa4f0719c9 100644 --- a/generator/dumper.cpp +++ b/generator/dumper.cpp @@ -1,21 +1,21 @@ -#include "dumper.hpp" +#include "generator/dumper.hpp" -#include "../indexer/search_delimiters.hpp" -#include "../indexer/search_string_utils.hpp" -#include "../indexer/classificator.hpp" -#include "../indexer/feature_processor.hpp" -#include "../indexer/search_trie.hpp" +#include "indexer/search_delimiters.hpp" +#include "indexer/search_string_utils.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature_processor.hpp" +#include "indexer/search_trie.hpp" -#include "../coding/multilang_utf8_string.hpp" +#include "coding/multilang_utf8_string.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/algorithm.hpp" -#include "../std/bind.hpp" -#include "../std/iostream.hpp" -#include "../std/map.hpp" -#include "../std/queue.hpp" -#include "../std/vector.hpp" +#include "std/algorithm.hpp" +#include "std/bind.hpp" +#include "std/iostream.hpp" +#include "std/map.hpp" +#include "std/queue.hpp" +#include "std/vector.hpp" namespace feature { diff --git a/generator/dumper.hpp b/generator/dumper.hpp index 0b32e8199a..6bc9812cc6 100644 --- a/generator/dumper.hpp +++ b/generator/dumper.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/string.hpp" +#include "std/string.hpp" namespace feature { diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index f74088914c..caa49a4866 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -1,20 +1,20 @@ -#include "feature_builder.hpp" +#include "generator/feature_builder.hpp" -#include "../routing/vehicle_model.hpp" +#include "routing/vehicle_model.hpp" -#include "../indexer/feature_impl.hpp" -#include "../indexer/feature_visibility.hpp" -#include "../indexer/geometry_serialization.hpp" -#include "../indexer/coding_params.hpp" +#include "indexer/feature_impl.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/geometry_serialization.hpp" +#include "indexer/coding_params.hpp" -#include "../geometry/region2d.hpp" +#include "geometry/region2d.hpp" -#include "../coding/byte_stream.hpp" +#include "coding/byte_stream.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/cstring.hpp" -#include "../std/algorithm.hpp" +#include "std/cstring.hpp" +#include "std/algorithm.hpp" using namespace feature; diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp index 5ad67d6321..3cbd71f41c 100644 --- a/generator/feature_builder.hpp +++ b/generator/feature_builder.hpp @@ -1,13 +1,13 @@ #pragma once -#include "osm_id.hpp" +#include "generator/osm_id.hpp" -#include "../indexer/feature.hpp" +#include "indexer/feature.hpp" -#include "../coding/file_reader.hpp" -#include "../coding/read_write_utils.hpp" +#include "coding/file_reader.hpp" +#include "coding/read_write_utils.hpp" -#include "../std/bind.hpp" +#include "std/bind.hpp" namespace serial { class CodingParams; } diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp index f74d68192b..28c2cc6c52 100644 --- a/generator/feature_generator.cpp +++ b/generator/feature_generator.cpp @@ -1,23 +1,23 @@ -#include "feature_generator.hpp" -#include "data_cache_file.hpp" -#include "osm_element.hpp" +#include "generator/feature_generator.hpp" +#include "generator/data_cache_file.hpp" +#include "generator/osm_element.hpp" -#include "osm_decl.hpp" -#include "generate_info.hpp" +#include "generator/osm_decl.hpp" +#include "generator/generate_info.hpp" -#include "../indexer/data_header.hpp" -#include "../indexer/mercator.hpp" -#include "../indexer/cell_id.hpp" +#include "indexer/data_header.hpp" +#include "indexer/mercator.hpp" +#include "indexer/cell_id.hpp" -#include "../coding/varint.hpp" +#include "coding/varint.hpp" -#include "../base/assert.hpp" -#include "../base/logging.hpp" -#include "../base/stl_add.hpp" +#include "base/assert.hpp" +#include "base/logging.hpp" +#include "base/stl_add.hpp" -#include "../std/bind.hpp" -#include "../std/unordered_map.hpp" -#include "../std/target_os.hpp" +#include "std/bind.hpp" +#include "std/unordered_map.hpp" +#include "std/target_os.hpp" /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/generator/feature_generator.hpp b/generator/feature_generator.hpp index 8ff2f66956..0c9ffca494 100644 --- a/generator/feature_generator.hpp +++ b/generator/feature_generator.hpp @@ -1,11 +1,11 @@ #pragma once -#include "../geometry/rect2d.hpp" +#include "geometry/rect2d.hpp" -#include "../coding/file_writer.hpp" +#include "coding/file_writer.hpp" -#include "../std/vector.hpp" -#include "../std/string.hpp" +#include "std/vector.hpp" +#include "std/string.hpp" class FeatureBuilder1; diff --git a/generator/feature_merger.cpp b/generator/feature_merger.cpp index 998d65d1c6..1e2d5d1997 100644 --- a/generator/feature_merger.cpp +++ b/generator/feature_merger.cpp @@ -1,9 +1,9 @@ -#include "feature_merger.hpp" +#include "generator/feature_merger.hpp" -#include "../indexer/feature.hpp" -#include "../indexer/feature_visibility.hpp" -#include "../indexer/point_to_int64.hpp" -#include "../indexer/classificator.hpp" +#include "indexer/feature.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/point_to_int64.hpp" +#include "indexer/classificator.hpp" MergedFeatureBuilder1::MergedFeatureBuilder1(FeatureBuilder1 const & fb) diff --git a/generator/feature_merger.hpp b/generator/feature_merger.hpp index 048eec80c7..ecd5a27e36 100644 --- a/generator/feature_merger.hpp +++ b/generator/feature_merger.hpp @@ -1,9 +1,9 @@ #pragma once -#include "feature_emitter_iface.hpp" -#include "feature_builder.hpp" +#include "generator/feature_emitter_iface.hpp" +#include "generator/feature_builder.hpp" -#include "../std/map.hpp" -#include "../std/vector.hpp" +#include "std/map.hpp" +#include "std/vector.hpp" /// Feature builder class that used while feature type processing and merging. diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp index b9c8db2677..6874a6f3c8 100644 --- a/generator/feature_sorter.cpp +++ b/generator/feature_sorter.cpp @@ -1,26 +1,26 @@ -#include "feature_sorter.hpp" -#include "feature_generator.hpp" -#include "feature_builder.hpp" -#include "tesselator.hpp" -#include "gen_mwm_info.hpp" +#include "generator/feature_sorter.hpp" +#include "generator/feature_generator.hpp" +#include "generator/feature_builder.hpp" +#include "generator/tesselator.hpp" +#include "generator/gen_mwm_info.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../indexer/data_header.hpp" -#include "../indexer/feature_processor.hpp" -#include "../indexer/feature_visibility.hpp" -#include "../indexer/feature_impl.hpp" -#include "../indexer/geometry_serialization.hpp" -#include "../indexer/scales.hpp" -#include "../indexer/mwm_version.hpp" +#include "indexer/data_header.hpp" +#include "indexer/feature_processor.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/feature_impl.hpp" +#include "indexer/geometry_serialization.hpp" +#include "indexer/scales.hpp" +#include "indexer/mwm_version.hpp" -#include "../geometry/polygon.hpp" +#include "geometry/polygon.hpp" -#include "../coding/internal/file_data.hpp" -#include "../coding/file_container.hpp" +#include "coding/internal/file_data.hpp" +#include "coding/file_container.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" diff --git a/generator/feature_sorter.hpp b/generator/feature_sorter.hpp index f7c9419824..980a94acd6 100644 --- a/generator/feature_sorter.hpp +++ b/generator/feature_sorter.hpp @@ -1,12 +1,12 @@ #pragma once -#include "../geometry/point2d.hpp" -#include "../geometry/simplification.hpp" -#include "../geometry/distance.hpp" +#include "geometry/point2d.hpp" +#include "geometry/simplification.hpp" +#include "geometry/distance.hpp" -#include "../indexer/scales.hpp" +#include "indexer/scales.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" namespace feature diff --git a/generator/first_pass_parser.hpp b/generator/first_pass_parser.hpp index 886e505a47..bc24fc876e 100644 --- a/generator/first_pass_parser.hpp +++ b/generator/first_pass_parser.hpp @@ -1,11 +1,11 @@ #pragma once -#include "xml_element.hpp" -#include "osm_decl.hpp" +#include "generator/xml_element.hpp" +#include "generator/osm_decl.hpp" -#include "../indexer/mercator.hpp" +#include "indexer/mercator.hpp" -#include "../base/string_utils.hpp" +#include "base/string_utils.hpp" template <class THolder> diff --git a/generator/gen_mwm_info.hpp b/generator/gen_mwm_info.hpp index ba38e4f661..bd58e4282e 100644 --- a/generator/gen_mwm_info.hpp +++ b/generator/gen_mwm_info.hpp @@ -1,11 +1,11 @@ #pragma once -#include "../coding/read_write_utils.hpp" +#include "coding/read_write_utils.hpp" -#include "../base/assert.hpp" +#include "base/assert.hpp" -#include "../std/utility.hpp" -#include "../std/algorithm.hpp" +#include "std/utility.hpp" +#include "std/algorithm.hpp" namespace gen diff --git a/generator/generate_info.hpp b/generator/generate_info.hpp index 04c924d11a..35d4b2be3a 100644 --- a/generator/generate_info.hpp +++ b/generator/generate_info.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../std/string.hpp" -#include "../std/vector.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" namespace feature { diff --git a/generator/kml_parser.cpp b/generator/kml_parser.cpp index 0c442ecd4c..b39bc1da6b 100644 --- a/generator/kml_parser.cpp +++ b/generator/kml_parser.cpp @@ -1,21 +1,21 @@ -#include "kml_parser.hpp" -#include "feature_sorter.hpp" +#include "generator/kml_parser.hpp" +#include "generator/feature_sorter.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" -#include "../coding/parse_xml.hpp" -#include "../coding/file_reader.hpp" +#include "coding/parse_xml.hpp" +#include "coding/file_reader.hpp" -#include "../geometry/rect2d.hpp" -#include "../geometry/cellid.hpp" +#include "geometry/rect2d.hpp" +#include "geometry/cellid.hpp" -#include "../indexer/cell_id.hpp" -#include "../indexer/mercator.hpp" -#include "../indexer/feature.hpp" -#include "../indexer/covering.hpp" +#include "indexer/cell_id.hpp" +#include "indexer/mercator.hpp" +#include "indexer/feature.hpp" +#include "indexer/covering.hpp" -#include "../std/fstream.hpp" +#include "std/fstream.hpp" #define MIN_SIMPLIFIED_POINTS_COUNT 4 diff --git a/generator/kml_parser.hpp b/generator/kml_parser.hpp index 0b6ebff541..5f9a40c764 100644 --- a/generator/kml_parser.hpp +++ b/generator/kml_parser.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/string.hpp" +#include "std/string.hpp" class PolygonsContainerT; diff --git a/generator/osm2meta.cpp b/generator/osm2meta.cpp index dc1bd346e1..c6afb392f2 100644 --- a/generator/osm2meta.cpp +++ b/generator/osm2meta.cpp @@ -1 +1 @@ -#include "osm2meta.hpp" +#include "generator/osm2meta.hpp" diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp index 5f17d2ebd8..93155467b3 100644 --- a/generator/osm2meta.hpp +++ b/generator/osm2meta.hpp @@ -1,12 +1,12 @@ #pragma once -#include "../indexer/feature_data.hpp" -#include "../indexer/classificator.hpp" -#include "../indexer/ftypes_matcher.hpp" +#include "indexer/feature_data.hpp" +#include "indexer/classificator.hpp" +#include "indexer/ftypes_matcher.hpp" -#include "../base/string_utils.hpp" +#include "base/string_utils.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" class MetadataTagProcessor diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index eb599b9e68..c77bd99568 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -1,18 +1,18 @@ -#include "osm2type.hpp" -#include "osm2meta.hpp" -#include "xml_element.hpp" +#include "generator/osm2type.hpp" +#include "generator/osm2meta.hpp" +#include "generator/xml_element.hpp" -#include "../indexer/classificator.hpp" -#include "../indexer/feature_visibility.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature_visibility.hpp" -#include "../base/assert.hpp" -#include "../base/string_utils.hpp" -#include "../base/math.hpp" +#include "base/assert.hpp" +#include "base/string_utils.hpp" +#include "base/math.hpp" -#include "../std/vector.hpp" -#include "../std/bind.hpp" -#include "../std/function.hpp" -#include "../std/initializer_list.hpp" +#include "std/vector.hpp" +#include "std/bind.hpp" +#include "std/function.hpp" +#include "std/initializer_list.hpp" #include <QtCore/QString> diff --git a/generator/osm2type.hpp b/generator/osm2type.hpp index 353e573b50..60c9fe1666 100644 --- a/generator/osm2type.hpp +++ b/generator/osm2type.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../indexer/feature_data.hpp" +#include "indexer/feature_data.hpp" struct XMLElement; diff --git a/generator/osm_decl.cpp b/generator/osm_decl.cpp index de1e71eb13..617fafddc6 100644 --- a/generator/osm_decl.cpp +++ b/generator/osm_decl.cpp @@ -1,10 +1,10 @@ -#include "osm_decl.hpp" +#include "generator/osm_decl.hpp" -#include "../indexer/classificator.hpp" +#include "indexer/classificator.hpp" -#include "../base/macros.hpp" +#include "base/macros.hpp" -#include "../std/target_os.hpp" +#include "std/target_os.hpp" void progress_policy::Begin(string const & /*name*/, size_t factor) diff --git a/generator/osm_decl.hpp b/generator/osm_decl.hpp index 9e07884fa7..ce376ad98a 100644 --- a/generator/osm_decl.hpp +++ b/generator/osm_decl.hpp @@ -1,13 +1,13 @@ #pragma once -#include "../base/std_serialization.hpp" -#include "../base/assert.hpp" - -#include "../std/utility.hpp" -#include "../std/vector.hpp" -#include "../std/string.hpp" -#include "../std/algorithm.hpp" -#include "../std/bind.hpp" +#include "base/std_serialization.hpp" +#include "base/assert.hpp" + +#include "std/utility.hpp" +#include "std/vector.hpp" +#include "std/string.hpp" +#include "std/algorithm.hpp" +#include "std/bind.hpp" #define NODES_FILE "nodes.dat" diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp index 9b34f3285b..8aeca03469 100644 --- a/generator/osm_element.hpp +++ b/generator/osm_element.hpp @@ -1,23 +1,23 @@ #pragma once -#include "osm2type.hpp" -#include "xml_element.hpp" -#include "feature_builder.hpp" -#include "ways_merger.hpp" +#include "generator/osm2type.hpp" +#include "generator/xml_element.hpp" +#include "generator/feature_builder.hpp" +#include "generator/ways_merger.hpp" -#include "../indexer/ftypes_matcher.hpp" -#include "../indexer/feature_visibility.hpp" -#include "../indexer/classificator.hpp" +#include "indexer/ftypes_matcher.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/classificator.hpp" -#include "../geometry/tree4d.hpp" +#include "geometry/tree4d.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" -#include "../base/stl_add.hpp" -#include "../base/cache.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" +#include "base/stl_add.hpp" +#include "base/cache.hpp" -#include "../std/unordered_set.hpp" -#include "../std/list.hpp" +#include "std/unordered_set.hpp" +#include "std/list.hpp" /// @param TEmitter Feature accumulating policy diff --git a/generator/osm_id.cpp b/generator/osm_id.cpp index 99f61411e1..f01d9d5224 100644 --- a/generator/osm_id.cpp +++ b/generator/osm_id.cpp @@ -1,8 +1,8 @@ -#include "osm_id.hpp" +#include "generator/osm_id.hpp" -#include "../base/assert.hpp" +#include "base/assert.hpp" -#include "../std/sstream.hpp" +#include "std/sstream.hpp" namespace osm diff --git a/generator/osm_id.hpp b/generator/osm_id.hpp index 922435fada..0174aef911 100644 --- a/generator/osm_id.hpp +++ b/generator/osm_id.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../std/stdint.hpp" -#include "../std/string.hpp" +#include "std/stdint.hpp" +#include "std/string.hpp" namespace osm diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp index 825773e995..2df5d11608 100644 --- a/generator/osm_source.cpp +++ b/generator/osm_source.cpp @@ -1,27 +1,27 @@ -#include "osm_source.hpp" +#include "generator/osm_source.hpp" -#include "osm_decl.hpp" -#include "data_cache_file.hpp" +#include "generator/osm_decl.hpp" +#include "generator/data_cache_file.hpp" -#include "coastlines_generator.hpp" -#include "world_map_generator.hpp" -#include "feature_generator.hpp" -#include "polygonizer.hpp" +#include "generator/coastlines_generator.hpp" +#include "generator/world_map_generator.hpp" +#include "generator/feature_generator.hpp" +#include "generator/polygonizer.hpp" -#include "point_storage.hpp" +#include "generator/point_storage.hpp" -#include "xml_element.hpp" +#include "generator/xml_element.hpp" -#include "first_pass_parser.hpp" -#include "osm_element.hpp" +#include "generator/first_pass_parser.hpp" +#include "generator/osm_element.hpp" -#include "../defines.hpp" -#include "../indexer/mercator.hpp" -#include "../indexer/classificator.hpp" +#include "defines.hpp" +#include "indexer/mercator.hpp" +#include "indexer/classificator.hpp" -#include "../coding/parse_xml.hpp" +#include "coding/parse_xml.hpp" -#include "../3party/o5mreader/o5mreader.h" +#include "3party/o5mreader/o5mreader.h" #define DECODE_O5M_COORD(coord) (static_cast<double>(coord) / 1E+7) diff --git a/generator/osm_source.hpp b/generator/osm_source.hpp index 6a2d9f297e..ba195e5ab0 100644 --- a/generator/osm_source.hpp +++ b/generator/osm_source.hpp @@ -1,8 +1,8 @@ #pragma once -#include "generate_info.hpp" +#include "generator/generate_info.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" bool GenerateFeatures(feature::GenerateInfo & info, string const & nodeStorage, string const &osmFileType, string const & osmFileName); diff --git a/generator/osm_xml_parser.cpp b/generator/osm_xml_parser.cpp index aff442688d..3e12b5d9b8 100644 --- a/generator/osm_xml_parser.cpp +++ b/generator/osm_xml_parser.cpp @@ -1,7 +1,7 @@ -#include "osm_xml_parser.hpp" +#include "generator/osm_xml_parser.hpp" -#include "../base/assert.hpp" -#include "../base/string_utils.hpp" +#include "base/assert.hpp" +#include "base/string_utils.hpp" namespace osm { diff --git a/generator/osm_xml_parser.hpp b/generator/osm_xml_parser.hpp index f598abfef7..f988eb15be 100644 --- a/generator/osm_xml_parser.hpp +++ b/generator/osm_xml_parser.hpp @@ -1,13 +1,13 @@ #pragma once -#include "../base/exception.hpp" +#include "base/exception.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../std/vector.hpp" -#include "../std/map.hpp" -#include "../std/set.hpp" -#include "../std/string.hpp" +#include "std/vector.hpp" +#include "std/map.hpp" +#include "std/set.hpp" +#include "std/string.hpp" namespace osm { diff --git a/generator/point_storage.hpp b/generator/point_storage.hpp index 79d9a3afb5..eb1feb91fe 100644 --- a/generator/point_storage.hpp +++ b/generator/point_storage.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../coding/mmap_reader.hpp" +#include "coding/mmap_reader.hpp" -#include "../std/iostream.hpp" -#include "../std/type_traits.hpp" +#include "std/iostream.hpp" +#include "std/type_traits.hpp" /// Used to store all world nodes inside temporary index file. /// To find node by id, just calculate offset inside index file: diff --git a/generator/polygonizer.hpp b/generator/polygonizer.hpp index 83b1d0401f..98297ec06b 100644 --- a/generator/polygonizer.hpp +++ b/generator/polygonizer.hpp @@ -1,20 +1,20 @@ #pragma once -#include "borders_loader.hpp" -#include "feature_builder.hpp" +#include "generator/borders_loader.hpp" +#include "generator/feature_builder.hpp" -#include "../indexer/feature_visibility.hpp" -#include "../indexer/cell_id.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/cell_id.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/rect2d.hpp" -#include "../coding/file_writer.hpp" +#include "coding/file_writer.hpp" -#include "../base/base.hpp" -#include "../base/buffer_vector.hpp" -#include "../base/macros.hpp" +#include "base/base.hpp" +#include "base/buffer_vector.hpp" +#include "base/macros.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" #ifndef PARALLEL_POLYGONIZER diff --git a/generator/routing_generator.cpp b/generator/routing_generator.cpp index 2491478d82..6f5d73f6d7 100644 --- a/generator/routing_generator.cpp +++ b/generator/routing_generator.cpp @@ -1,34 +1,34 @@ -#include "routing_generator.hpp" +#include "generator/routing_generator.hpp" -#include "borders_generator.hpp" -#include "borders_loader.hpp" -#include "gen_mwm_info.hpp" +#include "generator/borders_generator.hpp" +#include "generator/borders_loader.hpp" +#include "generator/gen_mwm_info.hpp" -#include "../routing/osrm2feature_map.hpp" -#include "../routing/osrm_data_facade.hpp" -#include "../routing/osrm_router.hpp" -#include "../routing/cross_routing_context.hpp" +#include "routing/osrm2feature_map.hpp" +#include "routing/osrm_data_facade.hpp" +#include "routing/osrm_router.hpp" +#include "routing/cross_routing_context.hpp" -#include "../indexer/classificator_loader.hpp" -#include "../indexer/data_header.hpp" -#include "../indexer/feature.hpp" -#include "../indexer/ftypes_matcher.hpp" -#include "../indexer/index.hpp" -#include "../indexer/mercator.hpp" +#include "indexer/classificator_loader.hpp" +#include "indexer/data_header.hpp" +#include "indexer/feature.hpp" +#include "indexer/ftypes_matcher.hpp" +#include "indexer/index.hpp" +#include "indexer/mercator.hpp" -#include "../geometry/distance_on_sphere.hpp" +#include "geometry/distance_on_sphere.hpp" -#include "../coding/file_container.hpp" -#include "../coding/read_write_utils.hpp" -#include "../coding/internal/file_data.hpp" +#include "coding/file_container.hpp" +#include "coding/read_write_utils.hpp" +#include "coding/internal/file_data.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/fstream.hpp" +#include "std/fstream.hpp" -#include "../3party/osrm/osrm-backend/DataStructures/EdgeBasedNodeData.h" -#include "../3party/osrm/osrm-backend/DataStructures/QueryEdge.h" -#include "../3party/osrm/osrm-backend/DataStructures/RawRouteData.h" +#include "3party/osrm/osrm-backend/DataStructures/EdgeBasedNodeData.h" +#include "3party/osrm/osrm-backend/DataStructures/QueryEdge.h" +#include "3party/osrm/osrm-backend/DataStructures/RawRouteData.h" namespace routing { diff --git a/generator/routing_generator.hpp b/generator/routing_generator.hpp index 0fe0fa5e8d..4877fe188f 100644 --- a/generator/routing_generator.hpp +++ b/generator/routing_generator.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../std/string.hpp" -#include "../std/vector.hpp" -#include "../std/set.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" +#include "std/set.hpp" namespace routing { diff --git a/generator/statistics.cpp b/generator/statistics.cpp index 8de27527bd..caa61bfd4e 100644 --- a/generator/statistics.cpp +++ b/generator/statistics.cpp @@ -1,17 +1,17 @@ -#include "../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "statistics.hpp" +#include "generator/statistics.hpp" -#include "../indexer/feature_processor.hpp" -#include "../indexer/classificator.hpp" -#include "../indexer/feature_impl.hpp" -#include "../indexer/data_factory.hpp" +#include "indexer/feature_processor.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature_impl.hpp" +#include "indexer/data_factory.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" -#include "../std/iostream.hpp" -#include "../std/iomanip.hpp" +#include "std/iostream.hpp" +#include "std/iomanip.hpp" using namespace feature; diff --git a/generator/statistics.hpp b/generator/statistics.hpp index 74e6622967..692cb818f1 100644 --- a/generator/statistics.hpp +++ b/generator/statistics.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../indexer/feature.hpp" +#include "indexer/feature.hpp" -#include "../std/map.hpp" +#include "std/map.hpp" namespace stats diff --git a/generator/tesselator.cpp b/generator/tesselator.cpp index 122d3f2c4b..1c650dc9c2 100644 --- a/generator/tesselator.cpp +++ b/generator/tesselator.cpp @@ -1,17 +1,17 @@ -#include "tesselator.hpp" +#include "generator/tesselator.hpp" -#include "../indexer/geometry_coding.hpp" +#include "indexer/geometry_coding.hpp" -#include "../geometry/robust_orientation.hpp" +#include "geometry/robust_orientation.hpp" -#include "../coding/writer.hpp" +#include "coding/writer.hpp" -#include "../base/assert.hpp" -#include "../base/logging.hpp" +#include "base/assert.hpp" +#include "base/logging.hpp" -#include "../std/queue.hpp" +#include "std/queue.hpp" -#include "../3party/sgitess/interface.h" +#include "3party/sgitess/interface.h" namespace tesselator diff --git a/generator/tesselator.hpp b/generator/tesselator.hpp index eba1c9c1f3..59d8603246 100644 --- a/generator/tesselator.hpp +++ b/generator/tesselator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "../indexer/tesselator_decl.hpp" +#include "indexer/tesselator_decl.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../std/function.hpp" -#include "../std/list.hpp" -#include "../std/vector.hpp" -#include "../std/unordered_map.hpp" -#include "../std/iterator.hpp" +#include "std/function.hpp" +#include "std/list.hpp" +#include "std/vector.hpp" +#include "std/unordered_map.hpp" +#include "std/iterator.hpp" namespace tesselator diff --git a/generator/unpack_mwm.cpp b/generator/unpack_mwm.cpp index d112de3500..73fe20651a 100644 --- a/generator/unpack_mwm.cpp +++ b/generator/unpack_mwm.cpp @@ -1,14 +1,14 @@ -#include "unpack_mwm.hpp" +#include "generator/unpack_mwm.hpp" -#include "../coding/file_container.hpp" -#include "../coding/file_writer.hpp" -#include "../coding/read_write_utils.hpp" +#include "coding/file_container.hpp" +#include "coding/file_writer.hpp" +#include "coding/read_write_utils.hpp" -#include "../base/logging.hpp" -#include "../base/stl_add.hpp" +#include "base/logging.hpp" +#include "base/stl_add.hpp" -#include "../std/algorithm.hpp" -#include "../std/vector.hpp" +#include "std/algorithm.hpp" +#include "std/vector.hpp" void UnpackMwm(string const & filePath) diff --git a/generator/unpack_mwm.hpp b/generator/unpack_mwm.hpp index 569667a996..9bde622c22 100644 --- a/generator/unpack_mwm.hpp +++ b/generator/unpack_mwm.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../base/base.hpp" +#include "base/base.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" // Unpack each section of mwm into a separate file with name filePath.sectionName diff --git a/generator/update_generator.cpp b/generator/update_generator.cpp index 0a94b76a2d..233c445d04 100644 --- a/generator/update_generator.cpp +++ b/generator/update_generator.cpp @@ -1,19 +1,19 @@ -#include "update_generator.hpp" +#include "generator/update_generator.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../storage/country.hpp" +#include "storage/country.hpp" -#include "../coding/file_writer.hpp" +#include "coding/file_writer.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" -#include "../base/macros.hpp" -#include "../base/timer.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" +#include "base/macros.hpp" +#include "base/timer.hpp" -#include "../std/iterator.hpp" +#include "std/iterator.hpp" using namespace storage; diff --git a/generator/update_generator.hpp b/generator/update_generator.hpp index 6c44745078..71c95b222b 100644 --- a/generator/update_generator.hpp +++ b/generator/update_generator.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/string.hpp" +#include "std/string.hpp" namespace update { diff --git a/generator/ways_merger.hpp b/generator/ways_merger.hpp index 6bfbf75d4b..13831304c8 100644 --- a/generator/ways_merger.hpp +++ b/generator/ways_merger.hpp @@ -1,11 +1,11 @@ #pragma once -#include "osm_decl.hpp" +#include "generator/osm_decl.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../std/map.hpp" -#include "../std/vector.hpp" -#include "../std/shared_ptr.hpp" +#include "std/map.hpp" +#include "std/vector.hpp" +#include "std/shared_ptr.hpp" template <class THolder> diff --git a/generator/world_map_generator.hpp b/generator/world_map_generator.hpp index f2091c4081..2ed903569c 100644 --- a/generator/world_map_generator.hpp +++ b/generator/world_map_generator.hpp @@ -1,10 +1,10 @@ #pragma once -#include "feature_merger.hpp" +#include "generator/feature_merger.hpp" -#include "../indexer/scales.hpp" +#include "indexer/scales.hpp" -#include "../defines.hpp" +#include "defines.hpp" /// Process FeatureBuilder1 for world map. Main functions: diff --git a/generator/xml_element.cpp b/generator/xml_element.cpp index 7ff351f333..96fca461c2 100644 --- a/generator/xml_element.cpp +++ b/generator/xml_element.cpp @@ -1,10 +1,10 @@ -#include "xml_element.hpp" +#include "generator/xml_element.hpp" -#include "../coding/parse_xml.hpp" -#include "../base/string_utils.hpp" +#include "coding/parse_xml.hpp" +#include "base/string_utils.hpp" -#include "../std/cstdio.hpp" -#include "../std/algorithm.hpp" +#include "std/cstdio.hpp" +#include "std/algorithm.hpp" void XMLElement::AddKV(string const & k, string const & v) diff --git a/generator/xml_element.hpp b/generator/xml_element.hpp index d4b22fe4cc..a864a36957 100644 --- a/generator/xml_element.hpp +++ b/generator/xml_element.hpp @@ -1,10 +1,10 @@ #pragma once -#include "../std/string.hpp" -#include "../std/vector.hpp" -#include "../std/map.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" +#include "std/map.hpp" -#include "../std/iostream.hpp" -#include "../std/exception.hpp" +#include "std/iostream.hpp" +#include "std/exception.hpp" struct XMLElement { |