diff --git a/iphone/Maps/3party/MyTarget/MWMMyTarget.mm b/iphone/Maps/3party/MyTarget/MWMMyTarget.mm index 31d05e3ff4..472c00e4f0 100644 --- a/iphone/Maps/3party/MyTarget/MWMMyTarget.mm +++ b/iphone/Maps/3party/MyTarget/MWMMyTarget.mm @@ -1,5 +1,4 @@ #import "MWMMyTarget.h" -#import #import #import "MWMSettings.h" #import "MapsAppDelegate.h" diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm index ff8cd3615a..db09d76120 100644 --- a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm +++ b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm @@ -2,7 +2,6 @@ #import "MWMSearch.h" #include "platform/localization.hpp" #include "search/result.hpp" -#include "map/everywhere_search_callback.hpp" @interface MWMCarPlaySearchResultObject() @property(assign, nonatomic, readwrite) NSInteger originalRow; diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.mm b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.mm index aadb11eab8..2f13ff609c 100644 --- a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.mm +++ b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.mm @@ -1,7 +1,6 @@ #import "MWMCarPlaySearchService.h" #import "MWMCarPlaySearchResultObject.h" #import "MWMSearch.h" -#import API_AVAILABLE(ios(12.0)) @interface MWMCarPlaySearchService () diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index 3b0fa214fa..4febea13ee 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -14,13 +14,8 @@ #include "partners_api/downloader_promo.hpp" -#include "storage/country_info_getter.hpp" - #include "platform/local_country_file_utils.hpp" #include "platform/network_policy.hpp" -#include "platform/preferred_languages.hpp" - -#include "base/assert.hpp" namespace { CGSize constexpr kInitialDialogSize = {200, 200}; diff --git a/iphone/Maps/Common/Statistics/Statistics.mm b/iphone/Maps/Common/Statistics/Statistics.mm index 068484f767..3cc7f1c10e 100644 --- a/iphone/Maps/Common/Statistics/Statistics.mm +++ b/iphone/Maps/Common/Statistics/Statistics.mm @@ -12,9 +12,6 @@ #import #include "platform/platform.hpp" -#include "platform/settings.hpp" - -#include "base/macros.hpp" // If you have a "missing header error" here, then please run configure.sh script in the root repo folder. #import "private.h" diff --git a/iphone/Maps/Common/WebViewController.mm b/iphone/Maps/Common/WebViewController.mm index 2cb9bcf4da..5c0406642b 100644 --- a/iphone/Maps/Common/WebViewController.mm +++ b/iphone/Maps/Common/WebViewController.mm @@ -1,8 +1,6 @@ #import "WebViewController.h" #include -#include "base/assert.hpp" - @interface WebViewController() @property(copy, nonatomic) MWMVoidBlock onFailure; diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm index 2e71787a03..57ba32575a 100644 --- a/iphone/Maps/Core/Editor/MWMEditorHelper.mm +++ b/iphone/Maps/Core/Editor/MWMEditorHelper.mm @@ -4,8 +4,6 @@ #include "editor/osm_editor.hpp" -#include "platform/platform.hpp" - @implementation MWMEditorHelper + (void)uploadEdits:(void (^)(UIBackgroundFetchResult))completionHandler diff --git a/iphone/Maps/Core/Framework/MWMFrameworkListener.mm b/iphone/Maps/Core/Framework/MWMFrameworkListener.mm index 306de380b6..3139cf26a8 100644 --- a/iphone/Maps/Core/Framework/MWMFrameworkListener.mm +++ b/iphone/Maps/Core/Framework/MWMFrameworkListener.mm @@ -2,9 +2,6 @@ #include -#include "storage/storage.hpp" -#include "storage/storage_defines.hpp" - namespace { using Observer = id; diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm index 90a01a7ba0..bed148eb03 100644 --- a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm +++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm @@ -3,17 +3,12 @@ #import "MWMLocationObserver.h" #import "MWMFrameworkListener.h" #import "MWMCoreRouterType.h" -#import "MWMRouterResultCode.h" #import "MWMRoutePoint+CPP.h" #import "MWMCoreUnits.h" #import "SwiftBridge.h" #include -#include "routing/following_info.hpp" -#include "routing/turns.hpp" -#include "routing/routing_session.hpp" - @interface MWMRoutingManager() @property(nonatomic, readonly) RoutingManager & rm; @property(strong, nonatomic) NSHashTable> *listeners; diff --git a/iphone/Maps/Core/InappPurchase/Impl/MWMPurchaseValidation.mm b/iphone/Maps/Core/InappPurchase/Impl/MWMPurchaseValidation.mm index 3b75f060a8..13ea7627c8 100644 --- a/iphone/Maps/Core/InappPurchase/Impl/MWMPurchaseValidation.mm +++ b/iphone/Maps/Core/InappPurchase/Impl/MWMPurchaseValidation.mm @@ -1,7 +1,6 @@ #import "MWMPurchaseValidation.h" #include -#include "private.h" static NSMutableDictionary *> *callbacks = [NSMutableDictionary dictionary]; diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm index 7c38e6028e..87ed9dd0b9 100644 --- a/iphone/Maps/Core/Location/MWMLocationManager.mm +++ b/iphone/Maps/Core/Location/MWMLocationManager.mm @@ -1,14 +1,10 @@ #import "MWMLocationManager.h" -#import #import "MWMAlertViewController.h" -#import "MWMGeoTrackerCore.h" #import "MWMLocationObserver.h" #import "MWMLocationPredictor.h" #import "MWMRouter.h" #import "MapsAppDelegate.h" -#import "Statistics.h" #import "SwiftBridge.h" -#import "3party/Alohalytics/src/alohalytics_objc.h" #include diff --git a/iphone/Maps/Core/Metrics/MWMEye.mm b/iphone/Maps/Core/Metrics/MWMEye.mm index b5e3094b84..0bf5ae728e 100644 --- a/iphone/Maps/Core/Metrics/MWMEye.mm +++ b/iphone/Maps/Core/Metrics/MWMEye.mm @@ -1,7 +1,6 @@ #import "MWMEye.h" #include -#include "metrics/eye.hpp" @implementation MWMEye diff --git a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm index 3ee71bf7d4..d134bb4206 100644 --- a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm +++ b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm @@ -1,7 +1,6 @@ #import "MWMPushNotifications.h" #import #import -#import #import "Statistics.h" #include "platform/marketing_service.hpp" @@ -11,9 +10,6 @@ // If you have a "missing header error" here, then please run configure.sh script in the root repo // folder. -#import "private.h" - -#include namespace { diff --git a/iphone/Maps/Core/Routing/MWMRoutePoint.mm b/iphone/Maps/Core/Routing/MWMRoutePoint.mm index 45c0b8d0bc..953b2a8b2c 100644 --- a/iphone/Maps/Core/Routing/MWMRoutePoint.mm +++ b/iphone/Maps/Core/Routing/MWMRoutePoint.mm @@ -5,9 +5,6 @@ #include "platform/measurement_utils.hpp" -#include "geometry/mercator.hpp" -#include "geometry/point2d.hpp" - @interface MWMRoutePoint () @property(nonatomic, readonly) m2::PointD point; diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 94faf03280..8c596c5788 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -4,31 +4,19 @@ #import "MWMCoreRouterType.h" #import "MWMFrameworkListener.h" #import "MWMLocationHelpers.h" -#import "MWMLocationManager.h" #import "MWMLocationObserver.h" #import "MWMMapViewControlsManager.h" #import "MWMNavigationDashboardManager+Entity.h" #import "MWMRoutePoint+CPP.h" -#import "MWMRouterRecommendation.h" #import "MWMStorage.h" -#import "MapViewController.h" #import "MapsAppDelegate.h" -#import "Statistics.h" #import "SwiftBridge.h" #import "UIImage+RGBAData.h" #include -#include "routing/following_info.hpp" - -#include "indexer/feature_altitude.hpp" - #include "platform/local_country_file_utils.hpp" -#include -#include -#include - using namespace routing; @interface MWMRouter () diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index ecbd53956d..0893d5e0ff 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -1,25 +1,12 @@ #import "MWMSearch.h" -#import #import "MWMBannerHelpers.h" #import "MWMFrameworkListener.h" #import "SwiftBridge.h" #include -#include "partners_api/booking_availability_params.hpp" #include "partners_api/ads_engine.hpp" -#include "map/everywhere_search_params.hpp" -#include "map/viewport_search_params.hpp" - -#include "map/booking_filter_params.hpp" - -#include "platform/network_policy.hpp" - -#include -#include -#include - namespace { using Observer = id; diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index a7a9eacbcf..df4c6aa38d 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -2,13 +2,10 @@ #import "MWMCoreUnits.h" #import "MWMMapViewControlsManager.h" #import "SwiftBridge.h" -#import "3party/Alohalytics/src/alohalytics_objc.h" #import "Flurry.h" #include -#include "platform/settings.hpp" - namespace { char const * kAdServerForbiddenKey = "AdServerForbidden"; diff --git a/iphone/Maps/Core/Storage/MWMStorage.mm b/iphone/Maps/Core/Storage/MWMStorage.mm index e0909214e3..1db0d35fba 100644 --- a/iphone/Maps/Core/Storage/MWMStorage.mm +++ b/iphone/Maps/Core/Storage/MWMStorage.mm @@ -3,12 +3,9 @@ #import "MWMRouter.h" #include -#import #include "storage/storage_helpers.hpp" -#include - using namespace storage; @implementation MWMStorage diff --git a/iphone/Maps/Core/Subscriptions/MWMPurchaseManager.mm b/iphone/Maps/Core/Subscriptions/MWMPurchaseManager.mm index ca5ec166b6..91574cf540 100644 --- a/iphone/Maps/Core/Subscriptions/MWMPurchaseManager.mm +++ b/iphone/Maps/Core/Subscriptions/MWMPurchaseManager.mm @@ -2,7 +2,6 @@ #import "MWMPurchaseValidation.h" #include -#include "private.h" #import diff --git a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm index 26f01847b3..a896e8403b 100644 --- a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm +++ b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm @@ -1,5 +1,4 @@ #import -#import #import "MWMRouter.h" #import "MWMTextToSpeech+CPP.h" #import "Statistics.h" @@ -11,9 +10,6 @@ #include "platform/languages.hpp" -#include "base/assert.hpp" -#include "base/logging.hpp" - using namespace locale_translator; namespace diff --git a/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm b/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm index 352f6b8626..541035321c 100644 --- a/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm +++ b/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm @@ -1,12 +1,8 @@ #import "MWMAuthorizationViewModel.h" -#import -#import #import "Statistics.h" #include -#include - @implementation MWMAuthorizationViewModel + (NSURL * _Nullable)phoneAuthURL diff --git a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm index b1a7033a95..32f5772cf0 100644 --- a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm +++ b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm @@ -4,9 +4,6 @@ #import "MWMStorage.h" #import "Statistics.h" #import "SwiftBridge.h" -#import "UIButton+RuntimeAttributes.h" - -#include namespace { diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m index 88aab4213e..45a6a65870 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m @@ -1,6 +1,5 @@ #import "MWMBottomMenuCollectionViewCell.h" #import "SwiftBridge.h" -#import "UIImageView+Coloring.h" @interface MWMBottomMenuCollectionViewCell () diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm index 17421980da..b5a22ee95c 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm @@ -14,8 +14,6 @@ #include -#include "platform/platform.hpp" - extern NSString * const kAlohalyticsTapEventKey; extern NSString * const kSearchStateKey; diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm index 80bc57851d..5b294714b5 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm @@ -12,27 +12,9 @@ #import "MWMRouter.h" #import "MWMSearchManager+Filter.h" #import "Statistics.h" -#import "UIKitCategories.h" #import "SwiftBridge.h" -#include "map/discovery/discovery_client_params.hpp" -#include "map/search_product_info.hpp" - -#include "search/result.hpp" - -#include "partners_api/locals_api.hpp" -#include "partners_api/promo_api.hpp" - #include "platform/localization.hpp" -#include "platform/platform.hpp" - -#include "geometry/point2d.hpp" - -#include "base/assert.hpp" - -#include -#include -#include using namespace std; using namespace std::placeholders; diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm index d200c622ac..9b8ab781d0 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm @@ -11,25 +11,8 @@ #include "map/place_page_info.hpp" -#include "partners_api/locals_api.hpp" - #include "search/result.hpp" -#include "platform/localization.hpp" -#include "platform/measurement_utils.hpp" - -#include "geometry/distance_on_sphere.hpp" -#include "geometry/mercator.hpp" -#include "geometry/point2d.hpp" - -#include "base/logging.hpp" - -#include -#include -#include -#include -#include - using namespace std; namespace discovery diff --git a/iphone/Maps/UI/Discovery/View Models/MWMDiscoveryControllerViewModel.mm b/iphone/Maps/UI/Discovery/View Models/MWMDiscoveryControllerViewModel.mm index 72d4adf69a..dbf9148c76 100644 --- a/iphone/Maps/UI/Discovery/View Models/MWMDiscoveryControllerViewModel.mm +++ b/iphone/Maps/UI/Discovery/View Models/MWMDiscoveryControllerViewModel.mm @@ -4,7 +4,6 @@ #import "MWMDiscoveryHotelViewModel.h" #import "MWMDiscoverySearchViewModel.h" #import "MWMDiscoveryGuideViewModel.h" -#import "MWMRatingSummaryViewValueType.h" #include "map/place_page_info.hpp" @@ -12,7 +11,6 @@ #include "platform/measurement_utils.hpp" #include "geometry/distance_on_sphere.hpp" -#include "geometry/mercator.hpp" using namespace discovery; diff --git a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSource.mm b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSource.mm index e42c725499..e6e16e3cab 100644 --- a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSource.mm +++ b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSource.mm @@ -4,8 +4,6 @@ #include -#include "storage/country_info_getter.hpp" - using namespace storage; namespace diff --git a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm index 9294057bbb..92203c0584 100644 --- a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm +++ b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm @@ -1,7 +1,6 @@ #import "MWMBaseMapDownloaderViewController.h" #import "MWMButton.h" #import "MWMFrameworkListener.h" -#import "MWMFrameworkObservers.h" #import "MWMMapDownloaderAdsTableViewCell.h" #import "MWMMapDownloaderCellHeader.h" #import "MWMMapDownloaderDefaultDataSource.h" @@ -9,12 +8,10 @@ #import "MWMMapDownloaderLargeCountryTableViewCell.h" #import "MWMMapDownloaderPlaceTableViewCell.h" #import "MWMMapDownloaderSubplaceTableViewCell.h" -#import "MWMMapDownloaderTableViewCell.h" #import "MWMMyTarget.h" #import "MWMSegue.h" #import "MWMStorage.h" #import "SwiftBridge.h" -#import "UIViewController+Navigation.h" #include diff --git a/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsViewController.mm b/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsViewController.mm index c07d5a8bc5..6fbe2eddfd 100644 --- a/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsViewController.mm +++ b/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsViewController.mm @@ -2,7 +2,6 @@ #import "MWMMapDownloaderMode.h" #import "MWMMapViewControlsManager.h" #import "SwiftBridge.h" -#import "UIViewController+Navigation.h" @implementation MWMNoMapsViewController diff --git a/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm b/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm index ac9377b153..6b0b69ae58 100644 --- a/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm @@ -1,9 +1,6 @@ #import "MWMBookmarkColorViewController.h" #import "Statistics.h" #import "SwiftBridge.h" -#import "UIViewController+Navigation.h" - -#include namespace { diff --git a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm index 9ea9ea5eef..8551242415 100644 --- a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm @@ -6,8 +6,6 @@ #import "MWMPlacePageData.h" #import "SelectSetVC.h" #import "SwiftBridge.h" -#import "UIImageView+Coloring.h" -#import "UIViewController+Navigation.h" #include diff --git a/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm b/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm index dd5f711f16..1d48118b50 100644 --- a/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm +++ b/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm @@ -1,8 +1,6 @@ #import "MWMEditorAdditionalNamesTableViewController.h" #import "MWMTableViewCell.h" -#include "indexer/editable_map_object.hpp" - @interface MWMEditorAdditionalNamesTableViewController () @property (nonatomic) NSInteger selectedLanguageCode; diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.mm index 8a1cde598b..14185d17d9 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.mm +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.mm @@ -1,6 +1,5 @@ #import "MWMEditorCategoryCell.h" #import "MWMEditorCommon.h" -#import "UIImageView+Coloring.h" namespace { diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.mm index 49d01eceab..5324a91556 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.mm +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.mm @@ -1,7 +1,6 @@ #import "MWMEditorTextTableViewCell.h" #import "MWMEditorCommon.h" #import "UIImageView+Coloring.h" -#import "UITextField+RuntimeAttributes.h" namespace { diff --git a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm index 557e717beb..bd0d76c8e3 100644 --- a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm +++ b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm @@ -6,9 +6,6 @@ #include "indexer/cuisines.hpp" #include "indexer/search_string_utils.hpp" -#include -#include - namespace { NSString * const kCuisineEditorCell = @"MWMCuisineEditorTableViewCell"; diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 16fb3402f7..9855e09fe6 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -10,7 +10,6 @@ #import "MWMEditorAdditionalNamesTableViewController.h" #import "MWMEditorCategoryCell.h" #import "MWMEditorCellType.h" -#import "MWMEditorCommon.h" #import "MWMEditorNotesFooter.h" #import "MWMEditorSelectTableViewCell.h" #import "MWMEditorSwitchTableViewCell.h" @@ -25,11 +24,6 @@ #include -#include "editor/osm_editor.hpp" - -#include "indexer/classificator.hpp" -#include "indexer/feature_source.hpp" - #include "platform/localization.hpp" namespace diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm index be9662587e..4b6f4319de 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm @@ -6,7 +6,6 @@ #import "MWMTableViewCell.h" #import "Statistics.h" #import "SwiftBridge.h" -#import "UIViewController+Navigation.h" #include diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm index 6b1a0fc646..20a64eef39 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm @@ -4,18 +4,8 @@ #include -#include "indexer/classificator.hpp" - #include "platform/localization.hpp" -#include "editor/new_feature_categories.hpp" - -#include -#include -#include -#include -#include - using namespace osm; namespace diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.mm index 02c7551550..e73143bdf2 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.mm @@ -1,6 +1,5 @@ #import "MWMOpeningHoursAddScheduleTableViewCell.h" #import "MWMOpeningHoursCommon.h" -#import "MWMOpeningHoursEditorViewController.h" @interface MWMOpeningHoursAddScheduleTableViewCell () diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm index 8b13515cfb..a3a59055b9 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm @@ -1,8 +1,6 @@ #import "MWMOpeningHoursDaysSelectorTableViewCell.h" #import "UIImageView+Coloring.h" -#include "3party/opening_hours/opening_hours.hpp" - @interface MWMOpeningHoursDaysSelectorTableViewCell () @property (nonatomic) IBOutletCollection(UIButton) NSArray * buttons; diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm index 33c395a8d0..7c20f88986 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm @@ -5,11 +5,8 @@ #import "MWMOpeningHoursClosedSpanTableViewCell.h" #import "MWMOpeningHoursDaysSelectorTableViewCell.h" #import "MWMOpeningHoursDeleteScheduleTableViewCell.h" -#import "MWMOpeningHoursModel.h" -#import "MWMOpeningHoursSection.h" #import "MWMOpeningHoursTimeSelectorTableViewCell.h" #import "MWMOpeningHoursTimeSpanTableViewCell.h" -#import "MWMTextView.h" #import "SwiftBridge.h" extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{ diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm index 8c77af82c4..91e1422cda 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm @@ -1,8 +1,6 @@ #import "MWMOpeningHoursCommon.h" #import "MWMOpeningHoursModel.h" -#import "MWMOpeningHoursSection.h" -#include "editor/opening_hours_ui.hpp" #include "editor/ui2oh.hpp" extern UITableViewRowAnimation const kMWMOpeningHoursEditorRowAnimation = UITableViewRowAnimationFade; diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm index c88c5e6028..392ad9f7f2 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm @@ -3,10 +3,6 @@ #import "MWMOpeningHoursTableViewCell.h" #import "SwiftBridge.h" -#include "editor/opening_hours_ui.hpp" - -#include "3party/opening_hours/opening_hours.hpp" - extern NSDictionary * const kMWMOpeningHoursEditorTableCells; extern UITableViewRowAnimation const kMWMOpeningHoursEditorRowAnimation; diff --git a/iphone/Maps/UI/Migration/MWMMigrationViewController.mm b/iphone/Maps/UI/Migration/MWMMigrationViewController.mm index 2aa1abdcdb..2b684f383b 100644 --- a/iphone/Maps/UI/Migration/MWMMigrationViewController.mm +++ b/iphone/Maps/UI/Migration/MWMMigrationViewController.mm @@ -6,7 +6,6 @@ #import "Statistics.h" #include -#import using namespace storage; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index 8afcdf63d1..eb9070b5c6 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -1,29 +1,15 @@ #import "MWMPlacePageData.h" -#import "LocaleTranslator.h" #import "MWMDiscoveryCityGalleryObjects.h" #import "MWMDiscoveryGuideViewModel.h" #import "MWMBannerHelpers.h" #import "MWMUGCViewModel.h" -#import "Statistics.h" #import -#include "local_ads/event.hpp" - -#include "map/bookmark_helpers.hpp" #include "map/utils.hpp" -#include "platform/preferred_languages.hpp" - -#include "partners_api/booking_api.hpp" -#include "partners_api/booking_block_params.hpp" -#include "partners_api/promo_api.hpp" - #include "3party/opening_hours/opening_hours.hpp" -#include -#include - using namespace place_page; namespace diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm index e8f2943851..487c132d57 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm @@ -1,37 +1,23 @@ #import "MWMPlacePageManager.h" #import "CLLocation+Mercator.h" -#import "MWMAPIBar.h" #import "MWMActivityViewController.h" //#import "MWMBookmarksManager.h" #import "MWMFrameworkListener.h" -#import "MWMFrameworkObservers.h" #import "MWMLocationHelpers.h" -#import "MWMLocationManager.h" #import "MWMLocationObserver.h" #import "MWMPlacePageData.h" #import "MWMPlacePageLayout.h" #import "MWMRoutePoint+CPP.h" -#import "MWMRouter.h" #import "MWMSearchManager+Filter.h" #import "MWMStorage.h" -#import "MWMUGCViewModel.h" -#import "MapViewController.h" -#import "Statistics.h" #import "SwiftBridge.h" #import -#include "map/bookmark.hpp" #include "map/utils.hpp" #include "geometry/distance_on_sphere.hpp" -#include "base/assert.hpp" -#include "base/logging.hpp" -#include "base/stl_helpers.hpp" - -#include - namespace { void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName) diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm index e2e440baaf..5acc49036c 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm @@ -1,7 +1,6 @@ #import "MWMPlacePageManagerHelper.h" #import "MWMMapViewControlsManager.h" #import "MWMPlacePageManager.h" -#import "MWMUGCReviewSource.h" @interface MWMMapViewControlsManager () diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHours.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHours.mm index 48ed2e559d..cd0705348a 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHours.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHours.mm @@ -1,8 +1,6 @@ #import "MWMOpeningHours.h" #import "MWMOpeningHoursCommon.h" -#include "3party/opening_hours/opening_hours.hpp" -#include "editor/opening_hours_ui.hpp" #include "editor/ui2oh.hpp" using namespace editor; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm index ac1ff750a4..11a2cdf74b 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm @@ -4,9 +4,6 @@ #import "MWMTableViewCell.h" #import "SwiftBridge.h" -#include -#include - @interface MWMPlacePageData() - (std::vector &)mutableMetainfoRows; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm index 51e1288965..9e6b900d27 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm @@ -2,11 +2,8 @@ #import #import "MWMOpeningHoursCommon.h" #import "MWMPlacePageOpeningHoursDayView.h" -#import "Statistics.h" #import "UIImageView+Coloring.h" -#include "3party/opening_hours/opening_hours.hpp" -#include "editor/opening_hours_ui.hpp" #include "editor/ui2oh.hpp" using namespace editor; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm index b7abe3bf52..4fea29e463 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm @@ -1,15 +1,10 @@ #import "MWMPlacePageRegularCell.h" -#import "MWMLocationManager.h" #import "MapViewController.h" -#import "MapsAppDelegate.h" #import "Statistics.h" #import "UIImageView+Coloring.h" #include "local_ads/event.hpp" -#include "platform/measurement_utils.hpp" -#include "platform/settings.hpp" - @interface MWMPlacePageRegularCell () @property(weak, nonatomic, readwrite) IBOutlet UIImageView * icon; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm index 4e61fa71c2..e7fbbc5699 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm @@ -18,12 +18,9 @@ #import "MWMiPhonePlacePageLayoutImpl.h" #import "MapViewController.h" #import "SwiftBridge.h" -#import "Statistics.h" #include "partners_api/booking_api.hpp" -#include "storage/storage_defines.hpp" - #import namespace diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm index 8319945b88..579175973c 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm @@ -1,5 +1,4 @@ #import "MWMPPView.h" -#import "MWMPlacePageActionBar.h" #import "SwiftBridge.h" namespace diff --git a/iphone/Maps/UI/PlacePage/UGCViewModel/MWMUGCViewModel.mm b/iphone/Maps/UI/PlacePage/UGCViewModel/MWMUGCViewModel.mm index 2fd205c552..439e47b31a 100644 --- a/iphone/Maps/UI/PlacePage/UGCViewModel/MWMUGCViewModel.mm +++ b/iphone/Maps/UI/PlacePage/UGCViewModel/MWMUGCViewModel.mm @@ -2,10 +2,6 @@ #import "MWMPlacePageData.h" #import "SwiftBridge.h" -#include "ugc/types.hpp" - -#include - using namespace place_page; namespace diff --git a/iphone/Maps/UI/Promo/MWMPromoApi.mm b/iphone/Maps/UI/Promo/MWMPromoApi.mm index 4880b4841f..99a985bb30 100644 --- a/iphone/Maps/UI/Promo/MWMPromoApi.mm +++ b/iphone/Maps/UI/Promo/MWMPromoApi.mm @@ -4,7 +4,6 @@ #include #include "platform/network_policy.hpp" -#include "platform/preferred_languages.hpp" @implementation MWMPromoApi diff --git a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm index 4f42a34b9a..c63e7596b8 100644 --- a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm +++ b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm @@ -1,6 +1,5 @@ #import "MWMSearchChangeModeView.h" #import "MWMButton.h" -#import "MWMSearch.h" #import "UIButton+RuntimeAttributes.h" extern NSString * const kSearchStateKey; diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm index 0ca594f8f2..7a45318ace 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm @@ -1,6 +1,5 @@ #import "MWMSearch.h" #import "MWMSearchManager+Filter.h" -#import "Statistics.h" #import @interface MWMSearchManager () diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm index 5e0ba49440..be7181648e 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager.mm @@ -7,11 +7,9 @@ #import "MWMSearchChangeModeView.h" #import "MWMSearchManager+Filter.h" #import "MWMSearchManager+Layout.h" -#import "MWMSearchTableViewController.h" #import "MapViewController.h" #import "Statistics.h" #import "SwiftBridge.h" -#import "3party/Alohalytics/src/alohalytics_objc.h" extern NSString * const kAlohalyticsTapEventKey; extern NSString * const kSearchStateKey = @"SearchStateKey"; diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm index 23e0d1e325..a5391bed11 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm @@ -3,10 +3,6 @@ #include -#include "base/logging.hpp" - -#include - @interface MWMSearchCell () @property (weak, nonatomic) IBOutlet UILabel * titleLabel; diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm index dd98b1b1b9..603de550b6 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm @@ -4,17 +4,9 @@ #include "map/place_page_info.hpp" -#include "search/result.hpp" - -#include "indexer/classificator.hpp" - -#include "geometry/mercator.hpp" - #include "platform/localization.hpp" #include "platform/measurement_utils.hpp" -#include "defines.hpp" - namespace { bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters) diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm index 19a71d95fc..958b5341a0 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm @@ -5,8 +5,6 @@ #import "Statistics.h" #import "SwiftBridge.h" -#include "indexer/classificator.hpp" - #include "platform/localization.hpp" namespace diff --git a/iphone/Maps/UI/Settings/MWMAboutController.mm b/iphone/Maps/UI/Settings/MWMAboutController.mm index 72e21d9c38..6f02060247 100644 --- a/iphone/Maps/UI/Settings/MWMAboutController.mm +++ b/iphone/Maps/UI/Settings/MWMAboutController.mm @@ -4,8 +4,6 @@ #import "Statistics.h" #import "SwiftBridge.h" -#import "WebViewController.h" -#import "3party/Alohalytics/src/alohalytics_objc.h" extern NSString * const kAlohalyticsTapEventKey; diff --git a/iphone/Maps/UI/Settings/MWMSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMSettingsViewController.mm index dbb2b1526d..0d45f73368 100644 --- a/iphone/Maps/UI/Settings/MWMSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMSettingsViewController.mm @@ -4,16 +4,9 @@ #import "MWMTextToSpeech+CPP.h" #import "SwiftBridge.h" -#include "LocaleTranslator.h" - #import -#include "routing/speed_camera_manager.hpp" - #include "map/gps_tracker.hpp" -#include "map/routing_manager.hpp" - -#include "base/assert.hpp" extern NSString * const kAlohalyticsTapEventKey; diff --git a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm index 0099000493..419a6c4d62 100644 --- a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm @@ -3,23 +3,10 @@ #import "MWMTextToSpeech+CPP.h" #import "Statistics.h" #import "SwiftBridge.h" -#import "WebViewController.h" #include #include "LocaleTranslator.h" -#include "routing/speed_camera_manager.hpp" - -#include "map/routing_manager.hpp" - -#include "base/assert.hpp" -#include "base/stl_helpers.hpp" - -#include -#include -#include -#include - using namespace locale_translator; using namespace routing; using namespace std;