From 6df50761e1d90a3ae4796a6fff6922b37e2905c5 Mon Sep 17 00:00:00 2001 From: "v.mikhaylenko" Date: Thu, 17 Sep 2015 11:59:17 +0300 Subject: [PATCH] [ios] Fixed project compilation on XCode7. --- .../CustomAlert/AlertController/MWMAlertViewController.h | 2 +- .../CustomAlert/AlertController/MWMAlertViewController.mm | 2 +- .../CustomViews/CircularProgress/MWMCircularProgress.m | 2 +- .../CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm | 2 +- .../Search/DownloadView/MWMSearchDownloadViewController.mm | 2 +- .../CustomViews/MapViewControls/Search/MWMSearchManager.h | 4 ++-- .../Search/TableView/MWMSearchTableViewController.h | 2 +- .../SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m | 2 +- iphone/Maps/Classes/Share/MWMActivityViewController.m | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h index 5ede2d6381..602caab3dd 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h @@ -8,7 +8,7 @@ typedef void (^CloseAlertCompletion)(); @interface MWMAlertViewController : UIViewController -@property (nonnull, weak, nonatomic, readonly) UIViewController * ownerViewController; +@property (weak, nonatomic, readonly) UIViewController * ownerViewController; - (nonnull instancetype)initWithViewController:(nonnull UIViewController *)viewController; - (void)presentAlert:(routing::IRouter::ResultCode)type; diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index 9be4f94a44..9d869b4c30 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -7,7 +7,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController @interface MWMAlertViewController () -@property (nonnull ,weak, nonatomic, readwrite) UIViewController * ownerViewController; +@property (weak, nonatomic, readwrite) UIViewController * ownerViewController; @end diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m index ff8ae36c05..fc038f9f23 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m @@ -9,7 +9,7 @@ @property (nonatomic) NSNumber * nextProgressToAnimate; -@property (nonnull, weak, nonatomic) id delegate; +@property (weak, nonatomic) id delegate; @end diff --git a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm index 39cc474248..a053505a9d 100644 --- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm +++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm @@ -22,7 +22,7 @@ @property (copy, nonatomic) NSString * mapSize; @property (copy, nonatomic) NSString * mapAndRouteSize; -@property (nonnull, weak, nonatomic) id delegate; +@property (weak, nonatomic) id delegate; @property (nonatomic) storage::TIndex currentCountryIndex; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm index da63f3fc51..e8babbc3a4 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm @@ -9,7 +9,7 @@ @property (nonatomic) MWMDownloadMapRequest * downloadRequest; @property (nonatomic) IBOutlet UIButton * dimButton; -@property (nonnull, weak, nonatomic) id delegate; +@property (weak, nonatomic) id delegate; @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h index 2ab148cf6d..9e24680222 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h @@ -19,8 +19,8 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerState) @interface MWMSearchManager : NSObject -@property (nonnull, weak, nonatomic) id delegate; -@property (nonnull, weak, nonatomic) IBOutlet MWMSearchTextField * searchTextField; +@property (weak, nonatomic) id delegate; +@property (weak, nonatomic) IBOutlet MWMSearchTextField * searchTextField; @property (nonatomic) MWMSearchManagerState state; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h index 5311e1dabd..91c978cd22 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h @@ -4,7 +4,7 @@ @protocol MWMSearchTableViewProtocol -@property (nonnull, weak, nonatomic) MWMSearchTextField * searchTextField; +@property (weak, nonatomic) MWMSearchTextField * searchTextField; @property (nonatomic) MWMSearchManagerState state; diff --git a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m index d5e638e348..ddc150dba6 100644 --- a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m +++ b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m @@ -11,7 +11,7 @@ @property (nonatomic) MWMDownloadMapRequest * downloadRequest; @property (strong, nonatomic) IBOutlet UIButton * dimButton; -@property (nonnull, weak, nonatomic) id delegate; +@property (weak, nonatomic) id delegate; @end diff --git a/iphone/Maps/Classes/Share/MWMActivityViewController.m b/iphone/Maps/Classes/Share/MWMActivityViewController.m index fa7ae00e1c..ccdb8f026a 100644 --- a/iphone/Maps/Classes/Share/MWMActivityViewController.m +++ b/iphone/Maps/Classes/Share/MWMActivityViewController.m @@ -66,7 +66,7 @@ return YES; } -- (NSUInteger)supportedInterfaceOrientations +- (UIInterfaceOrientationMask)supportedInterfaceOrientations { return UIInterfaceOrientationMaskAll; }