From 80d0420ea64b13a93891c805baf7072ecd329876 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 12 Apr 2017 12:08:36 -0700 Subject: [darwin] Remove use of NS_DESIGNATED_INITIALIZER from MGLStyleLayer subclasses It produces compiler warnings for which there seems to be no workaround, and since there's only a single initializer, NS_DESIGNATED_INITIALIZER has little benefit. --- platform/darwin/src/MGLBackgroundStyleLayer.h | 2 +- platform/darwin/src/MGLCircleStyleLayer.h | 2 +- platform/darwin/src/MGLFillStyleLayer.h | 2 +- platform/darwin/src/MGLLineStyleLayer.h | 2 +- platform/darwin/src/MGLRasterStyleLayer.h | 2 +- platform/darwin/src/MGLStyleLayer.h.ejs | 4 ++-- platform/darwin/src/MGLSymbolStyleLayer.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.h b/platform/darwin/src/MGLBackgroundStyleLayer.h index d4de2e2ac7..659903914c 100644 --- a/platform/darwin/src/MGLBackgroundStyleLayer.h +++ b/platform/darwin/src/MGLBackgroundStyleLayer.h @@ -34,7 +34,7 @@ style using the `-[MGLStyle addLayer:]` or @param identifier A string that uniquely identifies the source in the style to which it is added. */ -- (instancetype)initWithIdentifier:(NSString *)identifier NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier; #pragma mark - Accessing the Paint Attributes diff --git a/platform/darwin/src/MGLCircleStyleLayer.h b/platform/darwin/src/MGLCircleStyleLayer.h index efa18795a7..789ff7a258 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.h +++ b/platform/darwin/src/MGLCircleStyleLayer.h @@ -92,7 +92,7 @@ MGL_EXPORT has not yet been added to the current style, the behavior is undefined. @return An initialized foreground style layer. */ -- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source; #pragma mark - Accessing the Paint Attributes diff --git a/platform/darwin/src/MGLFillStyleLayer.h b/platform/darwin/src/MGLFillStyleLayer.h index 89f84185dc..6e3297bdec 100644 --- a/platform/darwin/src/MGLFillStyleLayer.h +++ b/platform/darwin/src/MGLFillStyleLayer.h @@ -65,7 +65,7 @@ MGL_EXPORT has not yet been added to the current style, the behavior is undefined. @return An initialized foreground style layer. */ -- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source; #pragma mark - Accessing the Paint Attributes diff --git a/platform/darwin/src/MGLLineStyleLayer.h b/platform/darwin/src/MGLLineStyleLayer.h index 4259c8fdb1..38513652c5 100644 --- a/platform/darwin/src/MGLLineStyleLayer.h +++ b/platform/darwin/src/MGLLineStyleLayer.h @@ -120,7 +120,7 @@ MGL_EXPORT has not yet been added to the current style, the behavior is undefined. @return An initialized foreground style layer. */ -- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source; #pragma mark - Accessing the Layout Attributes diff --git a/platform/darwin/src/MGLRasterStyleLayer.h b/platform/darwin/src/MGLRasterStyleLayer.h index f1ccf257a2..53a6a98b8a 100644 --- a/platform/darwin/src/MGLRasterStyleLayer.h +++ b/platform/darwin/src/MGLRasterStyleLayer.h @@ -49,7 +49,7 @@ MGL_EXPORT has not yet been added to the current style, the behavior is undefined. @return An initialized foreground style layer. */ -- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source; #pragma mark - Accessing the Paint Attributes diff --git a/platform/darwin/src/MGLStyleLayer.h.ejs b/platform/darwin/src/MGLStyleLayer.h.ejs index a91cde672e..e29ea4611d 100644 --- a/platform/darwin/src/MGLStyleLayer.h.ejs +++ b/platform/darwin/src/MGLStyleLayer.h.ejs @@ -94,7 +94,7 @@ style using the `-[MGLStyle addLayer:]` or @param identifier A string that uniquely identifies the source in the style to which it is added. */ -- (instancetype)initWithIdentifier:(NSString *)identifier NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier; <% } else { -%> /** @@ -110,7 +110,7 @@ which it is added. has not yet been added to the current style, the behavior is undefined. @return An initialized foreground style layer. */ -- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source; <% } -%> <% if (layoutProperties.length) { -%> diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h index deaed64817..b6c6372324 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.h +++ b/platform/darwin/src/MGLSymbolStyleLayer.h @@ -293,7 +293,7 @@ MGL_EXPORT has not yet been added to the current style, the behavior is undefined. @return An initialized foreground style layer. */ -- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source; #pragma mark - Accessing the Layout Attributes -- cgit v1.2.1