summaryrefslogtreecommitdiff
path: root/src/mbgl/util/mapbox.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/util/mapbox.hpp')
-rw-r--r--src/mbgl/util/mapbox.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/util/mapbox.hpp b/src/mbgl/util/mapbox.hpp
index aa128f2667..815b338cab 100644
--- a/src/mbgl/util/mapbox.hpp
+++ b/src/mbgl/util/mapbox.hpp
@@ -12,14 +12,14 @@ namespace mapbox {
bool isMapboxURL(const std::string& url);
-std::string normalizeSourceURL(const std::string& baseURL, const std::string& url, const std::string& accessToken);
-std::string normalizeStyleURL(const std::string& baseURL, const std::string& url, const std::string& accessToken);
-std::string normalizeSpriteURL(const std::string& baseURL, const std::string& url, const std::string& accessToken);
-std::string normalizeGlyphsURL(const std::string& baseURL, const std::string& url, const std::string& accessToken);
-std::string normalizeTileURL(const std::string& baseURL, const std::string& url, const std::string& accessToken);
+std::string normalizeSourceURL(const std::string& baseURL, const std::string& str, const std::string& accessToken);
+std::string normalizeStyleURL(const std::string& baseURL, const std::string& str, const std::string& accessToken);
+std::string normalizeSpriteURL(const std::string& baseURL, const std::string& str, const std::string& accessToken);
+std::string normalizeGlyphsURL(const std::string& baseURL, const std::string& str, const std::string& accessToken);
+std::string normalizeTileURL(const std::string& baseURL, const std::string& str, const std::string& accessToken);
// Return a "mapbox://tiles/..." URL (suitable for normalizeTileURL) for the given Mapbox tile URL.
-std::string canonicalizeTileURL(const std::string& url, style::SourceType, uint16_t tileSize);
+std::string canonicalizeTileURL(const std::string& str, style::SourceType, uint16_t tileSize);
// Replace URL templates with "mapbox://tiles/..." URLs (suitable for normalizeTileURL).
void canonicalizeTileset(Tileset&, const std::string& url, style::SourceType, uint16_t tileSize);