diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-09-25 12:37:45 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-10-17 11:47:22 -0700 |
| commit | 9652028915af6602626939e0b0075333c34bfbfe (patch) | |
| tree | 0b299507c1339dcb1f947a496dcd375095f9bc4b /platform/ios/src | |
| parent | 0c8a3feffa94a9594bcaa77fdc18d11a3c482ff5 (diff) | |
| download | qtlocation-mapboxgl-9652028915af6602626939e0b0075333c34bfbfe.tar.gz | |
[ios, macos] Expand changes to entire API
Diffstat (limited to 'platform/ios/src')
| -rw-r--r-- | platform/ios/src/Mapbox.h | 8 | ||||
| -rw-r--r-- | platform/ios/src/UIColor+MGLAdditions.mm | 3 | ||||
| -rw-r--r-- | platform/ios/src/UIColor+MGLStyleAttributeAdditions.h | 7 | ||||
| -rw-r--r-- | platform/ios/src/UIColor+MGLStyleAttributeAdditions.mm | 14 |
4 files changed, 1 insertions, 31 deletions
diff --git a/platform/ios/src/Mapbox.h b/platform/ios/src/Mapbox.h index a187737023..04892eb6a1 100644 --- a/platform/ios/src/Mapbox.h +++ b/platform/ios/src/Mapbox.h @@ -50,11 +50,5 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; #import "MGLUserLocation.h" #import "MGLUserLocationAnnotationView.h" #import "NSValue+MGLAdditions.h" -#import "MGLStyleAttributeValue.h" -#import "MGLStyleAttributeFunction.h" -#import "UIColor+MGLStyleAttributeAdditions.h" -#import "NSNumber+MGLStyleAttributeAdditions.h" -#import "NSValue+MGLStyleAttributeAdditions.h" -#import "NSString+MGLStyleAttributeAdditions.h" -#import "NSArray+MGLStyleAttributeAdditions.h" +#import "MGLStyleValue.h" #import "MGLTileSet.h" diff --git a/platform/ios/src/UIColor+MGLAdditions.mm b/platform/ios/src/UIColor+MGLAdditions.mm index 5a4b4b49f3..52ec84ac84 100644 --- a/platform/ios/src/UIColor+MGLAdditions.mm +++ b/platform/ios/src/UIColor+MGLAdditions.mm @@ -1,8 +1,5 @@ #import "UIColor+MGLAdditions.h" -#import "MGLStyleAttributeValue.h" -#import "MGLStyleAttributeValue_Private.h" - @implementation UIColor (MGLAdditions) - (mbgl::Color)mbgl_color diff --git a/platform/ios/src/UIColor+MGLStyleAttributeAdditions.h b/platform/ios/src/UIColor+MGLStyleAttributeAdditions.h deleted file mode 100644 index 3637ceab6c..0000000000 --- a/platform/ios/src/UIColor+MGLStyleAttributeAdditions.h +++ /dev/null @@ -1,7 +0,0 @@ -#import <UIKit/UIKit.h> - -#import "MGLStyleAttributeValue.h" - -@interface UIColor (MGLStyleAttributeAdditions) <MGLStyleAttributeValue> - -@end diff --git a/platform/ios/src/UIColor+MGLStyleAttributeAdditions.mm b/platform/ios/src/UIColor+MGLStyleAttributeAdditions.mm deleted file mode 100644 index 5a9ac3afe9..0000000000 --- a/platform/ios/src/UIColor+MGLStyleAttributeAdditions.mm +++ /dev/null @@ -1,14 +0,0 @@ -#import "UIColor+MGLStyleAttributeAdditions.h" - -#import "MGLStyleAttributeValue.h" -#import "MGLStyleAttributeValue_Private.h" -#import "UIColor+MGLAdditions.h" - -@implementation UIColor (MGLStyleAttributeAdditions) - -- (BOOL)isFunction -{ - return NO; -} - -@end |