[ios, macos] Change runtime styling category method prefix to mgl_

This makes runtime styling category method naming consistent with the rest of the SDK.
mapbox · Oct 17, 2016 · 49ca625 · 49ca625
1 parent 4522360
commit 49ca625
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h
@@ -100,7 +100,7 @@ class MGLStyleValueTransformer {
     }
 
     MGLColor *toMGLRawStyleValue(const mbgl::Color mbglStopValue) {
-        return [MGLColor mbgl_colorWithColor:mbglStopValue];
+        return [MGLColor mgl_colorWithColor:mbglStopValue];
     }
 
     ObjCType toMGLRawStyleValue(const std::vector<MBGLElement> &mbglStopValue) {
@@ -142,7 +142,7 @@ class MGLStyleValueTransformer {
     }
 
     void getMBGLValue(MGLColor *rawValue, mbgl::Color &mbglValue) {
-        mbglValue = rawValue.mbgl_color;
+        mbglValue = rawValue.mgl_color;
     }
 
     void getMBGLValue(ObjCType rawValue, std::vector<MBGLElement> &mbglValue) {

diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
@@ -3080,15 +3080,15 @@ - (double)alphaForShapeAnnotation:(MGLShape *)annotation
     UIColor *color = (_delegateHasStrokeColorsForShapeAnnotations
                       ? [self.delegate mapView:self strokeColorForShapeAnnotation:annotation]
                       : self.tintColor);
-    return color.mbgl_color;
+    return color.mgl_color;
 }
 
 - (mbgl::Color)fillColorForPolygonAnnotation:(MGLPolygon *)annotation
 {
     UIColor *color = (_delegateHasFillColorsForShapeAnnotations
                       ? [self.delegate mapView:self fillColorForPolygonAnnotation:annotation]
                       : self.tintColor);
-    return color.mbgl_color;
+    return color.mgl_color;
 }
 
 - (CGFloat)lineWidthForPolylineAnnotation:(MGLPolyline *)annotation

diff --git a/platform/ios/src/UIColor+MGLAdditions.h b/platform/ios/src/UIColor+MGLAdditions.h
@@ -5,10 +5,10 @@
 
 @interface UIColor (MGLAdditions)
 
-- (mbgl::Color)mbgl_color;
+- (mbgl::Color)mgl_color;
 
-- (mbgl::style::PropertyValue<mbgl::Color>)mbgl_colorPropertyValue;
+- (mbgl::style::PropertyValue<mbgl::Color>)mgl_colorPropertyValue;
 
-+ (UIColor *)mbgl_colorWithColor:(mbgl::Color)color;
++ (UIColor *)mgl_colorWithColor:(mbgl::Color)color;
 
 @end
diff --git a/platform/ios/src/UIColor+MGLAdditions.mm b/platform/ios/src/UIColor+MGLAdditions.mm
@@ -2,20 +2,20 @@
 
 @implementation UIColor (MGLAdditions)
 
-- (mbgl::Color)mbgl_color
+- (mbgl::Color)mgl_color
 {
     CGFloat r, g, b, a;
     [self getRed:&r green:&g blue:&b alpha:&a];
     return { (float)r, (float)g, (float)b, (float)a };
 }
 
-- (mbgl::style::PropertyValue<mbgl::Color>)mbgl_colorPropertyValue
+- (mbgl::style::PropertyValue<mbgl::Color>)mgl_colorPropertyValue
 {
-    mbgl::Color color = self.mbgl_color;
+    mbgl::Color color = self.mgl_color;
     return {{ color.r, color.g, color.b, color.a }};
 }
 
-+ (UIColor *)mbgl_colorWithColor:(mbgl::Color)color
++ (UIColor *)mgl_colorWithColor:(mbgl::Color)color
 {
     return [UIColor colorWithRed:color.r green:color.g blue:color.b alpha:color.a];
 }

diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
@@ -2183,14 +2183,14 @@ - (double)alphaForShapeAnnotation:(MGLShape *)annotation {
     NSColor *color = (_delegateHasStrokeColorsForShapeAnnotations
                       ? [self.delegate mapView:self strokeColorForShapeAnnotation:annotation]
                       : [NSColor selectedMenuItemColor]);
-    return color.mbgl_color;
+    return color.mgl_color;
 }
 
 - (mbgl::Color)fillColorForPolygonAnnotation:(MGLPolygon *)annotation {
     NSColor *color = (_delegateHasFillColorsForShapeAnnotations
                       ? [self.delegate mapView:self fillColorForPolygonAnnotation:annotation]
                       : [NSColor selectedMenuItemColor]);
-    return color.mbgl_color;
+    return color.mgl_color;
 }
 
 - (CGFloat)lineWidthForPolylineAnnotation:(MGLPolyline *)annotation {

diff --git a/platform/macos/src/NSColor+MGLAdditions.h b/platform/macos/src/NSColor+MGLAdditions.h
@@ -8,13 +8,13 @@
 /**
  Converts the color into an mbgl::Color in calibrated RGB space.
  */
-- (mbgl::Color)mbgl_color;
+- (mbgl::Color)mgl_color;
 
 /**
  Instantiates `NSColor` from an `mbgl::Color`
  */
-+ (NSColor *)mbgl_colorWithColor:(mbgl::Color)color;
++ (NSColor *)mgl_colorWithColor:(mbgl::Color)color;
 
-- (mbgl::style::PropertyValue<mbgl::Color>)mbgl_colorPropertyValue;
+- (mbgl::style::PropertyValue<mbgl::Color>)mgl_colorPropertyValue;
 
 @end
diff --git a/platform/macos/src/NSColor+MGLAdditions.mm b/platform/macos/src/NSColor+MGLAdditions.mm
@@ -2,7 +2,7 @@
 
 @implementation NSColor (MGLAdditions)
 
-- (mbgl::Color)mbgl_color
+- (mbgl::Color)mgl_color
 {
     CGFloat r, g, b, a;
 
@@ -11,14 +11,14 @@ @implementation NSColor (MGLAdditions)
     return { (float)r, (float)g, (float)b, (float)a };
 }
 
-+ (NSColor *)mbgl_colorWithColor:(mbgl::Color)color
++ (NSColor *)mgl_colorWithColor:(mbgl::Color)color
 {
     return [NSColor colorWithRed:color.r green:color.g blue:color.b alpha:color.a];
 }
 
-- (mbgl::style::PropertyValue<mbgl::Color>)mbgl_colorPropertyValue
+- (mbgl::style::PropertyValue<mbgl::Color>)mgl_colorPropertyValue
 {
-    mbgl::Color color = self.mbgl_color;
+    mbgl::Color color = self.mgl_color;
     return {{ color.r, color.g, color.b, color.a }};
 }