diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2018-04-11 18:15:15 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2018-04-11 20:26:02 -0700 |
| commit | 9b869c51ad6cd7d722112e163736c839952cdb5e (patch) | |
| tree | 080dfea03baa5551a212124db1ca24896d734870 /platform/darwin/src/MGLStyleValue_Private.h | |
| parent | ad803d77cb6bdc831b91ba39a5326148d1405891 (diff) | |
| download | qtlocation-mapboxgl-9b869c51ad6cd7d722112e163736c839952cdb5e.tar.gz | |
[ios, macos] Renamed expression initializer to be more Swiftian
Diffstat (limited to 'platform/darwin/src/MGLStyleValue_Private.h')
| -rw-r--r-- | platform/darwin/src/MGLStyleValue_Private.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h index 5124c29a90..cc63793d0d 100644 --- a/platform/darwin/src/MGLStyleValue_Private.h +++ b/platform/darwin/src/MGLStyleValue_Private.h @@ -58,7 +58,7 @@ public: if (mbglValue.isUndefined()) { return nil; } - return [NSExpression mgl_expressionWithJSONObject:MGLJSONObjectFromMBGLExpression(mbglValue.getExpression())]; + return [NSExpression expressionWithMGLJSONObject:MGLJSONObjectFromMBGLExpression(mbglValue.getExpression())]; } /** @@ -333,15 +333,15 @@ private: // Private utilities for converting from mbgl to mgl values } NSExpression *operator()(const mbgl::style::CameraFunction<MBGLType> &mbglValue) const { - return [NSExpression mgl_expressionWithJSONObject:MGLJSONObjectFromMBGLExpression(mbglValue.getExpression())]; + return [NSExpression expressionWithMGLJSONObject:MGLJSONObjectFromMBGLExpression(mbglValue.getExpression())]; } NSExpression *operator()(const mbgl::style::SourceFunction<MBGLType> &mbglValue) const { - return [NSExpression mgl_expressionWithJSONObject:MGLJSONObjectFromMBGLExpression(mbglValue.getExpression())]; + return [NSExpression expressionWithMGLJSONObject:MGLJSONObjectFromMBGLExpression(mbglValue.getExpression())]; } NSExpression *operator()(const mbgl::style::CompositeFunction<MBGLType> &mbglValue) const { - return [NSExpression mgl_expressionWithJSONObject:MGLJSONObjectFromMBGLExpression(mbglValue.getExpression())]; + return [NSExpression expressionWithMGLJSONObject:MGLJSONObjectFromMBGLExpression(mbglValue.getExpression())]; } }; }; |