From 87e1c2abce165278fda2e6ea2387dae02b734c4b Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 18 Sep 2015 18:07:41 +0300 Subject: [PATCH] [ios] Moved common inclusions into prefix header. --- iphone/Maps/Bookmarks/AddSetVC.mm | 1 - iphone/Maps/Bookmarks/BookmarksRootVC.mm | 1 - iphone/Maps/Bookmarks/BookmarksVC.mm | 1 - iphone/Maps/Bookmarks/SelectSetVC.mm | 1 - iphone/Maps/Categories/UIKitCategories.h | 2 -- iphone/Maps/Classes/BadgeView.m | 1 - .../AlertController/MWMAlertViewController.mm | 1 - .../CustomAlert/DefaultAlert/MWMDefaultAlert.mm | 1 - .../MWMDownloadTransitMapAlert.mm | 1 - .../Classes/CustomAlert/RateAlert/MWMRateAlert.mm | 1 - .../MWMRoutingDisclaimerAlert.mm | 1 - .../CircularProgress/MWMCircularProgress.m | 1 - .../CircularProgress/MWMCircularProgressView.m | 1 - .../DownloadMapRequest/MWMDownloadMapRequest.mm | 1 - .../DownloadMapRequest/MWMDownloadMapRequestView.h | 1 - .../DownloadMapRequest/MWMDownloadMapRequestView.m | 1 - .../CustomViews/MapViewControls/APIBar/MWMAPIBar.mm | 1 - .../LocationButton/MWMLocationButtonView.mm | 1 - .../Search/DownloadView/MWMSearchDownloadView.mm | 1 - .../MapViewControls/Search/MWMSearchView.h | 1 - .../MapViewControls/Search/MWMSearchView.mm | 1 - .../Search/TabButtons/MWMSearchTabButtonsView.mm | 1 - .../TabbedView/MWMSearchTabbedCollectionViewCell.mm | 1 - .../TabbedView/MWMSearchTabbedViewController.mm | 1 - .../Search/TableView/MWMSearchCommonCell.mm | 1 - .../Search/TableView/MWMSearchTableView.mm | 1 - .../Search/TableView/MWMSearchTableViewController.mm | 1 - .../MapViewControls/SideMenu/MWMSideMenuButton.mm | 1 - .../SideMenu/MWMSideMenuDownloadBadge.m | 1 - .../MapViewControls/SideMenu/MWMSideMenuView.h | 2 -- .../MapViewControls/SideMenu/MWMSideMenuView.mm | 1 - .../MapViewControls/ZoomButtons/MWMZoomButtonsView.m | 1 - .../MWMNavigationDashboardManager.mm | 1 - .../Views/Dashboard/MWMNavigationDashboard.mm | 1 - .../NavigationDashboard/Views/MWMLanesPanel.mm | 1 - .../NavigationDashboard/Views/MWMNavigationView.mm | 1 - .../NavigationDashboard/Views/MWMNextTurnPanel.mm | 1 - .../NavigationDashboard/Views/MWMRouteHelperPanel.mm | 1 - .../Views/MWMRouteHelperPanelsDrawer.mm | 1 - .../Views/RoutePreview/MWMRoutePreview.mm | 1 - .../MWMSearchDownloadMapRequest.m | 1 - .../MWMSearchDownloadMapRequestView.h | 1 - .../MWMSearchDownloadMapRequestView.mm | 1 - iphone/Maps/Classes/EAGLView.mm | 2 -- iphone/Maps/Classes/LocalNotificationManager.mm | 1 - iphone/Maps/Classes/MWMBasePlacePageView.mm | 1 - iphone/Maps/Classes/MWMBookmarkColorCell.mm | 1 - iphone/Maps/Classes/MWMBookmarkColorViewController.mm | 1 - .../Classes/MWMBookmarkDescriptionViewController.mm | 1 - iphone/Maps/Classes/MWMDirectionView.mm | 1 - iphone/Maps/Classes/MWMPlacePage.mm | 1 - iphone/Maps/Classes/MWMPlacePageActionBar.mm | 1 - iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm | 1 - iphone/Maps/Classes/MWMPlacePageEntity.mm | 2 -- iphone/Maps/Classes/MWMPlacePageInfoCell.mm | 1 - iphone/Maps/Classes/MWMPlacePageNavigationBar.mm | 1 - iphone/Maps/Classes/MWMPlacePageTypeDescription.mm | 1 - iphone/Maps/Classes/MWMPlacePageViewManager.mm | 1 - iphone/Maps/Classes/MWMSpringAnimation.mm | 1 - iphone/Maps/Classes/MWMiPadPlacePage.mm | 1 - iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm | 1 - iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm | 1 - iphone/Maps/Classes/MapCell.mm | 1 - iphone/Maps/Classes/MapViewController.mm | 1 - iphone/Maps/Classes/MapsAppDelegate.mm | 1 - iphone/Maps/Classes/ProgressView.m | 1 - iphone/Maps/Classes/ToastView.m | 1 - iphone/Maps/Classes/UIViewController+Navigation.mm | 1 - iphone/Maps/CommunityVC.m | 1 - iphone/Maps/DownloaderParentVC.h | 1 - .../xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist | 11 +++++++++++ iphone/Maps/Maps_Prefix.pch | 3 +++ iphone/Maps/Settings/SettingsViewController.mm | 1 - iphone/Maps/SettingsAndMoreVC.mm | 1 - iphone/Maps/UIButton+RuntimeAttributes.m | 1 - iphone/Maps/UILabel+RuntimeAttributes.mm | 1 - 76 files changed, 14 insertions(+), 78 deletions(-) diff --git a/iphone/Maps/Bookmarks/AddSetVC.mm b/iphone/Maps/Bookmarks/AddSetVC.mm index 67db0c5cbf..a59d774e73 100644 --- a/iphone/Maps/Bookmarks/AddSetVC.mm +++ b/iphone/Maps/Bookmarks/AddSetVC.mm @@ -1,7 +1,6 @@ #import "AddSetVC.h" #import "Framework.h" -#import "UIKitCategories.h" #import "UIViewController+Navigation.h" #define TEXT_FIELD_TAG 666 diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm index 51f6320bd2..dd7af59ae4 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm @@ -1,7 +1,6 @@ #import "BookmarksRootVC.h" #import "BookmarksVC.h" #import "Common.h" -#import "UIKitCategories.h" #include "Framework.h" #include "platform/platform.hpp" diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index 9c68a9c434..45013562c5 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -7,7 +7,6 @@ #import "MapViewController.h" #import "MWMMapViewControlsManager.h" #import "Statistics.h" -#import "UIKitCategories.h" #import #include "Framework.h" diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm index ebfead305c..3dcd95d1ce 100644 --- a/iphone/Maps/Bookmarks/SelectSetVC.mm +++ b/iphone/Maps/Bookmarks/SelectSetVC.mm @@ -2,7 +2,6 @@ #import "SelectSetVC.h" #import "Framework.h" #import "AddSetVC.h" -#import "UIKitCategories.h" #import "MWMPlacePageViewManager.h" #import "MWMPlacePageEntity.h" #import "UIViewController+Navigation.h" diff --git a/iphone/Maps/Categories/UIKitCategories.h b/iphone/Maps/Categories/UIKitCategories.h index d2b89ee44f..cf7f57f432 100644 --- a/iphone/Maps/Categories/UIKitCategories.h +++ b/iphone/Maps/Categories/UIKitCategories.h @@ -1,5 +1,3 @@ - -#import #import "Macros.h" static inline CGPoint SubtractCGPoint(CGPoint p1, CGPoint p2) diff --git a/iphone/Maps/Classes/BadgeView.m b/iphone/Maps/Classes/BadgeView.m index e6f41d4ee3..7e988bebad 100644 --- a/iphone/Maps/Classes/BadgeView.m +++ b/iphone/Maps/Classes/BadgeView.m @@ -1,6 +1,5 @@ #import "BadgeView.h" -#import "UIKitCategories.h" #import "UIFont+MapsMeFonts.h" @implementation BadgeView diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index 9d869b4c30..e1cd9b8bec 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -1,7 +1,6 @@ #import "Common.h" #import "MWMAlertViewController.h" #import "MWMDownloadTransitMapAlert.h" -#import "UIKitCategories.h" static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController"; diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm index 36d12584a9..1649e7110d 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm @@ -6,7 +6,6 @@ #import "MWMPlacePageViewManager.h" #import "Statistics.h" #import "UIButton+RuntimeAttributes.h" -#import "UIKitCategories.h" #import "UILabel+RuntimeAttributes.h" #include "Framework.h" diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm index 12e4e28661..9757fa81a4 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm @@ -6,7 +6,6 @@ #import "MWMDownloadTransitMapAlert.h" #import "Statistics.h" #import "UIColor+MapsMeColor.h" -#import "UIKitCategories.h" #import "UILabel+RuntimeAttributes.h" @interface MWMDownloaderEntity : NSObject diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm index 76f4a225ea..eb3273cd12 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm @@ -3,7 +3,6 @@ #import "MWMRateAlert.h" #import "Statistics.h" #import "UIColor+MapsMeColor.h" -#import "UIKitCategories.h" #import #import diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm index 9d27d19839..5f66eced7c 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm @@ -3,7 +3,6 @@ #import "MWMRoutingDisclaimerAlert.h" #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" -#import "UIKitCategories.h" #import "Statistics.h" static CGFloat const kMinimumOffset = 20.; diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m index fc038f9f23..f7a494a831 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m @@ -1,6 +1,5 @@ #import "MWMCircularProgress.h" #import "MWMCircularProgressView.h" -#import "UIKitCategories.h" @interface MWMCircularProgress () diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m index bb423d26c8..fa8989b56d 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m @@ -1,7 +1,6 @@ #import "MWMCircularProgress.h" #import "MWMCircularProgressView.h" #import "UIColor+MapsMeColor.h" -#import "UIKitCategories.h" static CGFloat const kLineWidth = 2.0; static NSString * const kAnimationKey = @"CircleAnimation"; diff --git a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm index a053505a9d..b0aaa4a356 100644 --- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm +++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm @@ -4,7 +4,6 @@ #import "MWMCircularProgress.h" #import "MWMDownloadMapRequest.h" #import "MWMDownloadMapRequestView.h" -#import "UIKitCategories.h" #include "Framework.h" #include "storage/index.hpp" diff --git a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.h b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.h index 8afc2c7afe..0941ccf92f 100644 --- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.h +++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.h @@ -1,5 +1,4 @@ #import "MWMDownloadMapRequest.h" -#import "UIKitCategories.h" @interface MWMDownloadMapRequestView : SolidTouchView diff --git a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.m b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.m index 08ef3048a6..27f7458923 100644 --- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.m +++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.m @@ -1,7 +1,6 @@ #import "MWMDownloadMapRequestView.h" #import "UIButton+RuntimeAttributes.h" #import "UIColor+MapsMeColor.h" -#import "UIKitCategories.h" @interface MWMDownloadMapRequestView () diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm index 2621884e75..13b00b4bb5 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm @@ -1,7 +1,6 @@ #import "Common.h" #import "MWMAPIBar.h" #import "MWMAPIBarView.h" -#import "UIKitCategories.h" #include "Framework.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm index 1d99fea1e6..5dfb7f868f 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm @@ -1,6 +1,5 @@ #import "MWMLocationButtonView.h" #import "MWMMapViewControlsCommon.h" -#import "UIKitCategories.h" @interface MWMLocationButtonView() diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadView.mm index b192af2f9e..7e09d7df1d 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadView.mm @@ -1,6 +1,5 @@ #import "Common.h" #import "MWMSearchDownloadView.h" -#import "UIKitCategories.h" @interface MWMSearchDownloadView () diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.h index b8f6f4e5c5..46db41e6c1 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.h @@ -1,4 +1,3 @@ -#import "UIKitCategories.h" @class MWMSearchTabButtonsView; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm index e4e9c4465e..bdca10a7b4 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm @@ -1,7 +1,6 @@ #import "Common.h" #import "MWMSearchTabButtonsView.h" #import "MWMSearchView.h" -#import "UIKitCategories.h" static CGFloat const kWidthForiPad = 320.0; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.mm index e3d0de3a3f..a28544fce1 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.mm @@ -1,7 +1,6 @@ #import "MWMSearchManager.h" #import "MWMSearchTabButtonsView.h" #import "UIColor+MapsMeColor.h" -#import "UIKitCategories.h" static CGFloat const kIconToLabelSpacing = 4.0; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedCollectionViewCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedCollectionViewCell.mm index 0762a27071..f0b12cfa25 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedCollectionViewCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedCollectionViewCell.mm @@ -1,5 +1,4 @@ #import "MWMSearchTabbedCollectionViewCell.h" -#import "UIKitCategories.h" @interface MWMSearchTabbedCollectionViewCell () diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm index 8149786a93..d5033891d7 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm @@ -4,7 +4,6 @@ #import "MWMSearchTabbedViewController.h" #import "MWMSearchTabbedViewLayout.h" #import "MWMSearchTabbedViewProtocol.h" -#import "UIKitCategories.h" #include "Framework.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm index cdf9f806ed..e702719917 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm @@ -4,7 +4,6 @@ #import "MWMSearchCommonCell.h" #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" -#import "UIKitCategories.h" #include "indexer/mercator.hpp" #include "platform/measurement_utils.hpp" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableView.mm index 974d5dc3df..24e924b1c2 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableView.mm @@ -1,5 +1,4 @@ #import "MWMSearchTableView.h" -#import "UIKitCategories.h" @interface MWMSearchTableView () diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm index 40c5136672..c681513cc2 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm @@ -7,7 +7,6 @@ #import "MWMSearchTableView.h" #import "MWMSearchTableViewController.h" #import "ToastView.h" -#import "UIKitCategories.h" #include "std/vector.hpp" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.mm index ae4e09cbbd..26eaffd713 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.mm @@ -1,6 +1,5 @@ #import "MWMMapViewControlsCommon.h" #import "MWMSideMenuButton.h" -#import "UIKitCategories.h" @interface MWMSideMenuButton() diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuDownloadBadge.m b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuDownloadBadge.m index 1f6453424e..c743337b5f 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuDownloadBadge.m +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuDownloadBadge.m @@ -1,6 +1,5 @@ #import "MWMMapViewControlsCommon.h" #import "MWMSideMenuDownloadBadge.h" -#import "UIKitCategories.h" @interface MWMSideMenuDownloadBadge () diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h index 087e6cc4d6..5210affcf0 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h @@ -1,7 +1,5 @@ #import "MWMSideMenuDelegate.h" #import "MWMSideMenuDownloadBadge.h" -#import "UIKitCategories.h" -#import @interface MWMSideMenuView : SolidTouchView diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm index 152c7c3816..6277e7f580 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm @@ -1,7 +1,6 @@ #import "MWMMapViewControlsCommon.h" #import "MWMSideMenuDownloadBadge.h" #import "MWMSideMenuView.h" -#import "UIKitCategories.h" @interface MWMSideMenuView() diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m index 3cb0347f71..ffc2ae164a 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m @@ -1,6 +1,5 @@ #import "MWMZoomButtonsView.h" #import "MWMMapViewControlsCommon.h" -#import "UIKitCategories.h" static CGFloat const kZoomViewOffsetToTopBound = 12.0; static CGFloat const kZoomViewOffsetToBottomBound = 40.0; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index f56e391a8a..a9ca8b2aa5 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -9,7 +9,6 @@ #import "MWMRouteHelperPanelsDrawer.h" #import "MWMRoutePreview.h" #import "MWMTextToSpeech.h" -#import "UIKitCategories.h" @interface MWMNavigationDashboardManager () diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm index 225cb5a8ae..ea74ae0710 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm @@ -2,7 +2,6 @@ #import "MWMNavigationDashboard.h" #import "MWMNavigationDashboardEntity.h" #import "TimeUtils.h" -#import "UIKitCategories.h" #import "UIColor+MapsMeColor.h" @interface MWMImageView : UIImageView diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMLanesPanel.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMLanesPanel.mm index e35f06cd97..885df9d153 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMLanesPanel.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMLanesPanel.mm @@ -1,5 +1,4 @@ #import "MWMLanesPanel.h" -#import "UIKitCategories.h" #import "UIColor+MapsMeColor.h" static CGFloat const kOffset = 16.; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm index dc04cbd6c8..42bc4e4333 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm @@ -1,6 +1,5 @@ #import "Common.h" #import "MWMNavigationView.h" -#import "UIKitCategories.h" static CGFloat const kStatusbarHeight = 20.0; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNextTurnPanel.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNextTurnPanel.mm index 7bebc6c92c..014b797cae 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNextTurnPanel.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNextTurnPanel.mm @@ -1,5 +1,4 @@ #import "MWMNextTurnPanel.h" -#import "UIKitCategories.h" @interface MWMNextTurnPanel () diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanel.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanel.mm index cc770c22c4..b0b991ebcb 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanel.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanel.mm @@ -1,6 +1,5 @@ #import "Common.h" #import "MWMRouteHelperPanel.h" -#import "UIKitCategories.h" static CGFloat const kHeight = 40.; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanelsDrawer.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanelsDrawer.mm index cdd3d88492..aa94b0408a 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanelsDrawer.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanelsDrawer.mm @@ -1,7 +1,6 @@ #import "MWMLanesPanel.h" #import "MWMNextTurnPanel.h" #import "MWMRouteHelperPanelsDrawer.h" -#import "UIKitCategories.h" #import "UIColor+MapsMeColor.h" static CGFloat const kOffsetBetweenPanels = 8.; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm index 8be795b728..2395a530e3 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm @@ -4,7 +4,6 @@ #import "MWMRoutePreview.h" #import "TimeUtils.h" #import "UIColor+MapsMeColor.h" -#import "UIKitCategories.h" @interface MWMRoutePreview () diff --git a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m index ddc150dba6..85475b78d9 100644 --- a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m +++ b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m @@ -1,7 +1,6 @@ #import "MWMDownloadMapRequest.h" #import "MWMSearchDownloadMapRequest.h" #import "MWMSearchDownloadMapRequestView.h" -#import "UIKitCategories.h" @interface MWMSearchDownloadMapRequest () diff --git a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.h b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.h index 93c4a6cab7..b85aaeeee8 100644 --- a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.h +++ b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.h @@ -1,4 +1,3 @@ -#import "UIKitCategories.h" NS_ENUM(NSUInteger, MWMSearchDownloadMapRequestViewState) { diff --git a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.mm b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.mm index 8b6255a5ef..1ee638f74e 100644 --- a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.mm +++ b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.mm @@ -1,7 +1,6 @@ #import "Common.h" #import "MWMSearchDownloadMapRequest.h" #import "MWMSearchDownloadMapRequestView.h" -#import "UIKitCategories.h" @interface MWMSearchDownloadMapRequestView () diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index f52fd06313..58a94c6765 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -3,8 +3,6 @@ #import "Common.h" #import "EAGLView.h" -#import "../Categories/UIKitCategories.h" - #include "Framework.h" #ifndef USE_DRAPE diff --git a/iphone/Maps/Classes/LocalNotificationManager.mm b/iphone/Maps/Classes/LocalNotificationManager.mm index ce6dad1f80..e98e4c0b4b 100644 --- a/iphone/Maps/Classes/LocalNotificationManager.mm +++ b/iphone/Maps/Classes/LocalNotificationManager.mm @@ -6,7 +6,6 @@ #import "MapViewController.h" #import "Statistics.h" #import "TimeUtils.h" -#import "UIKitCategories.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/MWMBasePlacePageView.mm b/iphone/Maps/Classes/MWMBasePlacePageView.mm index 62df917e5c..1df0795d6e 100644 --- a/iphone/Maps/Classes/MWMBasePlacePageView.mm +++ b/iphone/Maps/Classes/MWMBasePlacePageView.mm @@ -1,5 +1,4 @@ #import "MWMBasePlacePageView.h" -#import "UIKitCategories.h" #import "MWMPlacePageInfoCell.h" #import "MWMPlacePageBookmarkCell.h" #import "MWMPlacePageEntity.h" diff --git a/iphone/Maps/Classes/MWMBookmarkColorCell.mm b/iphone/Maps/Classes/MWMBookmarkColorCell.mm index 0e967f9ee2..41d0f4fdad 100644 --- a/iphone/Maps/Classes/MWMBookmarkColorCell.mm +++ b/iphone/Maps/Classes/MWMBookmarkColorCell.mm @@ -1,5 +1,4 @@ #import "MWMBookmarkColorCell.h" -#import "UIKitCategories.h" extern NSArray * const kBookmarkColorsVariant; diff --git a/iphone/Maps/Classes/MWMBookmarkColorViewController.mm b/iphone/Maps/Classes/MWMBookmarkColorViewController.mm index c7b7bac5e7..6166d1ed6d 100644 --- a/iphone/Maps/Classes/MWMBookmarkColorViewController.mm +++ b/iphone/Maps/Classes/MWMBookmarkColorViewController.mm @@ -1,5 +1,4 @@ #import "MWMBookmarkColorViewController.h" -#import "UIKitCategories.h" #import "MWMBookmarkColorCell.h" #import "MWMPlacePageEntity.h" #import "MWMPlacePageViewManager.h" diff --git a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm index 99de8fd88e..c6eee185e5 100644 --- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm +++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm @@ -3,7 +3,6 @@ #import "MWMPlacePageViewManager.h" #import "MWMPlacePage.h" #import "MWMPlacePageEntity.h" -#import "UIKitCategories.h" #import "UIViewController+Navigation.h" static NSString * const kBookmarkDescriptionViewControllerNibName = @"MWMBookmarkDescriptionViewController"; diff --git a/iphone/Maps/Classes/MWMDirectionView.mm b/iphone/Maps/Classes/MWMDirectionView.mm index d27f219b12..64cafde4fa 100644 --- a/iphone/Maps/Classes/MWMDirectionView.mm +++ b/iphone/Maps/Classes/MWMDirectionView.mm @@ -1,7 +1,6 @@ #import "MWMDirectionView.h" #import "MWMPlacePageViewManager.h" #import "UIFont+MapsMeFonts.h" -#import "UIKitCategories.h" static NSString * const kDirectionViewNibName = @"MWMDirectionView"; static CGFloat const kDirectionArrowSide = IPAD ? 260. : 160.; diff --git a/iphone/Maps/Classes/MWMPlacePage.mm b/iphone/Maps/Classes/MWMPlacePage.mm index 3a71b185c8..92cb16495e 100644 --- a/iphone/Maps/Classes/MWMPlacePage.mm +++ b/iphone/Maps/Classes/MWMPlacePage.mm @@ -6,7 +6,6 @@ #import "MWMDirectionView.h" #import "MWMBookmarkColorViewController.h" #import "SelectSetVC.h" -#import "UIKitCategories.h" #import "MWMBookmarkDescriptionViewController.h" #import "../../3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/MWMPlacePageActionBar.mm b/iphone/Maps/Classes/MWMPlacePageActionBar.mm index 9128deddf5..8f5add3055 100644 --- a/iphone/Maps/Classes/MWMPlacePageActionBar.mm +++ b/iphone/Maps/Classes/MWMPlacePageActionBar.mm @@ -4,7 +4,6 @@ #import "MWMPlacePageActionBar.h" #import "MWMPlacePageEntity.h" #import "MWMPlacePageViewManager.h" -#import "UIKitCategories.h" #include "Framework.h" diff --git a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm index 68e1eae09c..bfce691780 100644 --- a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm +++ b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm @@ -1,6 +1,5 @@ #import "MWMPlacePageBookmarkCell.h" #import "MWMPlacePageEntity.h" -#import "UIKitCategories.h" #import "MWMPlacePage.h" #import "MWMPlacePageViewManager.h" #import "MWMBasePlacePageView.h" diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm index 2a06e671e1..7281387cf1 100644 --- a/iphone/Maps/Classes/MWMPlacePageEntity.mm +++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm @@ -1,8 +1,6 @@ #import "MWMPlacePageEntity.h" -#import "UIKitCategories.h" #import "MWMPlacePageViewManager.h" #import "MapViewController.h" -#import "UIKitCategories.h" #include "platform/measurement_utils.hpp" extern NSArray * const kBookmarkColorsVariant = @[@"placemark-red", @"placemark-yellow", @"placemark-blue", @"placemark-green", @"placemark-purple", @"placemark-orange", @"placemark-brown", @"placemark-pink"]; diff --git a/iphone/Maps/Classes/MWMPlacePageInfoCell.mm b/iphone/Maps/Classes/MWMPlacePageInfoCell.mm index 5cf2b6cc44..b0b407753e 100644 --- a/iphone/Maps/Classes/MWMPlacePageInfoCell.mm +++ b/iphone/Maps/Classes/MWMPlacePageInfoCell.mm @@ -1,7 +1,6 @@ #import "MWMPlacePageEntity.h" #import "MWMPlacePageInfoCell.h" #import "UIFont+MapsMeFonts.h" -#import "UIKitCategories.h" #include "platform/settings.hpp" #include "platform/measurement_utils.hpp" diff --git a/iphone/Maps/Classes/MWMPlacePageNavigationBar.mm b/iphone/Maps/Classes/MWMPlacePageNavigationBar.mm index 5fc4ae1403..f43f5acf1c 100644 --- a/iphone/Maps/Classes/MWMPlacePageNavigationBar.mm +++ b/iphone/Maps/Classes/MWMPlacePageNavigationBar.mm @@ -3,7 +3,6 @@ #import "MWMiPhonePortraitPlacePage.h" #import "MWMPlacePageViewManager.h" #import "MWMBasePlacePageView.h" -#import "UIKitCategories.h" #import "MWMPlacePageEntity.h" #import diff --git a/iphone/Maps/Classes/MWMPlacePageTypeDescription.mm b/iphone/Maps/Classes/MWMPlacePageTypeDescription.mm index 583c6dd2f1..3a6274e4ff 100644 --- a/iphone/Maps/Classes/MWMPlacePageTypeDescription.mm +++ b/iphone/Maps/Classes/MWMPlacePageTypeDescription.mm @@ -1,5 +1,4 @@ #import "MWMPlacePageTypeDescription.h" -#import "UIKitCategories.h" static NSString * const kPlacePageDescriptionViewNibName = @"MWMPlacePageDescriptionView"; diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.mm b/iphone/Maps/Classes/MWMPlacePageViewManager.mm index 5b41623f14..bc2bdeed2b 100644 --- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm +++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm @@ -14,7 +14,6 @@ #import "MWMPlacePageNavigationBar.h" #import "MWMPlacePageViewManager.h" #import "MWMPlacePageViewManagerDelegate.h" -#import "UIKitCategories.h" #include "Framework.h" diff --git a/iphone/Maps/Classes/MWMSpringAnimation.mm b/iphone/Maps/Classes/MWMSpringAnimation.mm index ff75777263..6de6d599f8 100644 --- a/iphone/Maps/Classes/MWMSpringAnimation.mm +++ b/iphone/Maps/Classes/MWMSpringAnimation.mm @@ -1,5 +1,4 @@ #import "MWMSpringAnimation.h" -#import "UIKitCategories.h" @interface MWMSpringAnimation () diff --git a/iphone/Maps/Classes/MWMiPadPlacePage.mm b/iphone/Maps/Classes/MWMiPadPlacePage.mm index 1b099c6b26..7accbfca37 100644 --- a/iphone/Maps/Classes/MWMiPadPlacePage.mm +++ b/iphone/Maps/Classes/MWMiPadPlacePage.mm @@ -2,7 +2,6 @@ #import "MWMiPadPlacePage.h" #import "MWMPlacePageViewManager.h" #import "MWMPlacePageActionBar.h" -#import "UIKitCategories.h" #import "MWMBasePlacePageView.h" #import "MWMBookmarkColorViewController.h" #import "SelectSetVC.h" diff --git a/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm b/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm index baddeca9d6..4bfa21ebba 100644 --- a/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm +++ b/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm @@ -3,7 +3,6 @@ #import "MWMBasePlacePageView.h" #import "MWMPlacePageActionBar.h" #import "MWMPlacePageViewManager.h" -#import "UIKitCategories.h" #import "MWMSpringAnimation.h" #import "MWMPlacePage+Animation.h" diff --git a/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm b/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm index d03a71916e..76dcbf6601 100644 --- a/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm +++ b/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm @@ -1,7 +1,6 @@ #import "Common.h" #import "MWMiPhonePortraitPlacePage.h" #import "MWMSpringAnimation.h" -#import "UIKitCategories.h" #import "MWMPlacePageActionBar.h" #import "MWMPlacePageNavigationBar.h" #import "MWMPlacePageViewManager.h" diff --git a/iphone/Maps/Classes/MapCell.mm b/iphone/Maps/Classes/MapCell.mm index 6877c2c6ab..b0361743c3 100644 --- a/iphone/Maps/Classes/MapCell.mm +++ b/iphone/Maps/Classes/MapCell.mm @@ -1,6 +1,5 @@ #import "Common.h" #import "MapCell.h" -#import "UIKitCategories.h" #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index b8b7ed730a..6b187425b5 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -7,7 +7,6 @@ #import "MWMMapViewControlsManager.h" #import "RouteState.h" #import "UIFont+MapsMeFonts.h" -#import "UIKitCategories.h" #import "UIViewController+Navigation.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 4783a622fd..eb6c148c88 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -9,7 +9,6 @@ #import "Preferences.h" #import "RouteState.h" #import "Statistics.h" -#import "UIKitCategories.h" #import #import #import diff --git a/iphone/Maps/Classes/ProgressView.m b/iphone/Maps/Classes/ProgressView.m index a00a5d0aec..45b289d2c9 100644 --- a/iphone/Maps/Classes/ProgressView.m +++ b/iphone/Maps/Classes/ProgressView.m @@ -1,6 +1,5 @@ #import "ProgressView.h" -#import "UIKitCategories.h" @interface ProgressView () diff --git a/iphone/Maps/Classes/ToastView.m b/iphone/Maps/Classes/ToastView.m index 70745307b2..f3f673eb0f 100644 --- a/iphone/Maps/Classes/ToastView.m +++ b/iphone/Maps/Classes/ToastView.m @@ -1,6 +1,5 @@ #import "ToastView.h" -#import "UIKitCategories.h" @interface ToastView () diff --git a/iphone/Maps/Classes/UIViewController+Navigation.mm b/iphone/Maps/Classes/UIViewController+Navigation.mm index 0945836629..4b45884a2c 100644 --- a/iphone/Maps/Classes/UIViewController+Navigation.mm +++ b/iphone/Maps/Classes/UIViewController+Navigation.mm @@ -1,5 +1,4 @@ #import "Common.h" -#import "UIKitCategories.h" #import "UIViewController+Navigation.h" @implementation UIViewController (Navigation) diff --git a/iphone/Maps/CommunityVC.m b/iphone/Maps/CommunityVC.m index 0592e66124..51a50a4bca 100644 --- a/iphone/Maps/CommunityVC.m +++ b/iphone/Maps/CommunityVC.m @@ -1,7 +1,6 @@ #import "CommunityVC.h" #import "UIViewController+Navigation.h" -#import "UIKitCategories.h" #import #import "../../3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/DownloaderParentVC.h b/iphone/Maps/DownloaderParentVC.h index 98673ce5fe..2b3a7084b4 100644 --- a/iphone/Maps/DownloaderParentVC.h +++ b/iphone/Maps/DownloaderParentVC.h @@ -2,7 +2,6 @@ #import #import "MapsObservers.h" #import "MapCell.h" -#import "UIKitCategories.h" #import "ViewController.h" #include "storage/storage_defines.hpp" diff --git a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist index 291980ef2a..b52c2afed9 100644 --- a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist @@ -19,6 +19,17 @@ + + + + diff --git a/iphone/Maps/Maps_Prefix.pch b/iphone/Maps/Maps_Prefix.pch index c9059d6ac0..d85fa5cfa1 100644 --- a/iphone/Maps/Maps_Prefix.pch +++ b/iphone/Maps/Maps_Prefix.pch @@ -6,4 +6,7 @@ #import #import #import + #import + + #import "UIKitCategories.h" #endif diff --git a/iphone/Maps/Settings/SettingsViewController.mm b/iphone/Maps/Settings/SettingsViewController.mm index 79bef8a4c1..b1fc9da54c 100644 --- a/iphone/Maps/Settings/SettingsViewController.mm +++ b/iphone/Maps/Settings/SettingsViewController.mm @@ -4,7 +4,6 @@ #import "SelectableCell.h" #import "LinkCell.h" #import "WebViewController.h" -#import "UIKitCategories.h" #import "MapViewController.h" #import "MapsAppDelegate.h" #import "Framework.h" diff --git a/iphone/Maps/SettingsAndMoreVC.mm b/iphone/Maps/SettingsAndMoreVC.mm index 4344f9a451..ce1d39bcb1 100644 --- a/iphone/Maps/SettingsAndMoreVC.mm +++ b/iphone/Maps/SettingsAndMoreVC.mm @@ -1,6 +1,5 @@ #import "SettingsAndMoreVC.h" -#import "UIKitCategories.h" #import #import #import "SettingsViewController.h" diff --git a/iphone/Maps/UIButton+RuntimeAttributes.m b/iphone/Maps/UIButton+RuntimeAttributes.m index 6273fbee83..734f19ca57 100644 --- a/iphone/Maps/UIButton+RuntimeAttributes.m +++ b/iphone/Maps/UIButton+RuntimeAttributes.m @@ -2,7 +2,6 @@ #import "UIButton+RuntimeAttributes.h" #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" -#import "UIKitCategories.h" @implementation UIButton (RuntimeAttributes) diff --git a/iphone/Maps/UILabel+RuntimeAttributes.mm b/iphone/Maps/UILabel+RuntimeAttributes.mm index 6378169c79..1a64845dd0 100644 --- a/iphone/Maps/UILabel+RuntimeAttributes.mm +++ b/iphone/Maps/UILabel+RuntimeAttributes.mm @@ -1,5 +1,4 @@ #import "UILabel+RuntimeAttributes.h" -#import "UIKitCategories.h" #import "UIFont+MapsMeFonts.h" #import "UIColor+MapsMeColor.h"