summaryrefslogtreecommitdiff
path: root/src/mbgl/style/sources
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-05 19:03:27 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-05 19:03:27 +0200
commit46b73b8a2cf5748596ab6023e2cb1f2ce45d2b0d (patch)
treedb1f2b4075c076bcd1e964ddb7414b81b6808464 /src/mbgl/style/sources
parent51b2033fce5ca4d016b67b94abc50c1822c139fe (diff)
downloadqtlocation-mapboxgl-46b73b8a2cf5748596ab6023e2cb1f2ce45d2b0d.tar.gz
[core] Source::update => Source::{load,parse}Tiles, Source::load => Source::loadDescription
Diffstat (limited to 'src/mbgl/style/sources')
-rw-r--r--src/mbgl/style/sources/geojson_source_impl.cpp2
-rw-r--r--src/mbgl/style/sources/geojson_source_impl.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/sources/geojson_source_impl.cpp b/src/mbgl/style/sources/geojson_source_impl.cpp
index 1e02270819..032576b47e 100644
--- a/src/mbgl/style/sources/geojson_source_impl.cpp
+++ b/src/mbgl/style/sources/geojson_source_impl.cpp
@@ -67,7 +67,7 @@ void GeoJSONSource::Impl::setGeoJSON(const GeoJSON& geoJSON) {
}
}
-void GeoJSONSource::Impl::load(FileSource& fileSource) {
+void GeoJSONSource::Impl::loadDescription(FileSource& fileSource) {
if (!url) {
loaded = true;
return;
diff --git a/src/mbgl/style/sources/geojson_source_impl.hpp b/src/mbgl/style/sources/geojson_source_impl.hpp
index 684b79b3fa..cf079e472c 100644
--- a/src/mbgl/style/sources/geojson_source_impl.hpp
+++ b/src/mbgl/style/sources/geojson_source_impl.hpp
@@ -20,7 +20,7 @@ public:
void setGeoJSON(const GeoJSON&);
- void load(FileSource&) final;
+ void loadDescription(FileSource&) final;
uint16_t getTileSize() const final {
return util::tileSize;