diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-06-20 08:39:31 +0300 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-08-13 13:32:56 +0300 |
commit | 603c02ccc21543473074787aaad7c89d282dddc9 (patch) | |
tree | a14685995821275c8fe258b794fa783aa31f6c61 /platform/darwin/src/MGLSymbolStyleLayer.mm | |
parent | 0ff218d688084146fee178ce52c17f346fa67198 (diff) | |
download | qtlocation-mapboxgl-603c02ccc21543473074787aaad7c89d282dddc9.tar.gz |
[darwin] Generate plural version of property name, yet, keep singular version of an enum
Diffstat (limited to 'platform/darwin/src/MGLSymbolStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.mm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm index e60da45a38..e89b9c3e88 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.mm +++ b/platform/darwin/src/MGLSymbolStyleLayer.mm @@ -96,9 +96,9 @@ namespace mbgl { { MGLTextTransformLowercase, "lowercase" }, }); - MBGL_DEFINE_ENUM(MGLTextWritingModes, { - { MGLTextWritingModesHorizontal, "horizontal" }, - { MGLTextWritingModesVertical, "vertical" }, + MBGL_DEFINE_ENUM(MGLTextWritingMode, { + { MGLTextWritingModeHorizontal, "horizontal" }, + { MGLTextWritingModeVertical, "vertical" }, }); MBGL_DEFINE_ENUM(MGLIconTranslationAnchor, { @@ -1032,7 +1032,7 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting textWritingModes: %@", textWritingModes); - auto mbglValue = MGLStyleValueTransformer<std::vector<mbgl::style::TextWritingModeType>, NSArray<NSValue *> *, mbgl::style::TextWritingModeType, MGLTextWritingModes>().toPropertyValue<mbgl::style::PropertyValue<std::vector<mbgl::style::TextWritingModeType>>>(textWritingModes, false); + auto mbglValue = MGLStyleValueTransformer<std::vector<mbgl::style::TextWritingModeType>, NSArray<NSValue *> *, mbgl::style::TextWritingModeType, MGLTextWritingMode>().toPropertyValue<mbgl::style::PropertyValue<std::vector<mbgl::style::TextWritingModeType>>>(textWritingModes, false); self.rawLayer->setTextWritingMode(mbglValue); } @@ -1043,7 +1043,7 @@ namespace mbgl { if (propertyValue.isUndefined()) { propertyValue = self.rawLayer->getDefaultTextWritingMode(); } - return MGLStyleValueTransformer<std::vector<mbgl::style::TextWritingModeType>, NSArray<NSValue *> *, mbgl::style::TextWritingModeType, MGLTextWritingModes>().toExpression(propertyValue); + return MGLStyleValueTransformer<std::vector<mbgl::style::TextWritingModeType>, NSArray<NSValue *> *, mbgl::style::TextWritingModeType, MGLTextWritingMode>().toExpression(propertyValue); } - (void)setTextWritingMode:(NSExpression *)textWritingMode { @@ -1629,12 +1629,12 @@ namespace mbgl { return textTransform; } -+ (NSValue *)valueWithMGLTextWritingModes:(MGLTextWritingModes)textWritingModes { - return [NSValue value:&textWritingModes withObjCType:@encode(MGLTextWritingModes)]; ++ (NSValue *)valueWithMGLTextWritingMode:(MGLTextWritingMode)textWritingModes { + return [NSValue value:&textWritingModes withObjCType:@encode(MGLTextWritingMode)]; } -- (MGLTextWritingModes)MGLTextWritingModesValue { - MGLTextWritingModes textWritingModes; +- (MGLTextWritingMode)MGLTextWritingModeValue { + MGLTextWritingMode textWritingModes; [self getValue:&textWritingModes]; return textWritingModes; } |