From 1b9dae3b38b5f549dbe884ae4392647ca2556d89 Mon Sep 17 00:00:00 2001 From: LaGrunge Date: Mon, 7 Oct 2019 14:09:54 +0300 Subject: [PATCH] Unused includes clear --- base/base.cpp | 3 --- base/base_tests/assert_test.cpp | 1 - base/base_tests/bidirectional_map_tests.cpp | 1 - base/base_tests/condition_test.cpp | 2 -- base/base_tests/levenshtein_dfa_test.cpp | 1 - base/base_tests/logging_test.cpp | 1 - base/base_tests/ref_counted_tests.cpp | 2 +- base/base_tests/string_utils_test.cpp | 2 +- base/base_tests/thread_pool_computational_tests.cpp | 1 - base/condition.cpp | 1 - base/file_name_utils.cpp | 1 - base/geo_object_id.cpp | 1 - base/levenshtein_dfa.cpp | 1 - base/logging.cpp | 4 ---- base/normalize_unicode.cpp | 3 ++- base/threaded_list.hpp | 5 +---- base/timegm.cpp | 1 - base/timer.cpp | 4 +--- coding/coding_tests/compressed_bit_vector_test.cpp | 1 - coding/coding_tests/file_data_test.cpp | 2 -- coding/coding_tests/geometry_serialization_test.cpp | 1 - coding/coding_tests/mem_file_writer_test.cpp | 1 - coding/coding_tests/point_coding_tests.cpp | 1 - coding/coding_tests/reader_cache_test.cpp | 1 - coding/coding_tests/traffic_test.cpp | 1 - coding/coding_tests/value_opt_string_test.cpp | 2 -- coding/file_container.cpp | 2 -- coding/internal/file_data.cpp | 1 - coding/mmap_reader.cpp | 1 - coding/string_utf8_multilang.cpp | 1 - generator/check_model.cpp | 1 - generator/collector_city_area.cpp | 2 -- generator/collector_tag.cpp | 1 - generator/dumper.cpp | 2 -- generator/feature_builder.cpp | 2 -- generator/feature_generator.cpp | 6 ------ generator/feature_maker.cpp | 2 -- generator/feature_processing_layers.cpp | 2 -- generator/generator_tests/feature_builder_test.cpp | 1 - generator/generator_tests/geo_objects_tests.cpp | 1 - generator/generator_tests/intermediate_data_test.cpp | 6 ------ generator/generator_tests/merge_collectors_tests.cpp | 2 -- generator/generator_tests/metadata_parser_test.cpp | 1 - generator/generator_tests/osm_type_test.cpp | 1 - .../generator_tests/region_info_collector_tests.cpp | 3 --- generator/generator_tests/regions_tests.cpp | 4 ---- generator/generator_tests/source_to_element_test.cpp | 2 -- generator/generator_tests/tag_admixer_test.cpp | 1 - generator/generator_tests_support/test_feature.cpp | 3 --- generator/generator_tool/generator_tool.cpp | 6 ------ generator/locality_sorter.cpp | 6 ------ generator/metalines_builder.cpp | 1 - generator/osm_element.cpp | 1 - generator/osm_source.cpp | 1 - generator/raw_generator.cpp | 1 - generator/regions/region_info.cpp | 2 -- generator/regions/regions.cpp | 10 ---------- generator/regions/regions_builder.cpp | 1 - generator/routing_helpers.cpp | 2 -- generator/statistics.cpp | 1 - generator/streets/street_geometry.cpp | 3 +-- generator/streets/street_regions_tracing.cpp | 1 - generator/streets/streets.cpp | 1 - geocoder/geocoder_tests/geocoder_tests.cpp | 1 - geocoder/hierarchy_reader.cpp | 1 - geometry/geometry_tests/parametrized_segment_tests.cpp | 7 +++---- geometry/geometry_tests/simplification_test.cpp | 2 -- geometry/robust_orientation.cpp | 1 - geometry/screenbase.cpp | 1 - geometry/triangle2d.cpp | 1 - indexer/altitude_loader.cpp | 2 -- indexer/centers_table.cpp | 9 --------- indexer/classificator_loader.cpp | 2 -- indexer/data_source.cpp | 1 - indexer/drawing_rules.cpp | 2 -- indexer/feature.cpp | 4 ---- indexer/feature_algo.cpp | 1 - indexer/feature_data.cpp | 1 - indexer/feature_impl.cpp | 1 - indexer/feature_meta.cpp | 1 - indexer/feature_utils.cpp | 5 +---- indexer/ftypes_matcher.cpp | 2 -- indexer/indexer_tests/categories_test.cpp | 2 -- indexer/indexer_tests/cell_coverer_test.cpp | 3 --- indexer/indexer_tests/cell_id_test.cpp | 1 - indexer/indexer_tests/centers_table_test.cpp | 5 ----- indexer/indexer_tests/feature_metadata_test.cpp | 1 - indexer/indexer_tests/index_builder_test.cpp | 1 - indexer/indexer_tests/interval_index_test.cpp | 1 - indexer/indexer_tests/locality_index_test.cpp | 1 - indexer/indexer_tests/postcodes_matcher_tests.cpp | 3 --- indexer/indexer_tests/search_string_utils_test.cpp | 1 - indexer/indexer_tests/string_slice_tests.cpp | 1 - indexer/indexer_tests/succinct_trie_test.cpp | 1 - indexer/indexer_tests/trie_test.cpp | 1 - indexer/indexer_tests/visibility_test.cpp | 1 - indexer/map_object.cpp | 1 - indexer/mwm_set.cpp | 2 -- indexer/postcodes_matcher.cpp | 1 - indexer/rank_table.cpp | 4 ---- platform/local_country_file_utils.cpp | 1 - platform/measurement_utils.cpp | 6 ++---- platform/mwm_version.cpp | 1 - platform/platform.cpp | 2 -- platform/platform_linux.cpp | 3 --- platform/platform_tests/platform_test.cpp | 2 -- platform/platform_tests_support/scoped_file.cpp | 1 - platform/platform_tests_support/test_socket.cpp | 1 - .../platform_tests_support/writable_dir_changer.cpp | 2 -- platform/platform_unix_impl.cpp | 3 --- platform/preferred_languages.cpp | 2 -- platform/settings.cpp | 4 ---- platform/string_storage_base.cpp | 2 -- 113 files changed, 13 insertions(+), 223 deletions(-) diff --git a/base/base.cpp b/base/base.cpp index 97989f8..e7d2462 100644 --- a/base/base.cpp +++ b/base/base.cpp @@ -1,10 +1,7 @@ -#include "base/base.hpp" #include "base/assert.hpp" -#include "base/exception.hpp" #include "base/src_point.hpp" -#include "platform/target_os.hpp" #include diff --git a/base/base_tests/assert_test.cpp b/base/base_tests/assert_test.cpp index 0df32cc..2247bc2 100644 --- a/base/base_tests/assert_test.cpp +++ b/base/base_tests/assert_test.cpp @@ -1,6 +1,5 @@ #include "testing/testing.hpp" -#include "base/base.hpp" #include "base/exception.hpp" #include "base/logging.hpp" diff --git a/base/base_tests/bidirectional_map_tests.cpp b/base/base_tests/bidirectional_map_tests.cpp index c638bb7..325f222 100644 --- a/base/base_tests/bidirectional_map_tests.cpp +++ b/base/base_tests/bidirectional_map_tests.cpp @@ -1,7 +1,6 @@ #include "testing/testing.hpp" #include "base/bidirectional_map.hpp" -#include "base/macros.hpp" #include diff --git a/base/base_tests/condition_test.cpp b/base/base_tests/condition_test.cpp index 0eaaeba..ed6121f 100644 --- a/base/base_tests/condition_test.cpp +++ b/base/base_tests/condition_test.cpp @@ -2,8 +2,6 @@ #include "base/thread.hpp" #include "base/threaded_list.hpp" -#include "base/condition.hpp" -#include "base/logging.hpp" #include diff --git a/base/base_tests/levenshtein_dfa_test.cpp b/base/base_tests/levenshtein_dfa_test.cpp index 600bfaf..b91c6fc 100644 --- a/base/base_tests/levenshtein_dfa_test.cpp +++ b/base/base_tests/levenshtein_dfa_test.cpp @@ -3,7 +3,6 @@ #include "base/dfa_helpers.hpp" #include "base/levenshtein_dfa.hpp" -#include #include #include diff --git a/base/base_tests/logging_test.cpp b/base/base_tests/logging_test.cpp index 01f6901..6aa8999 100644 --- a/base/base_tests/logging_test.cpp +++ b/base/base_tests/logging_test.cpp @@ -2,7 +2,6 @@ #include "base/logging.hpp" -#include #include diff --git a/base/base_tests/ref_counted_tests.cpp b/base/base_tests/ref_counted_tests.cpp index dabaade..f51f808 100644 --- a/base/base_tests/ref_counted_tests.cpp +++ b/base/base_tests/ref_counted_tests.cpp @@ -22,7 +22,7 @@ UNIT_TEST(RefCounted_Smoke) } { - bool destroyed; + bool destroyed = false; { RefCountPtr p(new Resource(destroyed)); TEST_EQUAL(1, p->NumRefs(), ()); diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp index e6e8b0e..dd65369 100644 --- a/base/base_tests/string_utils_test.cpp +++ b/base/base_tests/string_utils_test.cpp @@ -50,7 +50,7 @@ UNIT_TEST(LowerUniChar) continue; std::string const capital = *semicolon; std::istringstream stream(capital); - strings::UniChar uc; + strings::UniChar uc{}; stream >> std::hex >> uc; ++semicolon; std::string const type = *semicolon; diff --git a/base/base_tests/thread_pool_computational_tests.cpp b/base/base_tests/thread_pool_computational_tests.cpp index 513c3c0..43c5aa6 100644 --- a/base/base_tests/thread_pool_computational_tests.cpp +++ b/base/base_tests/thread_pool_computational_tests.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/base/condition.cpp b/base/condition.cpp index dac6db3..bb1eef2 100644 --- a/base/condition.cpp +++ b/base/condition.cpp @@ -1,7 +1,6 @@ #include "base/condition.hpp" #include "base/mutex.hpp" -#include "platform/target_os.hpp" #include diff --git a/base/file_name_utils.cpp b/base/file_name_utils.cpp index 9fcd106..3659c54 100644 --- a/base/file_name_utils.cpp +++ b/base/file_name_utils.cpp @@ -1,6 +1,5 @@ #include "base/file_name_utils.hpp" -#include "platform/target_os.hpp" using namespace std; diff --git a/base/geo_object_id.cpp b/base/geo_object_id.cpp index 63c7c40..89b4ecb 100644 --- a/base/geo_object_id.cpp +++ b/base/geo_object_id.cpp @@ -3,7 +3,6 @@ #include "base/assert.hpp" #include -#include namespace { diff --git a/base/levenshtein_dfa.cpp b/base/levenshtein_dfa.cpp index 8c50556..63578da 100644 --- a/base/levenshtein_dfa.cpp +++ b/base/levenshtein_dfa.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include namespace strings diff --git a/base/logging.cpp b/base/logging.cpp index b14ae08..ade7c1e 100644 --- a/base/logging.cpp +++ b/base/logging.cpp @@ -1,21 +1,17 @@ #include "base/logging.hpp" #include "base/assert.hpp" -#include "base/macros.hpp" #include "base/thread.hpp" #include "base/timer.hpp" -#include "platform/target_os.hpp" #include #include #include #include #include -#include #include #include -#include using namespace std; diff --git a/base/normalize_unicode.cpp b/base/normalize_unicode.cpp index 0eef923..1711cc8 100644 --- a/base/normalize_unicode.cpp +++ b/base/normalize_unicode.cpp @@ -18,6 +18,7 @@ static void w(strings::UniString & r, uint16_t startIndex, int count) r.push_back(normSymbols[startIndex + i]); } +// LCOV_EXCL_START void NormalizeInplace(strings::UniString & s) { size_t const size = s.size(); @@ -4595,5 +4596,5 @@ void NormalizeInplace(strings::UniString & s) s.swap(r); } - +// LCOV_EXCL_STOP } diff --git a/base/threaded_list.hpp b/base/threaded_list.hpp index 4390ed1..d19e9a1 100644 --- a/base/threaded_list.hpp +++ b/base/threaded_list.hpp @@ -89,10 +89,7 @@ public: m_Cond.Wait(); } - if (IsCancelled()) - return true; - - return false; + return IsCancelled(); } T const Front(bool doPop) diff --git a/base/timegm.cpp b/base/timegm.cpp index 202327f..3863b8e 100644 --- a/base/timegm.cpp +++ b/base/timegm.cpp @@ -3,7 +3,6 @@ #include "base/assert.hpp" #include "base/timer.hpp" -#include // There are issues with this implementation due to absence // of time_t fromat specification. There are no guarantees diff --git a/base/timer.cpp b/base/timer.cpp index 926e162..59fdc7a 100644 --- a/base/timer.cpp +++ b/base/timer.cpp @@ -2,10 +2,8 @@ #include "base/assert.hpp" #include "base/gmtime.hpp" -#include "base/macros.hpp" #include "base/timegm.hpp" -#include "platform/target_os.hpp" #include #include @@ -136,7 +134,7 @@ time_t StringToTimestamp(std::string const & s) { // Parse custom time zone offset format: 2012-12-03T00:38:34+03:30 tm t1{}, t2{}; - char sign; + char sign = 0; std::istringstream ss(s); ss >> base::get_time(&t1, "%Y-%m-%dT%H:%M:%S") >> sign >> base::get_time(&t2, "%H:%M"); diff --git a/coding/coding_tests/compressed_bit_vector_test.cpp b/coding/coding_tests/compressed_bit_vector_test.cpp index 0b92970..84d0132 100644 --- a/coding/coding_tests/compressed_bit_vector_test.cpp +++ b/coding/coding_tests/compressed_bit_vector_test.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/coding/coding_tests/file_data_test.cpp b/coding/coding_tests/file_data_test.cpp index 5b45f6f..cde691d 100644 --- a/coding/coding_tests/file_data_test.cpp +++ b/coding/coding_tests/file_data_test.cpp @@ -1,9 +1,7 @@ #include "testing/testing.hpp" #include "coding/internal/file_data.hpp" -#include "coding/writer.hpp" -#include "base/logging.hpp" #include #include diff --git a/coding/coding_tests/geometry_serialization_test.cpp b/coding/coding_tests/geometry_serialization_test.cpp index 05e592e..207a7c5 100644 --- a/coding/coding_tests/geometry_serialization_test.cpp +++ b/coding/coding_tests/geometry_serialization_test.cpp @@ -7,7 +7,6 @@ #include "geometry/mercator.hpp" -#include "base/logging.hpp" #include "base/math.hpp" #include diff --git a/coding/coding_tests/mem_file_writer_test.cpp b/coding/coding_tests/mem_file_writer_test.cpp index a233a70..e5b2629 100644 --- a/coding/coding_tests/mem_file_writer_test.cpp +++ b/coding/coding_tests/mem_file_writer_test.cpp @@ -1,7 +1,6 @@ #include "testing/testing.hpp" #include "coding/writer.hpp" -#include "coding/file_writer.hpp" #include "base/macros.hpp" diff --git a/coding/coding_tests/point_coding_tests.cpp b/coding/coding_tests/point_coding_tests.cpp index 24f4ba3..dd9a586 100644 --- a/coding/coding_tests/point_coding_tests.cpp +++ b/coding/coding_tests/point_coding_tests.cpp @@ -4,7 +4,6 @@ #include "coding/point_coding.hpp" -#include "geometry/mercator.hpp" #include "base/logging.hpp" diff --git a/coding/coding_tests/reader_cache_test.cpp b/coding/coding_tests/reader_cache_test.cpp index 3c17b89..fd822d6 100644 --- a/coding/coding_tests/reader_cache_test.cpp +++ b/coding/coding_tests/reader_cache_test.cpp @@ -3,7 +3,6 @@ #include "coding/reader_cache.hpp" #include "coding/reader.hpp" -#include #include #include #include diff --git a/coding/coding_tests/traffic_test.cpp b/coding/coding_tests/traffic_test.cpp index 3581721..bb2a30b 100644 --- a/coding/coding_tests/traffic_test.cpp +++ b/coding/coding_tests/traffic_test.cpp @@ -3,7 +3,6 @@ #include "coding/traffic.hpp" #include "geometry/mercator.hpp" -#include "geometry/point2d.hpp" #include "base/logging.hpp" #include "base/math.hpp" diff --git a/coding/coding_tests/value_opt_string_test.cpp b/coding/coding_tests/value_opt_string_test.cpp index 14857c9..f887561 100644 --- a/coding/coding_tests/value_opt_string_test.cpp +++ b/coding/coding_tests/value_opt_string_test.cpp @@ -4,9 +4,7 @@ #include "coding/value_opt_string.hpp" #include "coding/writer.hpp" -#include #include -#include #include #include diff --git a/coding/file_container.cpp b/coding/file_container.cpp index 3cab6e9..7167100 100644 --- a/coding/file_container.cpp +++ b/coding/file_container.cpp @@ -8,10 +8,8 @@ #include #include -#include #include #include -#include #include #include diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp index d9538c7..eade582 100644 --- a/coding/internal/file_data.cpp +++ b/coding/internal/file_data.cpp @@ -8,7 +8,6 @@ #include "base/logging.hpp" #include "base/string_utils.hpp" -#include "platform/target_os.hpp" #include #include diff --git a/coding/mmap_reader.cpp b/coding/mmap_reader.cpp index 4450393..2fe7921 100644 --- a/coding/mmap_reader.cpp +++ b/coding/mmap_reader.cpp @@ -1,6 +1,5 @@ #include "coding/mmap_reader.hpp" -#include "platform/target_os.hpp" #include diff --git a/coding/string_utf8_multilang.cpp b/coding/string_utf8_multilang.cpp index 8c50cdc..56f466f 100644 --- a/coding/string_utf8_multilang.cpp +++ b/coding/string_utf8_multilang.cpp @@ -3,7 +3,6 @@ #include #include -#include "defines.hpp" using namespace std; diff --git a/generator/check_model.cpp b/generator/check_model.cpp index 95ba953..f98aa04 100644 --- a/generator/check_model.cpp +++ b/generator/check_model.cpp @@ -1,6 +1,5 @@ #include "generator/check_model.hpp" -#include "defines.hpp" #include "indexer/features_vector.hpp" #include "indexer/classificator.hpp" diff --git a/generator/collector_city_area.cpp b/generator/collector_city_area.cpp index 63f402f..17dd03f 100644 --- a/generator/collector_city_area.cpp +++ b/generator/collector_city_area.cpp @@ -1,6 +1,5 @@ #include "generator/collector_city_area.hpp" -#include "generator/feature_generator.hpp" #include "generator/intermediate_data.hpp" #include "indexer/ftypes_matcher.hpp" @@ -11,7 +10,6 @@ #include "base/assert.hpp" -#include #include using namespace feature; diff --git a/generator/collector_tag.cpp b/generator/collector_tag.cpp index 33b96a9..67920d0 100644 --- a/generator/collector_tag.cpp +++ b/generator/collector_tag.cpp @@ -9,7 +9,6 @@ #include "base/assert.hpp" #include "base/geo_object_id.hpp" -#include "base/logging.hpp" namespace generator { diff --git a/generator/dumper.cpp b/generator/dumper.cpp index 6578267..d6fb894 100644 --- a/generator/dumper.cpp +++ b/generator/dumper.cpp @@ -2,7 +2,6 @@ #include "indexer/classificator.hpp" #include "indexer/feature_processor.hpp" -#include "indexer/trie_reader.hpp" #include "indexer/search_delimiters.hpp" #include "indexer/search_string_utils.hpp" @@ -16,7 +15,6 @@ #include #include -#include "defines.hpp" using namespace std; diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index dda6b2e..e9abff1 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -8,13 +8,11 @@ #include "coding/byte_stream.hpp" #include "coding/geometry_coding.hpp" #include "coding/read_write_utils.hpp" -#include "coding/reader.hpp" #include "geometry/region2d.hpp" #include "base/logging.hpp" #include "base/math.hpp" -#include "base/string_utils.hpp" #include #include diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp index 273444a..9353106 100644 --- a/generator/feature_generator.cpp +++ b/generator/feature_generator.cpp @@ -1,25 +1,19 @@ #include "generator/feature_generator.hpp" #include "generator/feature_builder.hpp" -#include "generator/generate_info.hpp" #include "generator/intermediate_data.hpp" #include "generator/intermediate_elements.hpp" -#include "indexer/cell_id.hpp" #include "indexer/data_header.hpp" -#include "geometry/mercator.hpp" -#include "coding/varint.hpp" #include "base/assert.hpp" #include "base/logging.hpp" #include "base/stl_helpers.hpp" #include -#include #include -#include "platform/target_os.hpp" /////////////////////////////////////////////////////////////////////////////////////////////////// // FeaturesCollector implementation diff --git a/generator/feature_maker.cpp b/generator/feature_maker.cpp index bb49a7e..e297fb1 100644 --- a/generator/feature_maker.cpp +++ b/generator/feature_maker.cpp @@ -3,11 +3,9 @@ #include "generator/holes.hpp" #include "generator/osm2type.hpp" #include "generator/osm_element.hpp" -#include "generator/type_helper.hpp" #include "indexer/classificator.hpp" #include "indexer/feature_visibility.hpp" -#include "indexer/ftypes_matcher.hpp" #include diff --git a/generator/feature_processing_layers.cpp b/generator/feature_processing_layers.cpp index be522f3..5bb869e 100644 --- a/generator/feature_processing_layers.cpp +++ b/generator/feature_processing_layers.cpp @@ -2,8 +2,6 @@ #include "generator/coastlines_generator.hpp" #include "generator/feature_maker.hpp" -#include "generator/generate_info.hpp" -#include "generator/type_helper.hpp" #include "indexer/classificator.hpp" #include "indexer/feature_visibility.hpp" diff --git a/generator/generator_tests/feature_builder_test.cpp b/generator/generator_tests/feature_builder_test.cpp index b91c696..ade6d56 100644 --- a/generator/generator_tests/feature_builder_test.cpp +++ b/generator/generator_tests/feature_builder_test.cpp @@ -5,7 +5,6 @@ #include "generator/feature_builder.hpp" #include "generator/generator_tests_support/test_with_classificator.hpp" #include "generator/geometry_holder.hpp" -#include "generator/osm2type.hpp" #include "indexer/data_header.cpp" #include "indexer/classificator_loader.hpp" diff --git a/generator/generator_tests/geo_objects_tests.cpp b/generator/generator_tests/geo_objects_tests.cpp index 685a595..5ac466c 100644 --- a/generator/generator_tests/geo_objects_tests.cpp +++ b/generator/generator_tests/geo_objects_tests.cpp @@ -11,7 +11,6 @@ #include "indexer/classificator_loader.hpp" -#include using namespace generator_tests; using namespace platform::tests_support; diff --git a/generator/generator_tests/intermediate_data_test.cpp b/generator/generator_tests/intermediate_data_test.cpp index c906b79..8bbad2c 100644 --- a/generator/generator_tests/intermediate_data_test.cpp +++ b/generator/generator_tests/intermediate_data_test.cpp @@ -8,21 +8,15 @@ #include "testing/testing.hpp" -#include "generator/generate_info.hpp" -#include "generator/intermediate_data.hpp" #include "generator/intermediate_elements.hpp" #include "coding/reader.hpp" #include "coding/writer.hpp" -#include "defines.hpp" #include -#include -#include #include -using namespace generator; using namespace std; UNIT_TEST(Intermediate_Data_empty_way_element_save_load_test) diff --git a/generator/generator_tests/merge_collectors_tests.cpp b/generator/generator_tests/merge_collectors_tests.cpp index 2e486be..b6e8854 100644 --- a/generator/generator_tests/merge_collectors_tests.cpp +++ b/generator/generator_tests/merge_collectors_tests.cpp @@ -3,10 +3,8 @@ #include "generator/generator_tests/common.hpp" #include "generator/collector_collection.hpp" -#include "generator/collector_interface.hpp" #include "generator/collector_tag.hpp" -#include "platform/platform.hpp" #include "base/geo_object_id.hpp" diff --git a/generator/generator_tests/metadata_parser_test.cpp b/generator/generator_tests/metadata_parser_test.cpp index 2a26caf..514503e 100644 --- a/generator/generator_tests/metadata_parser_test.cpp +++ b/generator/generator_tests/metadata_parser_test.cpp @@ -4,7 +4,6 @@ #include "indexer/classificator_loader.hpp" -#include "base/logging.hpp" using feature::Metadata; diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 788d100..01a113e 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -8,7 +8,6 @@ #include "indexer/feature_data.hpp" #include "indexer/classificator.hpp" -#include "indexer/classificator_loader.hpp" #include "platform/platform.hpp" diff --git a/generator/generator_tests/region_info_collector_tests.cpp b/generator/generator_tests/region_info_collector_tests.cpp index c0385cd..a496508 100644 --- a/generator/generator_tests/region_info_collector_tests.cpp +++ b/generator/generator_tests/region_info_collector_tests.cpp @@ -8,15 +8,12 @@ #include "platform/platform.hpp" -#include "base/file_name_utils.hpp" #include "base/geo_object_id.hpp" #include "base/scope_guard.hpp" #include #include #include -#include -#include #include using namespace generator_tests; diff --git a/generator/generator_tests/regions_tests.cpp b/generator/generator_tests/regions_tests.cpp index e46cd24..5821922 100644 --- a/generator/generator_tests/regions_tests.cpp +++ b/generator/generator_tests/regions_tests.cpp @@ -6,7 +6,6 @@ #include "generator/osm_element.hpp" #include "generator/regions/collector_region_info.hpp" #include "generator/regions/place_point.hpp" -#include "generator/regions/regions.hpp" #include "generator/regions/regions_builder.hpp" #include "indexer/classificator.hpp" @@ -14,15 +13,12 @@ #include "platform/platform.hpp" -#include "coding/transliteration.hpp" -#include "base/file_name_utils.hpp" #include "base/macros.hpp" #include "base/scope_guard.hpp" #include #include -#include #include #include #include diff --git a/generator/generator_tests/source_to_element_test.cpp b/generator/generator_tests/source_to_element_test.cpp index 85f9303..67365a7 100644 --- a/generator/generator_tests/source_to_element_test.cpp +++ b/generator/generator_tests/source_to_element_test.cpp @@ -8,8 +8,6 @@ #include #include -#include -#include #include #include diff --git a/generator/generator_tests/tag_admixer_test.cpp b/generator/generator_tests/tag_admixer_test.cpp index 0e1e24f..a375431 100644 --- a/generator/generator_tests/tag_admixer_test.cpp +++ b/generator/generator_tests/tag_admixer_test.cpp @@ -4,7 +4,6 @@ #include #include -#include UNIT_TEST(WaysParserTests) { diff --git a/generator/generator_tests_support/test_feature.cpp b/generator/generator_tests_support/test_feature.cpp index 95829ba..db9097a 100644 --- a/generator/generator_tests_support/test_feature.cpp +++ b/generator/generator_tests_support/test_feature.cpp @@ -6,10 +6,7 @@ #include "indexer/editable_map_object.hpp" #include "indexer/feature.hpp" #include "indexer/feature_algo.hpp" -#include "indexer/feature_decl.hpp" #include "indexer/feature_meta.hpp" -#include "indexer/ftypes_matcher.hpp" -#include "indexer/mwm_set.hpp" #include "coding/string_utf8_multilang.hpp" diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp index 180dba3..d0dd31f 100644 --- a/generator/generator_tool/generator_tool.cpp +++ b/generator/generator_tool/generator_tool.cpp @@ -1,7 +1,4 @@ -#include "generator/check_model.hpp" #include "generator/data_version.hpp" -#include "generator/dumper.hpp" -#include "generator/feature_generator.hpp" #include "generator/generate_info.hpp" #include "generator/geo_objects/geo_objects_generator.hpp" #include "generator/locality_sorter.hpp" @@ -14,7 +11,6 @@ #include "generator/streets/streets.hpp" #include "generator/translator_collection.hpp" #include "generator/translator_factory.hpp" -#include "generator/unpack_mwm.hpp" #include "geocoder/geocoder.hpp" @@ -28,7 +24,6 @@ #include "coding/endianness.hpp" #include "base/file_name_utils.hpp" -#include "base/timer.hpp" #include @@ -40,7 +35,6 @@ #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED #include -#include "build_version.hpp" #include "defines.hpp" using namespace std; diff --git a/generator/locality_sorter.cpp b/generator/locality_sorter.cpp index 67bab43..b058648 100644 --- a/generator/locality_sorter.cpp +++ b/generator/locality_sorter.cpp @@ -6,26 +6,20 @@ #include "indexer/data_header.hpp" #include "indexer/scales.hpp" -#include "indexer/scales_patch.hpp" #include "coding/file_container.hpp" #include "coding/internal/file_data.hpp" #include "geometry/convex_hull.hpp" -#include "platform/platform.hpp" -#include "base/assert.hpp" -#include "base/file_name_utils.hpp" #include "base/logging.hpp" -#include "base/scope_guard.hpp" #include "base/string_utils.hpp" #include "base/timer.hpp" #include "defines.hpp" #include -#include #include #include #include diff --git a/generator/metalines_builder.cpp b/generator/metalines_builder.cpp index d816b9f..d76e41b 100644 --- a/generator/metalines_builder.cpp +++ b/generator/metalines_builder.cpp @@ -12,7 +12,6 @@ #include "base/checked_cast.hpp" #include "base/logging.hpp" -#include "base/string_utils.hpp" #include "defines.hpp" diff --git a/generator/osm_element.cpp b/generator/osm_element.cpp index d15dd9d..80948fc 100644 --- a/generator/osm_element.cpp +++ b/generator/osm_element.cpp @@ -4,7 +4,6 @@ #include "coding/parse_xml.hpp" #include -#include #include #include diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp index 8a3856e..8a94705 100644 --- a/generator/osm_source.cpp +++ b/generator/osm_source.cpp @@ -9,7 +9,6 @@ #include "platform/platform.hpp" #include "geometry/mercator.hpp" -#include "geometry/tree4d.hpp" #include "base/assert.hpp" #include "base/stl_helpers.hpp" diff --git a/generator/raw_generator.cpp b/generator/raw_generator.cpp index 5e7cd62..ad630f6 100644 --- a/generator/raw_generator.cpp +++ b/generator/raw_generator.cpp @@ -8,7 +8,6 @@ #include "base/thread_pool_computational.hpp" -#include "defines.hpp" #include #include diff --git a/generator/regions/region_info.cpp b/generator/regions/region_info.cpp index 4a96969..176043c 100644 --- a/generator/regions/region_info.cpp +++ b/generator/regions/region_info.cpp @@ -5,8 +5,6 @@ #include "coding/file_reader.hpp" #include "base/assert.hpp" -#include "base/logging.hpp" -#include "base/macros.hpp" namespace generator { diff --git a/generator/regions/regions.cpp b/generator/regions/regions.cpp index 0a24860..63e27e7 100644 --- a/generator/regions/regions.cpp +++ b/generator/regions/regions.cpp @@ -3,20 +3,15 @@ #include "generator/feature_builder.hpp" #include "generator/feature_generator.hpp" -#include "generator/generate_info.hpp" #include "generator/regions/node.hpp" #include "generator/regions/place_point.hpp" -#include "generator/regions/regions.hpp" #include "generator/regions/regions_builder.hpp" #include "geometry/mercator.hpp" -#include "coding/transliteration.hpp" #include "base/assert.hpp" -#include "base/file_name_utils.hpp" #include "base/logging.hpp" -#include "base/stl_helpers.hpp" #include "base/timer.hpp" #include @@ -24,15 +19,10 @@ #include #include #include -#include #include -#include #include -#include -#include #include -#include "defines.hpp" using namespace feature; diff --git a/generator/regions/regions_builder.cpp b/generator/regions/regions_builder.cpp index 3fa9c63..8ba9358 100644 --- a/generator/regions/regions_builder.cpp +++ b/generator/regions/regions_builder.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include #include diff --git a/generator/routing_helpers.cpp b/generator/routing_helpers.cpp index ba306ca..258525f 100644 --- a/generator/routing_helpers.cpp +++ b/generator/routing_helpers.cpp @@ -2,8 +2,6 @@ #include "generator/utils.hpp" -#include "coding/file_reader.hpp" -#include "coding/reader.hpp" #include "base/logging.hpp" diff --git a/generator/statistics.cpp b/generator/statistics.cpp index effa978..3cdd168 100644 --- a/generator/statistics.cpp +++ b/generator/statistics.cpp @@ -12,7 +12,6 @@ #include #include -#include using namespace feature; using namespace std; diff --git a/generator/streets/street_geometry.cpp b/generator/streets/street_geometry.cpp index 91cfcf1..95d6301 100644 --- a/generator/streets/street_geometry.cpp +++ b/generator/streets/street_geometry.cpp @@ -9,7 +9,6 @@ #include "base/exception.hpp" #include -#include #include #include @@ -159,7 +158,7 @@ void HighwayGeometry::ExtendLimitRect(std::vector const & points) void HighwayGeometry::MultiLine::Add(LineSegment && segment) { - for (auto line = m_lines.begin(), end = m_lines.end(); line != end; ++line) + for (auto line = m_lines.begin(), end = m_lines.end(); line != end; ++line) { if (line->Add(std::move(segment))) { diff --git a/generator/streets/street_regions_tracing.cpp b/generator/streets/street_regions_tracing.cpp index 17fa976..b5f8946 100644 --- a/generator/streets/street_regions_tracing.cpp +++ b/generator/streets/street_regions_tracing.cpp @@ -3,7 +3,6 @@ #include "geometry/mercator.hpp" #include -#include #include diff --git a/generator/streets/streets.cpp b/generator/streets/streets.cpp index 6f22e95..779f779 100644 --- a/generator/streets/streets.cpp +++ b/generator/streets/streets.cpp @@ -7,7 +7,6 @@ #include "base/scope_guard.hpp" #include "base/timer.hpp" -#include namespace generator { diff --git a/geocoder/geocoder_tests/geocoder_tests.cpp b/geocoder/geocoder_tests/geocoder_tests.cpp index baf6038..f0498ed 100644 --- a/geocoder/geocoder_tests/geocoder_tests.cpp +++ b/geocoder/geocoder_tests/geocoder_tests.cpp @@ -3,7 +3,6 @@ #include "geocoder/geocoder.hpp" #include "geocoder/hierarchy_reader.hpp" -#include "indexer/search_string_utils.hpp" #include "platform/platform_tests_support/scoped_file.hpp" diff --git a/geocoder/hierarchy_reader.cpp b/geocoder/hierarchy_reader.cpp index b8f60fa..5bbd13c 100644 --- a/geocoder/hierarchy_reader.cpp +++ b/geocoder/hierarchy_reader.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include using namespace std; diff --git a/geometry/geometry_tests/parametrized_segment_tests.cpp b/geometry/geometry_tests/parametrized_segment_tests.cpp index 569b9ac..f8d2b8a 100644 --- a/geometry/geometry_tests/parametrized_segment_tests.cpp +++ b/geometry/geometry_tests/parametrized_segment_tests.cpp @@ -4,7 +4,6 @@ #include "geometry/point2d.hpp" #include "base/macros.hpp" -#include "base/math.hpp" template void FloatingPointsTest() @@ -53,17 +52,17 @@ UNIT_TEST(ParametrizedSegment2D_DegenerateSection) UNIT_TEST(ParametrizedSegment2D_ClosestPoint) { using P = m2::PointD; - + P arr[][4] = { { P(3, 4), P(0, 0), P(10, 0), P(3, 0) }, { P(3, 4), P(0, 0), P(0, 10), P(0, 4) }, - + { P(3, 5), P(2, 2), P(5, 5), P(4, 4) }, { P(5, 3), P(2, 2), P(5, 5), P(4, 4) }, { P(2, 4), P(2, 2), P(5, 5), P(3, 3) }, { P(4, 2), P(2, 2), P(5, 5), P(3, 3) }, - + { P(5, 6), P(2, 2), P(5, 5), P(5, 5) }, { P(1, 0), P(2, 2), P(5, 5), P(2, 2) } }; diff --git a/geometry/geometry_tests/simplification_test.cpp b/geometry/geometry_tests/simplification_test.cpp index 658efcf..b0302e7 100644 --- a/geometry/geometry_tests/simplification_test.cpp +++ b/geometry/geometry_tests/simplification_test.cpp @@ -5,11 +5,9 @@ #include "geometry/point2d.hpp" #include "geometry/simplification.hpp" -#include "base/logging.hpp" #include "base/macros.hpp" #include "base/stl_helpers.hpp" -#include #include #include diff --git a/geometry/robust_orientation.cpp b/geometry/robust_orientation.cpp index 36898e0..312a1b8 100644 --- a/geometry/robust_orientation.cpp +++ b/geometry/robust_orientation.cpp @@ -2,7 +2,6 @@ #include "base/macros.hpp" -#include extern "C" { #if defined(__clang__) diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp index e922aa3..e34a910 100644 --- a/geometry/screenbase.cpp +++ b/geometry/screenbase.cpp @@ -3,7 +3,6 @@ #include "geometry/transformations.hpp" #include "base/assert.hpp" -#include "base/logging.hpp" #include diff --git a/geometry/triangle2d.cpp b/geometry/triangle2d.cpp index dcf086b..9ba8d00 100644 --- a/geometry/triangle2d.cpp +++ b/geometry/triangle2d.cpp @@ -4,7 +4,6 @@ #include "geometry/robust_orientation.hpp" #include "geometry/segment2d.hpp" -#include "base/math.hpp" #include #include diff --git a/indexer/altitude_loader.cpp b/indexer/altitude_loader.cpp index 76c4d07..ed6b447 100644 --- a/indexer/altitude_loader.cpp +++ b/indexer/altitude_loader.cpp @@ -7,13 +7,11 @@ #include "base/logging.hpp" #include "base/stl_helpers.hpp" -#include "base/thread.hpp" #include "defines.hpp" #include -#include "3party/succinct/mapper.hpp" using namespace std; diff --git a/indexer/centers_table.cpp b/indexer/centers_table.cpp index 52cce76..16a16f5 100644 --- a/indexer/centers_table.cpp +++ b/indexer/centers_table.cpp @@ -1,26 +1,17 @@ #include "indexer/centers_table.hpp" -#include "indexer/feature_processor.hpp" #include "coding/endianness.hpp" -#include "coding/file_container.hpp" #include "coding/geometry_coding.hpp" -#include "coding/memory_region.hpp" #include "coding/point_coding.hpp" #include "coding/reader.hpp" -#include "coding/succinct_mapper.hpp" #include "coding/varint.hpp" -#include "coding/write_to_sink.hpp" #include "coding/writer.hpp" #include "base/assert.hpp" -#include "base/checked_cast.hpp" -#include "base/logging.hpp" #include -#include "3party/succinct/elias_fano.hpp" -#include "3party/succinct/rs_bit_vector.hpp" using namespace std; diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp index 17ea2d4..2c4813e 100644 --- a/indexer/classificator_loader.cpp +++ b/indexer/classificator_loader.cpp @@ -1,4 +1,3 @@ -#include "indexer/classificator_loader.hpp" #include "indexer/classificator.hpp" #include "indexer/drawing_rules.hpp" #include "indexer/map_style_reader.hpp" @@ -10,7 +9,6 @@ #include "base/logging.hpp" -#include #include #include diff --git a/indexer/data_source.cpp b/indexer/data_source.cpp index 74c3b2c..d1f4d3f 100644 --- a/indexer/data_source.cpp +++ b/indexer/data_source.cpp @@ -3,7 +3,6 @@ #include "base/logging.hpp" #include -#include using platform::CountryFile; using platform::LocalCountryFile; diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp index c422d55..30aa8dd 100644 --- a/indexer/drawing_rules.cpp +++ b/indexer/drawing_rules.cpp @@ -4,9 +4,7 @@ #include "indexer/map_style_reader.hpp" #include "indexer/scales.hpp" -#include "defines.hpp" -#include "platform/platform.hpp" #include "base/logging.hpp" diff --git a/indexer/feature.cpp b/indexer/feature.cpp index 83c658e..5abd840 100644 --- a/indexer/feature.cpp +++ b/indexer/feature.cpp @@ -4,15 +4,12 @@ #include "indexer/feature_algo.hpp" #include "indexer/feature_impl.hpp" #include "indexer/feature_utils.hpp" -#include "indexer/feature_visibility.hpp" #include "indexer/map_object.hpp" -#include "indexer/scales.hpp" #include "indexer/shared_load_info.hpp" #include "platform/preferred_languages.hpp" #include "geometry/parametrized_segment.hpp" -#include "geometry/robust_orientation.hpp" #include "coding/byte_stream.hpp" #include "coding/dd_vector.hpp" @@ -25,7 +22,6 @@ #include #include -#include "defines.hpp" using namespace feature; using namespace std; diff --git a/indexer/feature_algo.cpp b/indexer/feature_algo.cpp index 52af2e5..11eef95 100644 --- a/indexer/feature_algo.cpp +++ b/indexer/feature_algo.cpp @@ -1,4 +1,3 @@ -#include "indexer/feature_algo.hpp" #include "indexer/feature.hpp" #include "geometry/algorithm.hpp" diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp index 5b14914..d064b27 100644 --- a/indexer/feature_data.cpp +++ b/indexer/feature_data.cpp @@ -3,7 +3,6 @@ #include "indexer/classificator.hpp" #include "indexer/feature.hpp" #include "indexer/feature_impl.hpp" -#include "indexer/feature_visibility.hpp" #include "indexer/ftypes_matcher.hpp" #include "base/assert.hpp" diff --git a/indexer/feature_impl.cpp b/indexer/feature_impl.cpp index 402980f..fc46590 100644 --- a/indexer/feature_impl.cpp +++ b/indexer/feature_impl.cpp @@ -1,4 +1,3 @@ -#include "indexer/feature_impl.hpp" #include "base/string_utils.hpp" #include "base/logging.hpp" diff --git a/indexer/feature_meta.cpp b/indexer/feature_meta.cpp index efeb0aa..11b75b2 100644 --- a/indexer/feature_meta.cpp +++ b/indexer/feature_meta.cpp @@ -1,6 +1,5 @@ #include "indexer/feature_meta.hpp" -#include "platform/target_os.hpp" #include diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp index 0c714b1..7b939fd 100644 --- a/indexer/feature_utils.cpp +++ b/indexer/feature_utils.cpp @@ -1,11 +1,8 @@ #include "indexer/classificator.hpp" -#include "indexer/feature.hpp" #include "indexer/feature_data.hpp" -#include "indexer/feature_utils.hpp" #include "indexer/feature_visibility.hpp" #include "indexer/scales.hpp" -#include "geometry/point2d.hpp" #include "coding/string_utf8_multilang.hpp" #include "coding/transliteration.hpp" @@ -97,7 +94,7 @@ bool GetBestName(StringUtf8Multilang const & src, vector const & priorit } vector GetSimilarToDeviceLanguages(int8_t deviceLang) -{ +{ auto const it = kSimilarToDeviceLanguages.find(deviceLang); if (it != kSimilarToDeviceLanguages.cend()) return it->second; diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 4275dba..55254fc 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -14,8 +14,6 @@ #include #include #include -#include -#include using namespace std; diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp index df25c92..da23492 100644 --- a/indexer/indexer_tests/categories_test.cpp +++ b/indexer/indexer_tests/categories_test.cpp @@ -6,9 +6,7 @@ #include "indexer/classificator_loader.hpp" #include "coding/reader.hpp" -#include "coding/string_utf8_multilang.hpp" -#include "base/stl_helpers.hpp" #include "base/string_utils.hpp" #include diff --git a/indexer/indexer_tests/cell_coverer_test.cpp b/indexer/indexer_tests/cell_coverer_test.cpp index 82e8e06..d18b839 100644 --- a/indexer/indexer_tests/cell_coverer_test.cpp +++ b/indexer/indexer_tests/cell_coverer_test.cpp @@ -1,13 +1,10 @@ #include "testing/testing.hpp" -#include "geometry/covering_utils.hpp" #include "indexer/cell_coverer.hpp" #include "indexer/indexer_tests/bounds.hpp" -#include "coding/hex.hpp" -#include "base/logging.hpp" #include diff --git a/indexer/indexer_tests/cell_id_test.cpp b/indexer/indexer_tests/cell_id_test.cpp index 69b8119..c580470 100644 --- a/indexer/indexer_tests/cell_id_test.cpp +++ b/indexer/indexer_tests/cell_id_test.cpp @@ -3,7 +3,6 @@ #include "indexer/cell_id.hpp" #include "indexer/indexer_tests/bounds.hpp" -#include "coding/hex.hpp" #include #include diff --git a/indexer/indexer_tests/centers_table_test.cpp b/indexer/indexer_tests/centers_table_test.cpp index 5e0acfb..b0e50c8 100644 --- a/indexer/indexer_tests/centers_table_test.cpp +++ b/indexer/indexer_tests/centers_table_test.cpp @@ -3,10 +3,7 @@ #include "indexer/centers_table.hpp" #include "indexer/classificator_loader.hpp" #include "indexer/data_header.hpp" -#include "indexer/feature_algo.hpp" -#include "indexer/features_vector.hpp" -#include "platform/platform.hpp" #include "coding/reader.hpp" #include "coding/writer.hpp" @@ -14,10 +11,8 @@ #include "geometry/mercator.hpp" #include "geometry/point2d.hpp" -#include "base/file_name_utils.hpp" #include -#include #include #include diff --git a/indexer/indexer_tests/feature_metadata_test.cpp b/indexer/indexer_tests/feature_metadata_test.cpp index d4bf89f..67adc1a 100644 --- a/indexer/indexer_tests/feature_metadata_test.cpp +++ b/indexer/indexer_tests/feature_metadata_test.cpp @@ -5,7 +5,6 @@ #include "coding/reader.hpp" #include "coding/writer.hpp" -#include "platform/target_os.hpp" #include #include diff --git a/indexer/indexer_tests/index_builder_test.cpp b/indexer/indexer_tests/index_builder_test.cpp index 5823009..195ac94 100644 --- a/indexer/indexer_tests/index_builder_test.cpp +++ b/indexer/indexer_tests/index_builder_test.cpp @@ -4,7 +4,6 @@ #include "indexer/data_source.hpp" #include "indexer/features_vector.hpp" #include "indexer/index_builder.hpp" -#include "indexer/scales.hpp" #include "defines.hpp" diff --git a/indexer/indexer_tests/interval_index_test.cpp b/indexer/indexer_tests/interval_index_test.cpp index 120c12d..4c17278 100644 --- a/indexer/indexer_tests/interval_index_test.cpp +++ b/indexer/indexer_tests/interval_index_test.cpp @@ -9,7 +9,6 @@ #include "base/macros.hpp" #include "base/stl_helpers.hpp" -#include #include using namespace std; diff --git a/indexer/indexer_tests/locality_index_test.cpp b/indexer/indexer_tests/locality_index_test.cpp index 7a1f969..7eb649e 100644 --- a/indexer/indexer_tests/locality_index_test.cpp +++ b/indexer/indexer_tests/locality_index_test.cpp @@ -6,7 +6,6 @@ #include "indexer/locality_object.hpp" #include "coding/file_container.hpp" -#include "coding/mmap_reader.hpp" #include "coding/reader.hpp" #include "geometry/rect2d.hpp" diff --git a/indexer/indexer_tests/postcodes_matcher_tests.cpp b/indexer/indexer_tests/postcodes_matcher_tests.cpp index fcda954..bd2fec3 100644 --- a/indexer/indexer_tests/postcodes_matcher_tests.cpp +++ b/indexer/indexer_tests/postcodes_matcher_tests.cpp @@ -1,11 +1,8 @@ #include "../../testing/testing.hpp" #include "indexer/postcodes_matcher.hpp" -#include "indexer/search_delimiters.hpp" -#include "indexer/search_string_utils.hpp" #include "base/stl_helpers.hpp" -#include "base/string_utils.hpp" using namespace strings; diff --git a/indexer/indexer_tests/search_string_utils_test.cpp b/indexer/indexer_tests/search_string_utils_test.cpp index 5a273c6..cd670e9 100644 --- a/indexer/indexer_tests/search_string_utils_test.cpp +++ b/indexer/indexer_tests/search_string_utils_test.cpp @@ -4,7 +4,6 @@ #include "base/string_utils.hpp" -#include #include #include #include diff --git a/indexer/indexer_tests/string_slice_tests.cpp b/indexer/indexer_tests/string_slice_tests.cpp index 78c8fa8..deeadfd 100644 --- a/indexer/indexer_tests/string_slice_tests.cpp +++ b/indexer/indexer_tests/string_slice_tests.cpp @@ -4,7 +4,6 @@ #include "base/string_utils.hpp" -#include #include using namespace search; diff --git a/indexer/indexer_tests/succinct_trie_test.cpp b/indexer/indexer_tests/succinct_trie_test.cpp index 2b4bc51..6fa3fa7 100644 --- a/indexer/indexer_tests/succinct_trie_test.cpp +++ b/indexer/indexer_tests/succinct_trie_test.cpp @@ -6,7 +6,6 @@ #include "indexer/succinct_trie_builder.hpp" #include "indexer/succinct_trie_reader.hpp" #include "indexer/trie.hpp" -#include "indexer/trie_builder.hpp" #include "indexer/trie_reader.hpp" #include "base/string_utils.hpp" diff --git a/indexer/indexer_tests/trie_test.cpp b/indexer/indexer_tests/trie_test.cpp index 19c13c9..aba7568 100644 --- a/indexer/indexer_tests/trie_test.cpp +++ b/indexer/indexer_tests/trie_test.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/indexer/indexer_tests/visibility_test.cpp b/indexer/indexer_tests/visibility_test.cpp index 1e74f4b..99e2c71 100644 --- a/indexer/indexer_tests/visibility_test.cpp +++ b/indexer/indexer_tests/visibility_test.cpp @@ -1,6 +1,5 @@ #include "testing/testing.hpp" -#include "indexer/feature_data.hpp" #include "indexer/feature_visibility.hpp" #include "indexer/classificator.hpp" #include "indexer/classificator_loader.hpp" diff --git a/indexer/map_object.cpp b/indexer/map_object.cpp index d04666c..88e3698 100644 --- a/indexer/map_object.cpp +++ b/indexer/map_object.cpp @@ -6,7 +6,6 @@ #include "platform/localization.hpp" #include "platform/measurement_utils.hpp" -#include "platform/preferred_languages.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp index c1130ee..9422863 100644 --- a/indexer/mwm_set.cpp +++ b/indexer/mwm_set.cpp @@ -6,7 +6,6 @@ #include "platform/local_country_file_utils.hpp" #include "base/assert.hpp" -#include "base/exception.hpp" #include "base/logging.hpp" #include "base/stl_helpers.hpp" @@ -14,7 +13,6 @@ #include #include -#include "defines.hpp" using namespace std; using platform::CountryFile; diff --git a/indexer/postcodes_matcher.cpp b/indexer/postcodes_matcher.cpp index 6be3e46..41ff601 100644 --- a/indexer/postcodes_matcher.cpp +++ b/indexer/postcodes_matcher.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include diff --git a/indexer/rank_table.cpp b/indexer/rank_table.cpp index 5e19e6b..2abc698 100644 --- a/indexer/rank_table.cpp +++ b/indexer/rank_table.cpp @@ -1,10 +1,7 @@ #include "indexer/rank_table.hpp" -#include "indexer/classificator.hpp" #include "indexer/data_header.hpp" -#include "indexer/feature_algo.hpp" #include "indexer/feature_impl.hpp" -#include "indexer/feature_utils.hpp" #include "indexer/features_vector.hpp" #include "indexer/ftypes_matcher.hpp" @@ -22,7 +19,6 @@ #include "base/assert.hpp" #include "base/logging.hpp" -#include "base/macros.hpp" #include "base/math.hpp" #include diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp index bfdb529..44fd630 100644 --- a/platform/local_country_file_utils.cpp +++ b/platform/local_country_file_utils.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include "defines.hpp" diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp index 501e001..f61dc8d 100644 --- a/platform/measurement_utils.cpp +++ b/platform/measurement_utils.cpp @@ -4,9 +4,7 @@ #include "geometry/mercator.hpp" #include "base/assert.hpp" -#include "base/macros.hpp" #include "base/math.hpp" -#include "base/stl_helpers.hpp" #include "base/string_utils.hpp" #include @@ -75,7 +73,7 @@ bool FormatDistanceWithLocalization(double m, string & res, char const * high, c } UNREACHABLE(); } - + bool FormatDistance(double m, string & res) { auto units = Units::Metric; @@ -226,7 +224,7 @@ string FormatSpeed(double metersPerSecond, Units units) } return ToStringPrecision(unitsPerHour, unitsPerHour >= 10.0 ? 0 : 1); } - + string FormatSpeedLimit(double kilometersPerHour, Units units) { double unitsPerHour = 0; diff --git a/platform/mwm_version.cpp b/platform/mwm_version.cpp index 4d92d85..b514533 100644 --- a/platform/mwm_version.cpp +++ b/platform/mwm_version.cpp @@ -5,7 +5,6 @@ #include "coding/varint.hpp" #include "coding/writer.hpp" -#include "base/assert.hpp" #include "base/gmtime.hpp" #include "base/string_utils.hpp" #include "base/timegm.hpp" diff --git a/platform/platform.cpp b/platform/platform.cpp index 5e81eb0..1e414ba 100644 --- a/platform/platform.cpp +++ b/platform/platform.cpp @@ -1,6 +1,5 @@ #include "platform/platform.hpp" -#include "platform/local_country_file.hpp" #include "coding/base64.hpp" #include "coding/internal/file_data.hpp" @@ -14,7 +13,6 @@ #include #include -#include "platform/target_os.hpp" #include diff --git a/platform/platform_linux.cpp b/platform/platform_linux.cpp index 416ab34..dbdb608 100644 --- a/platform/platform_linux.cpp +++ b/platform/platform_linux.cpp @@ -9,7 +9,6 @@ #include "base/macros.hpp" #include "base/scope_guard.hpp" -#include #include #include #include @@ -18,8 +17,6 @@ #include #include -#include -#include #include #include diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index 6879adc..d6468cc 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -2,7 +2,6 @@ #include "platform/mwm_version.hpp" #include "platform/platform.hpp" -#include "platform/platform_tests_support/scoped_file.hpp" #include "coding/file_writer.hpp" #include "coding/internal/file_data.hpp" @@ -259,7 +258,6 @@ UNIT_TEST(IsSingleMwm) UNIT_TEST(MkDirRecursively) { - using namespace platform::tests_support; auto const writablePath = GetPlatform().WritableDir(); auto const workPath = base::JoinPath(writablePath, "MkDirRecursively"); auto const resetDir = [](std::string const & path) { diff --git a/platform/platform_tests_support/scoped_file.cpp b/platform/platform_tests_support/scoped_file.cpp index 882fd20..5800e3e 100644 --- a/platform/platform_tests_support/scoped_file.cpp +++ b/platform/platform_tests_support/scoped_file.cpp @@ -1,6 +1,5 @@ #include "platform/platform_tests_support/scoped_file.hpp" -#include "testing/testing.hpp" #include "platform/country_file.hpp" #include "platform/mwm_version.hpp" diff --git a/platform/platform_tests_support/test_socket.cpp b/platform/platform_tests_support/test_socket.cpp index f8abf0e..9cb566b 100644 --- a/platform/platform_tests_support/test_socket.cpp +++ b/platform/platform_tests_support/test_socket.cpp @@ -1,6 +1,5 @@ #include "test_socket.hpp" -#include "base/assert.hpp" #include #include diff --git a/platform/platform_tests_support/writable_dir_changer.cpp b/platform/platform_tests_support/writable_dir_changer.cpp index 23ec917..2de1596 100644 --- a/platform/platform_tests_support/writable_dir_changer.cpp +++ b/platform/platform_tests_support/writable_dir_changer.cpp @@ -5,8 +5,6 @@ #include "platform/platform.hpp" #include "platform/settings.hpp" -#include "base/file_name_utils.hpp" -#include "coding/internal/file_data.hpp" WritableDirChanger::WritableDirChanger(string const & testDir, SettingsDirPolicy settingsDirPolicy) : m_writableDirBeforeTest(GetPlatform().WritableDir()) diff --git a/platform/platform_unix_impl.cpp b/platform/platform_unix_impl.cpp index 3097341..da6ab31 100644 --- a/platform/platform_unix_impl.cpp +++ b/platform/platform_unix_impl.cpp @@ -6,14 +6,11 @@ #include "base/scope_guard.hpp" #include -#include #include #include #include -#include -#include #include #include diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp index 7a28024..20a353e 100644 --- a/platform/preferred_languages.cpp +++ b/platform/preferred_languages.cpp @@ -1,4 +1,3 @@ -#include "platform/preferred_languages.hpp" #include "base/string_utils.hpp" #include "base/logging.hpp" @@ -14,7 +13,6 @@ #endif #include -#include #include using namespace std; diff --git a/platform/settings.cpp b/platform/settings.cpp index 5ed652a..c9b20da 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -4,9 +4,6 @@ #include "defines.hpp" -#include "coding/file_reader.hpp" -#include "coding/file_writer.hpp" -#include "coding/reader_streambuf.hpp" #include "coding/transliteration.hpp" #include "geometry/any_rect2d.hpp" @@ -16,7 +13,6 @@ #include #include -#include using namespace std; diff --git a/platform/string_storage_base.cpp b/platform/string_storage_base.cpp index 2850435..13a43dd 100644 --- a/platform/string_storage_base.cpp +++ b/platform/string_storage_base.cpp @@ -6,9 +6,7 @@ #include "base/exception.hpp" #include "base/logging.hpp" -#include "base/stl_helpers.hpp" -#include using namespace std;