summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJesse Bounds <jesse@rebounds.net>2016-11-22 11:30:15 -0800
committerJesse Bounds <jesse@rebounds.net>2016-11-22 19:53:54 -0800
commitd6d16c189a3ab9ec531c1b51f6c318312f7f3c1a (patch)
tree8378e02570cd06230d7069d0426693e96a644b2b /platform
parent13e0f9e527366dce43f59055fde17818f443e356 (diff)
downloadqtlocation-mapboxgl-d6d16c189a3ab9ec531c1b51f6c318312f7f3c1a.tar.gz
[ios, macos] Remove unused `MGLGeometryAdditions` category stub
This fixes an issue where the documentation for all NSValue categories were described as `MGLGeometryAdditions`.
Diffstat (limited to 'platform')
-rw-r--r--platform/darwin/src/MGLBackgroundStyleLayer.mm1
-rw-r--r--platform/darwin/src/MGLCircleStyleLayer.mm11
-rw-r--r--platform/darwin/src/MGLFillStyleLayer.mm6
-rw-r--r--platform/darwin/src/MGLGeometry.h7
-rw-r--r--platform/darwin/src/MGLLineStyleLayer.mm16
-rw-r--r--platform/darwin/src/MGLRasterStyleLayer.mm1
-rw-r--r--platform/darwin/src/MGLStyleLayer.mm.ejs11
-rw-r--r--platform/darwin/src/MGLSymbolStyleLayer.mm51
8 files changed, 18 insertions, 86 deletions
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm
index 386c6322eb..883a6d139c 100644
--- a/platform/darwin/src/MGLBackgroundStyleLayer.mm
+++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm
@@ -10,7 +10,6 @@
#include <mbgl/style/layers/background_layer.hpp>
-
@interface MGLBackgroundStyleLayer ()
@property (nonatomic) mbgl::style::BackgroundLayer *rawLayer;
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm
index 4e5f2c7fdf..16f27991f8 100644
--- a/platform/darwin/src/MGLCircleStyleLayer.mm
+++ b/platform/darwin/src/MGLCircleStyleLayer.mm
@@ -9,7 +9,6 @@
#import "MGLCircleStyleLayer.h"
#include <mbgl/style/layers/circle_layer.hpp>
-
namespace mbgl {
MBGL_DEFINE_ENUM(MGLCircleTranslateAnchor, {
@@ -141,10 +140,7 @@ namespace mbgl {
}
- (void)setCircleTranslateAnchor:(MGLStyleValue<NSValue *> *)circleTranslateAnchor {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType,
- NSValue *,
- mbgl::style::TranslateAnchorType,
- MGLCircleTranslateAnchor>().toEnumPropertyValue(circleTranslateAnchor);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLCircleTranslateAnchor>().toEnumPropertyValue(circleTranslateAnchor);
_rawLayer->setCircleTranslateAnchor(mbglValue);
}
@@ -154,10 +150,7 @@ namespace mbgl {
}
- (void)setCirclePitchScale:(MGLStyleValue<NSValue *> *)circlePitchScale {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::CirclePitchScaleType,
- NSValue *,
- mbgl::style::CirclePitchScaleType,
- MGLCirclePitchScale>().toEnumPropertyValue(circlePitchScale);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::CirclePitchScaleType, NSValue *, mbgl::style::CirclePitchScaleType, MGLCirclePitchScale>().toEnumPropertyValue(circlePitchScale);
_rawLayer->setCirclePitchScale(mbglValue);
}
diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
index 24c8a90f7f..3a3b443849 100644
--- a/platform/darwin/src/MGLFillStyleLayer.mm
+++ b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -9,7 +9,6 @@
#import "MGLFillStyleLayer.h"
#include <mbgl/style/layers/fill_layer.hpp>
-
namespace mbgl {
MBGL_DEFINE_ENUM(MGLFillTranslateAnchor, {
@@ -136,10 +135,7 @@ namespace mbgl {
}
- (void)setFillTranslateAnchor:(MGLStyleValue<NSValue *> *)fillTranslateAnchor {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType,
- NSValue *,
- mbgl::style::TranslateAnchorType,
- MGLFillTranslateAnchor>().toEnumPropertyValue(fillTranslateAnchor);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLFillTranslateAnchor>().toEnumPropertyValue(fillTranslateAnchor);
_rawLayer->setFillTranslateAnchor(mbglValue);
}
diff --git a/platform/darwin/src/MGLGeometry.h b/platform/darwin/src/MGLGeometry.h
index 5fc927697b..e2a4d818b9 100644
--- a/platform/darwin/src/MGLGeometry.h
+++ b/platform/darwin/src/MGLGeometry.h
@@ -117,11 +117,4 @@ NS_INLINE CLLocationDegrees MGLDegreesFromRadians(CGFloat radians) {
return radians * 180 / M_PI;
}
-/**
- Methods for round-tripping Mapbox geometry structure values.
- */
-@interface NSValue (MGLGeometryAdditions)
-
-@end
-
NS_ASSUME_NONNULL_END
diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm
index 93e3106032..e367290416 100644
--- a/platform/darwin/src/MGLLineStyleLayer.mm
+++ b/platform/darwin/src/MGLLineStyleLayer.mm
@@ -9,7 +9,6 @@
#import "MGLLineStyleLayer.h"
#include <mbgl/style/layers/line_layer.hpp>
-
namespace mbgl {
MBGL_DEFINE_ENUM(MGLLineCap, {
@@ -98,10 +97,7 @@ namespace mbgl {
#pragma mark - Accessing the Layout Attributes
- (void)setLineCap:(MGLStyleValue<NSValue *> *)lineCap {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::LineCapType,
- NSValue *,
- mbgl::style::LineCapType,
- MGLLineCap>().toEnumPropertyValue(lineCap);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::LineCapType, NSValue *, mbgl::style::LineCapType, MGLLineCap>().toEnumPropertyValue(lineCap);
_rawLayer->setLineCap(mbglValue);
}
@@ -111,10 +107,7 @@ namespace mbgl {
}
- (void)setLineJoin:(MGLStyleValue<NSValue *> *)lineJoin {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::LineJoinType,
- NSValue *,
- mbgl::style::LineJoinType,
- MGLLineJoin>().toEnumPropertyValue(lineJoin);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::LineJoinType, NSValue *, mbgl::style::LineJoinType, MGLLineJoin>().toEnumPropertyValue(lineJoin);
_rawLayer->setLineJoin(mbglValue);
}
@@ -176,10 +169,7 @@ namespace mbgl {
}
- (void)setLineTranslateAnchor:(MGLStyleValue<NSValue *> *)lineTranslateAnchor {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType,
- NSValue *,
- mbgl::style::TranslateAnchorType,
- MGLLineTranslateAnchor>().toEnumPropertyValue(lineTranslateAnchor);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLLineTranslateAnchor>().toEnumPropertyValue(lineTranslateAnchor);
_rawLayer->setLineTranslateAnchor(mbglValue);
}
diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm
index c6283d89ea..b832b0ad29 100644
--- a/platform/darwin/src/MGLRasterStyleLayer.mm
+++ b/platform/darwin/src/MGLRasterStyleLayer.mm
@@ -10,7 +10,6 @@
#include <mbgl/style/layers/raster_layer.hpp>
-
@interface MGLRasterStyleLayer ()
@property (nonatomic) mbgl::style::RasterLayer *rawLayer;
diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs
index 894375e764..f8b8305616 100644
--- a/platform/darwin/src/MGLStyleLayer.mm.ejs
+++ b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -15,7 +15,6 @@
#import "MGL<%- camelize(type) %>StyleLayer.h"
#include <mbgl/style/layers/<%- type %>_layer.hpp>
-
<% if (containsEnumerationProperties) { -%>
namespace mbgl {
@@ -131,10 +130,7 @@ namespace mbgl {
<% for (const property of layoutProperties) { -%>
- (void)set<%- camelize(property.name) %>:(MGLStyleValue<<%- propertyType(property, true) %>> *)<%- objCName(property) %> {
<% if (property.type == "enum") { -%>
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::<%- mbglType(property) %>,
- NSValue *,
- mbgl::style::<%- mbglType(property) %>,
- MGL<%- camelize(property.name) %>>().toEnumPropertyValue(<%- objCName(property) %>);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::<%- mbglType(property) %>, NSValue *, mbgl::style::<%- mbglType(property) %>, MGL<%- camelize(property.name) %>>().toEnumPropertyValue(<%- objCName(property) %>);
_rawLayer->set<%- camelize(property.name) %>(mbglValue);
<% } else { -%>
auto mbglValue = MGLStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue(<%- objCName(property) %>);
@@ -159,10 +155,7 @@ namespace mbgl {
<% for (const property of paintProperties) { -%>
- (void)set<%- camelize(property.name) %>:(MGLStyleValue<<%- propertyType(property, true) %>> *)<%- objCName(property) %> {
<% if (property.type == "enum") { -%>
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::<%- mbglType(property) %>,
- NSValue *,
- mbgl::style::<%- mbglType(property) %>,
- MGL<%- camelize(property.name) %>>().toEnumPropertyValue(<%- objCName(property) %>);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::<%- mbglType(property) %>, NSValue *, mbgl::style::<%- mbglType(property) %>, MGL<%- camelize(property.name) %>>().toEnumPropertyValue(<%- objCName(property) %>);
_rawLayer->set<%- camelize(property.name) %>(mbglValue);
<% } else { -%>
auto mbglValue = MGLStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue(<%- objCName(property) %>);
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm
index 636849e87a..9ba1bd7bc2 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.mm
+++ b/platform/darwin/src/MGLSymbolStyleLayer.mm
@@ -9,7 +9,6 @@
#import "MGLSymbolStyleLayer.h"
#include <mbgl/style/layers/symbol_layer.hpp>
-
namespace mbgl {
MBGL_DEFINE_ENUM(MGLSymbolPlacement, {
@@ -145,10 +144,7 @@ namespace mbgl {
#pragma mark - Accessing the Layout Attributes
- (void)setSymbolPlacement:(MGLStyleValue<NSValue *> *)symbolPlacement {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::SymbolPlacementType,
- NSValue *,
- mbgl::style::SymbolPlacementType,
- MGLSymbolPlacement>().toEnumPropertyValue(symbolPlacement);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::SymbolPlacementType, NSValue *, mbgl::style::SymbolPlacementType, MGLSymbolPlacement>().toEnumPropertyValue(symbolPlacement);
_rawLayer->setSymbolPlacement(mbglValue);
}
@@ -208,10 +204,7 @@ namespace mbgl {
}
- (void)setIconRotationAlignment:(MGLStyleValue<NSValue *> *)iconRotationAlignment {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType,
- NSValue *,
- mbgl::style::AlignmentType,
- MGLIconRotationAlignment>().toEnumPropertyValue(iconRotationAlignment);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType, NSValue *, mbgl::style::AlignmentType, MGLIconRotationAlignment>().toEnumPropertyValue(iconRotationAlignment);
_rawLayer->setIconRotationAlignment(mbglValue);
}
@@ -231,10 +224,7 @@ namespace mbgl {
}
- (void)setIconTextFit:(MGLStyleValue<NSValue *> *)iconTextFit {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::IconTextFitType,
- NSValue *,
- mbgl::style::IconTextFitType,
- MGLIconTextFit>().toEnumPropertyValue(iconTextFit);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::IconTextFitType, NSValue *, mbgl::style::IconTextFitType, MGLIconTextFit>().toEnumPropertyValue(iconTextFit);
_rawLayer->setIconTextFit(mbglValue);
}
@@ -304,10 +294,7 @@ namespace mbgl {
}
- (void)setTextPitchAlignment:(MGLStyleValue<NSValue *> *)textPitchAlignment {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType,
- NSValue *,
- mbgl::style::AlignmentType,
- MGLTextPitchAlignment>().toEnumPropertyValue(textPitchAlignment);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType, NSValue *, mbgl::style::AlignmentType, MGLTextPitchAlignment>().toEnumPropertyValue(textPitchAlignment);
_rawLayer->setTextPitchAlignment(mbglValue);
}
@@ -317,10 +304,7 @@ namespace mbgl {
}
- (void)setTextRotationAlignment:(MGLStyleValue<NSValue *> *)textRotationAlignment {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType,
- NSValue *,
- mbgl::style::AlignmentType,
- MGLTextRotationAlignment>().toEnumPropertyValue(textRotationAlignment);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType, NSValue *, mbgl::style::AlignmentType, MGLTextRotationAlignment>().toEnumPropertyValue(textRotationAlignment);
_rawLayer->setTextRotationAlignment(mbglValue);
}
@@ -390,10 +374,7 @@ namespace mbgl {
}
- (void)setTextJustify:(MGLStyleValue<NSValue *> *)textJustify {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::TextJustifyType,
- NSValue *,
- mbgl::style::TextJustifyType,
- MGLTextJustify>().toEnumPropertyValue(textJustify);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::TextJustifyType, NSValue *, mbgl::style::TextJustifyType, MGLTextJustify>().toEnumPropertyValue(textJustify);
_rawLayer->setTextJustify(mbglValue);
}
@@ -403,10 +384,7 @@ namespace mbgl {
}
- (void)setTextAnchor:(MGLStyleValue<NSValue *> *)textAnchor {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::TextAnchorType,
- NSValue *,
- mbgl::style::TextAnchorType,
- MGLTextAnchor>().toEnumPropertyValue(textAnchor);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::TextAnchorType, NSValue *, mbgl::style::TextAnchorType, MGLTextAnchor>().toEnumPropertyValue(textAnchor);
_rawLayer->setTextAnchor(mbglValue);
}
@@ -456,10 +434,7 @@ namespace mbgl {
}
- (void)setTextTransform:(MGLStyleValue<NSValue *> *)textTransform {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::TextTransformType,
- NSValue *,
- mbgl::style::TextTransformType,
- MGLTextTransform>().toEnumPropertyValue(textTransform);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::TextTransformType, NSValue *, mbgl::style::TextTransformType, MGLTextTransform>().toEnumPropertyValue(textTransform);
_rawLayer->setTextTransform(mbglValue);
}
@@ -571,10 +546,7 @@ namespace mbgl {
}
- (void)setIconTranslateAnchor:(MGLStyleValue<NSValue *> *)iconTranslateAnchor {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType,
- NSValue *,
- mbgl::style::TranslateAnchorType,
- MGLIconTranslateAnchor>().toEnumPropertyValue(iconTranslateAnchor);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLIconTranslateAnchor>().toEnumPropertyValue(iconTranslateAnchor);
_rawLayer->setIconTranslateAnchor(mbglValue);
}
@@ -644,10 +616,7 @@ namespace mbgl {
}
- (void)setTextTranslateAnchor:(MGLStyleValue<NSValue *> *)textTranslateAnchor {
- auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType,
- NSValue *,
- mbgl::style::TranslateAnchorType,
- MGLTextTranslateAnchor>().toEnumPropertyValue(textTranslateAnchor);
+ auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLTextTranslateAnchor>().toEnumPropertyValue(textTranslateAnchor);
_rawLayer->setTextTranslateAnchor(mbglValue);
}