summaryrefslogtreecommitdiff
path: root/platform/darwin/src
diff options
context:
space:
mode:
Diffstat (limited to 'platform/darwin/src')
-rw-r--r--platform/darwin/src/MGLBackgroundStyleLayer.mm2
-rw-r--r--platform/darwin/src/MGLCircleStyleLayer.mm2
-rw-r--r--platform/darwin/src/MGLFillStyleLayer.mm2
-rw-r--r--platform/darwin/src/MGLLineStyleLayer.mm2
-rw-r--r--platform/darwin/src/MGLRasterStyleLayer.mm2
-rw-r--r--platform/darwin/src/MGLStyleLayer.h2
-rw-r--r--platform/darwin/src/MGLStyleLayer.mm4
-rw-r--r--platform/darwin/src/MGLStyleLayer.mm.ejs2
-rw-r--r--platform/darwin/src/MGLSymbolStyleLayer.mm2
9 files changed, 11 insertions, 9 deletions
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm
index 84218aefe7..73d0011d87 100644
--- a/platform/darwin/src/MGLBackgroundStyleLayer.mm
+++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm
@@ -85,7 +85,7 @@
#pragma mark - Accessing the Paint Attributes
-- (NSArray *)transitionKeys
++ (NSArray *)transitionKeys
{
NSMutableArray *transitionKeys = [NSMutableArray array];
[transitionKeys addObject:@"backgroundColor"];
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm
index f8e469a1ed..0fa9ec4f78 100644
--- a/platform/darwin/src/MGLCircleStyleLayer.mm
+++ b/platform/darwin/src/MGLCircleStyleLayer.mm
@@ -135,7 +135,7 @@ namespace mbgl {
#pragma mark - Accessing the Paint Attributes
-- (NSArray *)transitionKeys
++ (NSArray *)transitionKeys
{
NSMutableArray *transitionKeys = [NSMutableArray array];
[transitionKeys addObject:@"circleBlur"];
diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
index 64d1792160..3e84f36f7c 100644
--- a/platform/darwin/src/MGLFillStyleLayer.mm
+++ b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -130,7 +130,7 @@ namespace mbgl {
#pragma mark - Accessing the Paint Attributes
-- (NSArray *)transitionKeys
++ (NSArray *)transitionKeys
{
NSMutableArray *transitionKeys = [NSMutableArray array];
[transitionKeys addObject:@"fillAntialiased"];
diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm
index 52259a1bff..6c022b5fa3 100644
--- a/platform/darwin/src/MGLLineStyleLayer.mm
+++ b/platform/darwin/src/MGLLineStyleLayer.mm
@@ -212,7 +212,7 @@ namespace mbgl {
#pragma mark - Accessing the Paint Attributes
-- (NSArray *)transitionKeys
++ (NSArray *)transitionKeys
{
NSMutableArray *transitionKeys = [NSMutableArray array];
[transitionKeys addObject:@"lineBlur"];
diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm
index 6c5102d83c..b16a5561f7 100644
--- a/platform/darwin/src/MGLRasterStyleLayer.mm
+++ b/platform/darwin/src/MGLRasterStyleLayer.mm
@@ -92,7 +92,7 @@
#pragma mark - Accessing the Paint Attributes
-- (NSArray *)transitionKeys
++ (NSArray *)transitionKeys
{
NSMutableArray *transitionKeys = [NSMutableArray array];
[transitionKeys addObject:@"maximumRasterBrightness"];
diff --git a/platform/darwin/src/MGLStyleLayer.h b/platform/darwin/src/MGLStyleLayer.h
index 2f1a777455..b1cdd78002 100644
--- a/platform/darwin/src/MGLStyleLayer.h
+++ b/platform/darwin/src/MGLStyleLayer.h
@@ -78,7 +78,7 @@ MGL_EXPORT
/**
Returns an array of strings that identify transition keys attached to the layer.
*/
-- (NSArray *)transitionKeys;
++ (NSArray *)transitionKeys;
@end
diff --git a/platform/darwin/src/MGLStyleLayer.mm b/platform/darwin/src/MGLStyleLayer.mm
index d307270799..87f6c18f33 100644
--- a/platform/darwin/src/MGLStyleLayer.mm
+++ b/platform/darwin/src/MGLStyleLayer.mm
@@ -109,9 +109,11 @@
return propertyTransitionSelector;
}
-- (NSArray *)transitionKeys
++ (NSArray *)transitionKeys
{
// This is overridden by subclasses
+ [NSException raise:@"MGLAbstractClassException"
+ format:@"MGLStyleLayer is an abstract class"];
return nil;
}
diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs
index 274a62ac10..50194785ae 100644
--- a/platform/darwin/src/MGLStyleLayer.mm.ejs
+++ b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -230,7 +230,7 @@ namespace mbgl {
<% if (paintProperties.length) { -%>
#pragma mark - Accessing the Paint Attributes
-- (NSArray *)transitionKeys
++ (NSArray *)transitionKeys
{
NSMutableArray *transitionKeys = [NSMutableArray array];
<% for (const property of paintProperties) { -%>
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm
index 7b4ce2422f..c4259ba6be 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.mm
+++ b/platform/darwin/src/MGLSymbolStyleLayer.mm
@@ -888,7 +888,7 @@ namespace mbgl {
#pragma mark - Accessing the Paint Attributes
-- (NSArray *)transitionKeys
++ (NSArray *)transitionKeys
{
NSMutableArray *transitionKeys = [NSMutableArray array];
[transitionKeys addObject:@"iconColor"];