From 7f6cc6cc6d462952c02fbc50bd90f4f765a55809 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 4 May 2015 16:52:41 -0500 Subject: [PATCH] #1225 - Renaming getAccessToken method to sharedAccessToken to avoid any iOS get naming conventions --- include/mbgl/ios/MGLAccountManager.h | 2 +- platform/ios/MGLAccountManager.m | 2 +- platform/ios/MGLMapView.mm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/mbgl/ios/MGLAccountManager.h b/include/mbgl/ios/MGLAccountManager.h index aed2536a341..569a01cc56b 100644 --- a/include/mbgl/ios/MGLAccountManager.h +++ b/include/mbgl/ios/MGLAccountManager.h @@ -1,6 +1,6 @@ @interface MGLAccountManager : NSObject + (instancetype) sharedInstanceWithAccessToken:(NSString *)token; -+ (NSString *) getAccessToken; ++ (NSString *) sharedAccessToken; @end \ No newline at end of file diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/MGLAccountManager.m index d408ba8d492..22608f94c81 100644 --- a/platform/ios/MGLAccountManager.m +++ b/platform/ios/MGLAccountManager.m @@ -40,7 +40,7 @@ + (instancetype) sharedInstanceWithAccessToken:(NSString *)token { return _sharedManager; } -+ (NSString *) getAccessToken { ++ (NSString *) sharedAccessToken { if (_sharedManager) { return _sharedManager.accessToken; } diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index b915fa01f94..36970c8aa96 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -123,7 +123,7 @@ - (instancetype)initWithFrame:(CGRect)frame if (self && [self commonInit]) { self.styleURL = nil; - self.accessToken = [MGLAccountManager getAccessToken]; + self.accessToken = [MGLAccountManager sharedAccessToken]; return self; }