summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-08-18 15:57:10 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-08-19 15:45:17 -0700
commit98c6987af4bca8815c9dbafb7da83c0e7c0a7a5f (patch)
treebb08f6473d8dad79d4c78eb5bfd815171a928ede
parentabc825e19b554afe68784866e708d0d458ab72e6 (diff)
downloadqtlocation-mapboxgl-98c6987af4bca8815c9dbafb7da83c0e7c0a7a5f.tar.gz
[ios, macos] Removed unused code
-rw-r--r--platform/darwin/src/MGLStyleAttributeFunction.h2
-rw-r--r--platform/darwin/src/MGLStyleAttributeValue_Private.h1
-rw-r--r--platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm8
-rw-r--r--platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h3
4 files changed, 0 insertions, 14 deletions
diff --git a/platform/darwin/src/MGLStyleAttributeFunction.h b/platform/darwin/src/MGLStyleAttributeFunction.h
index 71e15a3213..e636c1addd 100644
--- a/platform/darwin/src/MGLStyleAttributeFunction.h
+++ b/platform/darwin/src/MGLStyleAttributeFunction.h
@@ -10,8 +10,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) NS_DICTIONARY_OF(NSNumber *, id) *stops;
-@property (nonatomic, copy, nullable) NSString *property;
-
@property (nonatomic, copy, nullable) NSNumber *base;
@end
diff --git a/platform/darwin/src/MGLStyleAttributeValue_Private.h b/platform/darwin/src/MGLStyleAttributeValue_Private.h
index 3051f663d7..4b8fd1cc01 100644
--- a/platform/darwin/src/MGLStyleAttributeValue_Private.h
+++ b/platform/darwin/src/MGLStyleAttributeValue_Private.h
@@ -17,7 +17,6 @@
- (mbgl::style::PropertyValue<std::array<float, 4>>)mbgl_paddingPropertyValue;
- (mbgl::style::PropertyValue<std::vector<std::string> >)mbgl_stringArrayPropertyValue;
- (mbgl::style::PropertyValue<std::vector<float> >)mbgl_numberArrayPropertyValue;
-- (mbgl::style::PropertyValue<uint8_t>)mbgl_enumPropertyValue;
// Convert mbgl types to darwin types
- (id <MGLStyleAttributeValue>)mbgl_colorPropertyValueWith:(mbgl::style::PropertyValue<mbgl::Color>)color;
diff --git a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
index 79038a66fd..83266e7db5 100644
--- a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
+++ b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
@@ -37,14 +37,6 @@
return NO;
}
-- (mbgl::style::PropertyValue<uint8_t>)mbgl_enumPropertyValue
-{
- NSAssert(strcmp(self.objCType, @encode(uint8_t)) == 0, @"Value does not represent a uint8_t");
- uint8_t value = 0;
- [self getValue:&value];
- return mbgl::style::PropertyValue<uint8_t> { value };
-}
-
- (mbgl::style::PropertyValue<std::array<float, 2>>)mbgl_offsetPropertyValue
{
return { self.mgl_offsetArrayValue };
diff --git a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h
index 578e0ad9c0..28a9b10908 100644
--- a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h
+++ b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h
@@ -9,9 +9,6 @@
+ (instancetype)mgl_valueWithOffsetArray:(std::array<float, 2>)offsetArray;
+ (instancetype)mgl_valueWithPaddingArray:(std::array<float, 4>)paddingArray;
-- (mbgl::style::PropertyValue<uint8_t>)mbgl_enumPropertyValue;
-- (mbgl::style::PropertyValue<std::array<float, 2>>)mbgl_offsetPropertyValue;
-
- (std::array<float, 2>)mgl_offsetArrayValue;
- (std::array<float, 4>)mgl_paddingArrayValue;