diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2015-05-17 00:11:45 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-05-18 11:55:54 -0700 |
| commit | 245823e47444ee52f26fdfadf49afc5959567f53 (patch) | |
| tree | 55b3066a744cde0b8d38ede81cd203ff04c8cf75 | |
| parent | 2c7d0567fa7a2b342b16a5ecea5290aee32aaa77 (diff) | |
| download | qtlocation-mapboxgl-245823e47444ee52f26fdfadf49afc5959567f53.tar.gz | |
Removed “private” header
Instead of exposing these methods in a private header that winds up triggering warnings publicly, just redeclare the methods in a category. Since this is a test app, we’ll catch any issues that arise from refactoring simply by testing.
Fixes #1579.
| -rw-r--r-- | include/mbgl/ios/private/MGLMapView_Private.h | 14 | ||||
| -rw-r--r-- | ios/benchmark/MBXBenchViewController.mm | 13 | ||||
| -rw-r--r-- | ios/benchmark/fo/benchmark-ios.gypi | 1 |
3 files changed, 12 insertions, 16 deletions
diff --git a/include/mbgl/ios/private/MGLMapView_Private.h b/include/mbgl/ios/private/MGLMapView_Private.h deleted file mode 100644 index 18c07ef1bb..0000000000 --- a/include/mbgl/ios/private/MGLMapView_Private.h +++ /dev/null @@ -1,14 +0,0 @@ -#import <UIKit/UIKit.h> - -@interface MGLMapView () - -#pragma mark - Debugging - -/** Triggers another render pass even when it is not necessary. */ -- (void)invalidate; - -/** Returns whether the map view is currently loading or processing any assets required to render the map */ -- (BOOL)isFullyLoaded; - -@end - diff --git a/ios/benchmark/MBXBenchViewController.mm b/ios/benchmark/MBXBenchViewController.mm index 1876a0c546..6e1c6d325c 100644 --- a/ios/benchmark/MBXBenchViewController.mm +++ b/ios/benchmark/MBXBenchViewController.mm @@ -1,12 +1,23 @@ #import "MBXBenchViewController.h" #import <mbgl/ios/MGLMapView.h> -#import <mbgl/ios/private/MGLMapView_Private.h> #include "locations.hpp" #include <chrono> +@interface MGLMapView (MBXBenchmarkAdditions) + +#pragma mark - Debugging + +/** Triggers another render pass even when it is not necessary. */ +- (void)invalidate; + +/** Returns whether the map view is currently loading or processing any assets required to render the map */ +- (BOOL)isFullyLoaded; + +@end + @interface MBXBenchViewController () <MGLMapViewDelegate> @property (nonatomic) MGLMapView *mapView; diff --git a/ios/benchmark/fo/benchmark-ios.gypi b/ios/benchmark/fo/benchmark-ios.gypi index ff004add53..0a3440d5cd 100644 --- a/ios/benchmark/fo/benchmark-ios.gypi +++ b/ios/benchmark/fo/benchmark-ios.gypi @@ -26,7 +26,6 @@ 'sources': [ './main.m', - '../../include/mbgl/ios/MGLMapView_private.h', './MBXBenchAppDelegate.h', './MBXBenchAppDelegate.m', './MBXBenchViewController.h', |