From a21c307121f366474ddeac5b861a59689ea9745c Mon Sep 17 00:00:00 2001 From: Aleksey Belousov Date: Thu, 3 Sep 2020 00:07:40 +0300 Subject: [PATCH] [iOS] remove unneeded SwiftBridge.h imports --- iphone/Maps/Bookmarks/BookmarksSection.mm | 2 ++ iphone/Maps/Bookmarks/InfoSection.mm | 1 - iphone/Maps/Classes/Components/MWMStopButton.m | 2 +- .../Classes/CustomViews/CircularProgress/MWMCircularProgress.m | 3 +-- .../NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm | 1 - iphone/Maps/Core/Location/MWMLocationHelpers.h | 3 +-- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/iphone/Maps/Bookmarks/BookmarksSection.mm b/iphone/Maps/Bookmarks/BookmarksSection.mm index b80ac91deb..cd10d9b3c3 100644 --- a/iphone/Maps/Bookmarks/BookmarksSection.mm +++ b/iphone/Maps/Bookmarks/BookmarksSection.mm @@ -1,7 +1,9 @@ #import "BookmarksSection.h" #import "legacy_bookmark_colors.h" #import "MWMLocationHelpers.h" +#import "MWMLocationManager.h" #import "MWMSearchManager.h" +#import "Statistics.h" #import diff --git a/iphone/Maps/Bookmarks/InfoSection.mm b/iphone/Maps/Bookmarks/InfoSection.mm index 9f777d506a..261d757a47 100644 --- a/iphone/Maps/Bookmarks/InfoSection.mm +++ b/iphone/Maps/Bookmarks/InfoSection.mm @@ -1,6 +1,5 @@ #import "InfoSection.h" #import "MWMCategoryInfoCell.h" -//#import "SwiftBridge.h" #include diff --git a/iphone/Maps/Classes/Components/MWMStopButton.m b/iphone/Maps/Classes/Components/MWMStopButton.m index 6ebb0ed6dd..9feb50ed6c 100644 --- a/iphone/Maps/Classes/Components/MWMStopButton.m +++ b/iphone/Maps/Classes/Components/MWMStopButton.m @@ -1,5 +1,5 @@ #import "MWMStopButton.h" -#import "SwiftBridge.h" + @implementation MWMStopButton @end diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m index 948d14c7b7..f6281ee063 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 "SwiftBridge.h" @interface MWMCircularProgressView () @@ -46,7 +45,7 @@ self = [super init]; if (self) { - [[[UINib alloc] init:[self class] bundle:nil] instantiateWithOwner:self options:nil]; + [[UINib nibWithNibName:NSStringFromClass([self class]) bundle:nil] instantiateWithOwner:self options:nil]; [parentView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; [parentView addSubview:self.rootView]; self.rootView.translatesAutoresizingMaskIntoConstraints = NO; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm index a368a26849..67f2438c55 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm @@ -6,7 +6,6 @@ #import "MWMRouter.h" #import "MWMTaxiPreviewDataSource.h" #import "Statistics.h" -#import "SwiftBridge.h" #import "UIButton+Orientation.h" #import "UIImageView+Coloring.h" diff --git a/iphone/Maps/Core/Location/MWMLocationHelpers.h b/iphone/Maps/Core/Location/MWMLocationHelpers.h index cd06e4fb99..9f41259c49 100644 --- a/iphone/Maps/Core/Location/MWMLocationHelpers.h +++ b/iphone/Maps/Core/Location/MWMLocationHelpers.h @@ -1,5 +1,4 @@ -#import "MWMLocationManager.h" -#import "SwiftBridge.h" +#import "MWMMyPositionMode.h" #include "platform/location.hpp" #include "platform/measurement_utils.hpp"