summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmkiley <jordan.kiley@mapbox.com>2020-01-31 15:14:55 -0800
committerjmkiley <jordan.kiley@mapbox.com>2020-01-31 15:14:55 -0800
commitc4efb5ce73d0ea397337fb90ccd82ba94e208334 (patch)
tree05f151b3f94042079afbd22e5ebf0dc6fc7394ff
parente34d1bce9850a57808fb1b0b551641a07d2f626e (diff)
downloadqtlocation-mapboxgl-upstream/jmkiley-account-type.tar.gz
[ios, macos] rename methodupstream/jmkiley-account-type
-rw-r--r--platform/darwin/src/http_file_source.mm5
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm
index abd99d3c97..fb338e6ac4 100644
--- a/platform/darwin/src/http_file_source.mm
+++ b/platform/darwin/src/http_file_source.mm
@@ -93,7 +93,6 @@ public:
NSURLSession* session = nil;
NSString* userAgent = nil;
- NSInteger accountType = 0;
private:
NSString* getUserAgent() const;
@@ -196,7 +195,7 @@ BOOL isValidMapboxEndpoint(NSURL *url) {
}
MGL_APPLE_EXPORT
-NSURL *resourceURLWithAccountType(const Resource& resource) {
+NSURL *resourceURL(const Resource& resource) {
NSURL *url = [NSURL URLWithString:@(resource.url.c_str())];
@@ -226,7 +225,7 @@ std::unique_ptr<AsyncRequest> HTTPFileSource::request(const Resource& resource,
auto shared = request->shared; // Explicit copy so that it also gets copied into the completion handler block below.
@autoreleasepool {
- NSURL *url = resourceURLWithAccountType(resource);
+ NSURL *url = resourceURL(resource);
[MGLNativeNetworkManager.sharedManager debugLog:@"Requesting URI: %@", url.relativePath];
NSMutableURLRequest *req = [NSMutableURLRequest requestWithURL:url];