diff options
author | Jordan Kiley <jmkiley@users.noreply.github.com> | 2018-02-16 16:20:08 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-16 16:20:08 -0800 |
commit | 9459cf6a91f98266f77960a8cf328cb9c0ec3034 (patch) | |
tree | 2f367251cd4440585e760a1ee48260eb8dc80ad8 /platform/ios/src | |
parent | 604931247e8c78570058981ea17c034947c4430f (diff) | |
download | qtlocation-mapboxgl-9459cf6a91f98266f77960a8cf328cb9c0ec3034.tar.gz |
[ios, macos] Mark deprecated methods as unavailable (#11205)
Fixes #10735
Diffstat (limited to 'platform/ios/src')
-rw-r--r-- | platform/ios/src/MGLMapView.h | 26 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 45 |
2 files changed, 8 insertions, 63 deletions
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h index 3c5aa2c122..a4dcc4cdbf 100644 --- a/platform/ios/src/MGLMapView.h +++ b/platform/ios/src/MGLMapView.h @@ -189,13 +189,7 @@ MGL_EXPORT IB_DESIGNABLE */ @property (nonatomic, readonly, nullable) MGLStyle *style; -/** - URLs of the styles bundled with the library. - - @deprecated Call the relevant class method of `MGLStyle` for the URL of a - particular default style. - */ -@property (nonatomic, readonly) NS_ARRAY_OF(NSURL *) *bundledStyleURLs __attribute__((deprecated("Call the relevant class method of MGLStyle for the URL of a particular default style."))); +@property (nonatomic, readonly) NS_ARRAY_OF(NSURL *) *bundledStyleURLs __attribute__((unavailable("Call the relevant class method of MGLStyle for the URL of a particular default style."))); /** URL of the style currently displayed in the receiver. @@ -283,17 +277,13 @@ MGL_EXPORT IB_DESIGNABLE */ - (IBAction)showAttribution:(id)sender; -/// :nodoc: Support for style classes has been removed. This property always returns an empty array. -@property (nonatomic) NS_ARRAY_OF(NSString *) *styleClasses __attribute__((deprecated("This property is non-functional."))); +@property (nonatomic) NS_ARRAY_OF(NSString *) *styleClasses __attribute__((unavailable("This property is non-functional."))); -/// :nodoc: Support for style classes has been removed. This property always returns NO. -- (BOOL)hasStyleClass:(NSString *)styleClass __attribute__((deprecated("This method is non-functional."))); +- (BOOL)hasStyleClass:(NSString *)styleClass __attribute__((unavailable("This method is non-functional."))); -/// :nodoc: Support for style classes has been removed. This property is a no-op. -- (void)addStyleClass:(NSString *)styleClass __attribute__((deprecated("This method is non-functional."))); +- (void)addStyleClass:(NSString *)styleClass __attribute__((unavailable("This method is non-functional."))); -/// :nodoc: Support for style classes has been removed. This property is a no-op. -- (void)removeStyleClass:(NSString *)styleClass __attribute__((deprecated("This method is non-functional."))); +- (void)removeStyleClass:(NSString *)styleClass __attribute__((unavailable("This method is non-functional."))); #pragma mark Displaying the User’s Location @@ -1462,11 +1452,11 @@ MGL_EXPORT IB_DESIGNABLE */ @property (nonatomic) MGLMapDebugMaskOptions debugMask; -@property (nonatomic, getter=isDebugActive) BOOL debugActive __attribute__((deprecated("Use -debugMask and -setDebugMask:."))); +@property (nonatomic, getter=isDebugActive) BOOL debugActive __attribute__((unavailable("Use -debugMask and -setDebugMask:."))); -- (void)toggleDebug __attribute__((deprecated("Use -setDebugMask:."))); +- (void)toggleDebug __attribute__((unavailable("Use -setDebugMask:."))); -- (void)emptyMemoryCache __attribute__((deprecated)); +- (void)emptyMemoryCache __attribute__((unavailable)); @end diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 79b02bef31..72fa4613fc 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -2288,16 +2288,6 @@ public: MGLMapDebugCollisionBoxesMask) : 0; } -- (BOOL)isDebugActive -{ - return self.debugMask; -} - -- (void)toggleDebug -{ - self.debugActive = !self.debugActive; -} - - (void)resetNorth { [self resetNorthAnimated:YES]; @@ -2320,11 +2310,6 @@ public: heading:heading]; } -- (void)emptyMemoryCache -{ - _rendererFrontend->reduceMemoryUse(); -} - - (void)setZoomEnabled:(BOOL)zoomEnabled { _zoomEnabled = zoomEnabled; @@ -3519,36 +3504,6 @@ public: __PRETTY_FUNCTION__, styleID]; } -- (NS_ARRAY_OF(NSString *) *)styleClasses -{ - return [self.style styleClasses]; -} - -- (void)setStyleClasses:(NS_ARRAY_OF(NSString *) *)appliedClasses -{ - [self setStyleClasses:appliedClasses transitionDuration:0]; -} - -- (void)setStyleClasses:(NS_ARRAY_OF(NSString *) *)appliedClasses transitionDuration:(NSTimeInterval)transitionDuration -{ - [self.style setStyleClasses:appliedClasses transitionDuration:transitionDuration]; -} - -- (BOOL)hasStyleClass:(NSString *)styleClass -{ - return [self.style hasStyleClass:styleClass]; -} - -- (void)addStyleClass:(NSString *)styleClass -{ - [self.style addStyleClass:styleClass]; -} - -- (void)removeStyleClass:(NSString *)styleClass -{ - [self.style removeStyleClass:styleClass]; -} - #pragma mark - Annotations - - (nullable NS_ARRAY_OF(id <MGLAnnotation>) *)annotations |