Przeglądaj źródła

Mute iOS 8 deprecation warnings.

Our current deployment target is iOS 7, so we need to continue using these API (since their replacements are not yet available). However, some people may be using the library with an iOS 8 deployment target, and we don’t want to clutter their builds with warnings.
Ryan Olson 11 lat temu
rodzic
commit
e531190616

+ 6 - 0
Classes/Global State Explorers/FLEXFileBrowserTableViewController.m

@@ -23,7 +23,10 @@
 @property (nonatomic, strong) NSArray *searchPaths;
 @property (nonatomic, strong) NSArray *searchPaths;
 @property (nonatomic, strong) NSNumber *recursiveSize;
 @property (nonatomic, strong) NSNumber *recursiveSize;
 @property (nonatomic, strong) NSNumber *searchPathsSize;
 @property (nonatomic, strong) NSNumber *searchPathsSize;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 @property (nonatomic, strong) UISearchDisplayController *searchController;
 @property (nonatomic, strong) UISearchDisplayController *searchController;
+#pragma clang diagnostic pop
 @property (nonatomic) NSOperationQueue *operationQueue;
 @property (nonatomic) NSOperationQueue *operationQueue;
 @property (nonatomic, strong) UIDocumentInteractionController *documentController;
 @property (nonatomic, strong) UIDocumentInteractionController *documentController;
 @property (nonatomic, strong) id<FLEXFileBrowserFileOperationController> fileOperationController;
 @property (nonatomic, strong) id<FLEXFileBrowserFileOperationController> fileOperationController;
@@ -48,7 +51,10 @@
         //add search controller
         //add search controller
         UISearchBar *searchBar = [UISearchBar new];
         UISearchBar *searchBar = [UISearchBar new];
         [searchBar sizeToFit];
         [searchBar sizeToFit];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         self.searchController = [[UISearchDisplayController alloc] initWithSearchBar:searchBar contentsController:self];
         self.searchController = [[UISearchDisplayController alloc] initWithSearchBar:searchBar contentsController:self];
+#pragma clang diagnostic pop
         self.searchController.delegate = self;
         self.searchController.delegate = self;
         self.searchController.searchResultsDataSource = self;
         self.searchController.searchResultsDataSource = self;
         self.searchController.searchResultsDelegate = self;
         self.searchController.searchResultsDelegate = self;

+ 11 - 5
Classes/Global State Explorers/System Log/FLEXSystemLogTableViewController.m

@@ -14,7 +14,10 @@
 
 
 @interface FLEXSystemLogTableViewController () <UISearchDisplayDelegate>
 @interface FLEXSystemLogTableViewController () <UISearchDisplayDelegate>
 
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 @property (nonatomic, strong) UISearchDisplayController *searchController;
 @property (nonatomic, strong) UISearchDisplayController *searchController;
+#pragma clang diagnostic pop
 @property (nonatomic, copy) NSArray *logMessages;
 @property (nonatomic, copy) NSArray *logMessages;
 @property (nonatomic, copy) NSArray *filteredLogMessages;
 @property (nonatomic, copy) NSArray *filteredLogMessages;
 @property (nonatomic, strong) NSTimer *logUpdateTimer;
 @property (nonatomic, strong) NSTimer *logUpdateTimer;
@@ -34,7 +37,10 @@
 
 
     UISearchBar *searchBar = [[UISearchBar alloc] init];
     UISearchBar *searchBar = [[UISearchBar alloc] init];
     [searchBar sizeToFit];
     [searchBar sizeToFit];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     self.searchController = [[UISearchDisplayController alloc] initWithSearchBar:searchBar contentsController:self];
     self.searchController = [[UISearchDisplayController alloc] initWithSearchBar:searchBar contentsController:self];
+#pragma clang diagnostic pop
     self.searchController.delegate = self;
     self.searchController.delegate = self;
     self.searchController.searchResultsDataSource = self;
     self.searchController.searchResultsDataSource = self;
     self.searchController.searchResultsDelegate = self;
     self.searchController.searchResultsDelegate = self;
@@ -105,7 +111,7 @@
     NSInteger numberOfRows = 0;
     NSInteger numberOfRows = 0;
     if (tableView == self.tableView) {
     if (tableView == self.tableView) {
         numberOfRows = [self.logMessages count];
         numberOfRows = [self.logMessages count];
-    } else if (tableView == self.searchDisplayController.searchResultsTableView) {
+    } else if (tableView == self.searchController.searchResultsTableView) {
         numberOfRows = [self.filteredLogMessages count];
         numberOfRows = [self.filteredLogMessages count];
     }
     }
     return numberOfRows;
     return numberOfRows;
@@ -117,9 +123,9 @@
     if (tableView == self.tableView) {
     if (tableView == self.tableView) {
         cell.logMessage = [self.logMessages objectAtIndex:indexPath.row];
         cell.logMessage = [self.logMessages objectAtIndex:indexPath.row];
         cell.highlightedText = nil;
         cell.highlightedText = nil;
-    } else if (tableView == self.searchDisplayController.searchResultsTableView) {
+    } else if (tableView == self.searchController.searchResultsTableView) {
         cell.logMessage = [self.filteredLogMessages objectAtIndex:indexPath.row];
         cell.logMessage = [self.filteredLogMessages objectAtIndex:indexPath.row];
-        cell.highlightedText = self.searchDisplayController.searchBar.text;
+        cell.highlightedText = self.searchController.searchBar.text;
     }
     }
     if (indexPath.row % 2 == 0) {
     if (indexPath.row % 2 == 0) {
         cell.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1.0];
         cell.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1.0];
@@ -135,7 +141,7 @@
     FLEXSystemLogMessage *logMessage = nil;
     FLEXSystemLogMessage *logMessage = nil;
     if (tableView == self.tableView) {
     if (tableView == self.tableView) {
         logMessage = [self.logMessages objectAtIndex:indexPath.row];
         logMessage = [self.logMessages objectAtIndex:indexPath.row];
-    } else if (tableView == self.searchDisplayController.searchResultsTableView) {
+    } else if (tableView == self.searchController.searchResultsTableView) {
         logMessage = [self.filteredLogMessages objectAtIndex:indexPath.row];
         logMessage = [self.filteredLogMessages objectAtIndex:indexPath.row];
     }
     }
     return [FLEXSystemLogTableViewCell preferredHeightForLogMessage:logMessage inWidth:self.tableView.bounds.size.width];
     return [FLEXSystemLogTableViewCell preferredHeightForLogMessage:logMessage inWidth:self.tableView.bounds.size.width];
@@ -159,7 +165,7 @@
         FLEXSystemLogMessage *logMessage = nil;
         FLEXSystemLogMessage *logMessage = nil;
         if (tableView == self.tableView) {
         if (tableView == self.tableView) {
             logMessage = [self.logMessages objectAtIndex:indexPath.row];
             logMessage = [self.logMessages objectAtIndex:indexPath.row];
-        } else if (tableView == self.searchDisplayController.searchResultsTableView) {
+        } else if (tableView == self.searchController.searchResultsTableView) {
             logMessage = [self.filteredLogMessages objectAtIndex:indexPath.row];
             logMessage = [self.filteredLogMessages objectAtIndex:indexPath.row];
         }
         }
 
 

+ 3 - 0
Classes/Network/FLEXNetworkHistoryTableViewController.m

@@ -24,7 +24,10 @@
 
 
 @property (nonatomic, assign) BOOL rowInsertInProgress;
 @property (nonatomic, assign) BOOL rowInsertInProgress;
 
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 @property (nonatomic, strong) UISearchDisplayController *searchController;
 @property (nonatomic, strong) UISearchDisplayController *searchController;
+#pragma clang diagnostic pop
 
 
 @end
 @end
 
 

+ 3 - 0
Example/UICatalog/AAPLMasterViewController.m

@@ -74,7 +74,10 @@
 // "More" bar button item is correctly transferred to the destination detail view controller's navigation item. We are only concerned about
 // "More" bar button item is correctly transferred to the destination detail view controller's navigation item. We are only concerned about
 // this change when the application is in portrait mode since this is the only time that the "More" bar button item will be visible.
 // this change when the application is in portrait mode since this is the only time that the "More" bar button item will be visible.
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if (UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
     if (UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
+#pragma clang diagnostic pop
         UINavigationController *newDetailViewController = [segue destinationViewController];
         UINavigationController *newDetailViewController = [segue destinationViewController];
         UINavigationController *oldDetailViewController = [self.splitViewController.viewControllers lastObject];
         UINavigationController *oldDetailViewController = [self.splitViewController.viewControllers lastObject];