diff options
| author | Jesse Bounds <jesse@rebounds.net> | 2016-10-17 21:29:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 21:29:04 -0700 |
| commit | 87885008a670739addcc633202c93fc0b7d28684 (patch) | |
| tree | 01ebf29dedd1ec1e900a3e7c25029aa2fec9e163 | |
| parent | d10c1714d56096873372e257edbed1c1e95fb5ae (diff) | |
| download | qtlocation-mapboxgl-87885008a670739addcc633202c93fc0b7d28684.tar.gz | |
[ios, macos] Use swift_name for MGLMultiPoint and subclasses (#6727)
Decorate the class factory methods so that when they are translated to
swift the method to create an MGLMultiPoint is not ambiguous with the
methods to create MGLPolygon and MGLPolyline.
| -rw-r--r-- | platform/darwin/src/MGLMultiPoint.h | 2 | ||||
| -rw-r--r-- | platform/darwin/src/MGLPolygon.h | 2 | ||||
| -rw-r--r-- | platform/darwin/src/MGLPolyline.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLMultiPoint.h b/platform/darwin/src/MGLMultiPoint.h index b33d68f867..b936205ab2 100644 --- a/platform/darwin/src/MGLMultiPoint.h +++ b/platform/darwin/src/MGLMultiPoint.h @@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN @param count The number of items in the `coords` array. @return A new multipoint object. */ -+ (instancetype)multiPointWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count; ++ (instancetype)multiPointWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count NS_SWIFT_NAME(multiPoint(coordinates:count:)); /** The array of coordinates associated with the shape. diff --git a/platform/darwin/src/MGLPolygon.h b/platform/darwin/src/MGLPolygon.h index 3d5b36abb6..6d53356ba4 100644 --- a/platform/darwin/src/MGLPolygon.h +++ b/platform/darwin/src/MGLPolygon.h @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @param count The number of items in the `coords` array. @return A new polygon object. */ -+ (instancetype)polygonWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count; ++ (instancetype)polygonWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count NS_SWIFT_NAME(polygon(coordinates:count:)); /** Creates and returns an `MGLPolygon` object from the specified set of diff --git a/platform/darwin/src/MGLPolyline.h b/platform/darwin/src/MGLPolyline.h index 78d9649751..6642afef7e 100644 --- a/platform/darwin/src/MGLPolyline.h +++ b/platform/darwin/src/MGLPolyline.h @@ -25,8 +25,7 @@ NS_ASSUME_NONNULL_BEGIN @param count The number of items in the `coords` array. @return A new polyline object. */ -+ (instancetype)polylineWithCoordinates:(CLLocationCoordinate2D *)coords - count:(NSUInteger)count; ++ (instancetype)polylineWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count NS_SWIFT_NAME(polyline(coordinates:count:)); @end |