diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-03-17 11:10:46 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-03-21 17:36:56 +0200 |
commit | c1a410be8bb135883d73c5937f2c6b22b3d31ed7 (patch) | |
tree | 40401155593795feb9886a5eb75a1b3c08a33ed1 /src | |
parent | 24198ebca86cbe1329a1854f080e3f4638973142 (diff) | |
download | qtlocation-mapboxgl-c1a410be8bb135883d73c5937f2c6b22b3d31ed7.tar.gz |
[core] s/onSourceDidChange/onSourceChanged/ + source ref
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/map.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/style/source_observer.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/style.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/style.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/tile_source_impl.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 32fbd3f0c4..24ae5643ee 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -59,7 +59,7 @@ public: ConstrainMode, ViewportMode); - void onSourceAttributionChanged(style::Source&, const std::string&) override; + void onSourceChanged(style::Source&) override; void onUpdate(Update) override; void onStyleLoaded() override; void onStyleError(std::exception_ptr) override; @@ -1089,8 +1089,8 @@ void Map::onLowMemory() { } } -void Map::Impl::onSourceAttributionChanged(style::Source&, const std::string&) { - observer.onSourceDidChange(); +void Map::Impl::onSourceChanged(style::Source& source) { + observer.onSourceChanged(source); } void Map::Impl::onUpdate(Update flags) { diff --git a/src/mbgl/style/source_observer.hpp b/src/mbgl/style/source_observer.hpp index 9be7c67960..c97ba19e84 100644 --- a/src/mbgl/style/source_observer.hpp +++ b/src/mbgl/style/source_observer.hpp @@ -17,7 +17,7 @@ public: virtual ~SourceObserver() = default; virtual void onSourceLoaded(Source&) {} - virtual void onSourceAttributionChanged(Source&, const std::string&) {} + virtual void onSourceChanged(Source&) {} virtual void onSourceError(Source&, std::exception_ptr) {} // Source description needs to be reloaded diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 1db0807535..9e212826f9 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -593,8 +593,8 @@ void Style::onSourceLoaded(Source& source) { observer->onUpdate(Update::Repaint); } -void Style::onSourceAttributionChanged(Source& source, const std::string& attribution) { - observer->onSourceAttributionChanged(source, attribution); +void Style::onSourceChanged(Source& source) { + observer->onSourceChanged(source); } void Style::onSourceError(Source& source, std::exception_ptr error) { diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 36ccd1f30e..0c65129422 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -140,7 +140,7 @@ private: // SourceObserver implementation. void onSourceLoaded(Source&) override; - void onSourceAttributionChanged(Source&, const std::string&) override; + void onSourceChanged(Source&) override; void onSourceError(Source&, std::exception_ptr) override; void onSourceDescriptionChanged(Source&) override; void onTileChanged(Source&, const OverscaledTileID&) override; diff --git a/src/mbgl/style/tile_source_impl.cpp b/src/mbgl/style/tile_source_impl.cpp index 44a25a8bfb..44fb01b0ee 100644 --- a/src/mbgl/style/tile_source_impl.cpp +++ b/src/mbgl/style/tile_source_impl.cpp @@ -107,7 +107,7 @@ void TileSourceImpl::loadDescription(FileSource& fileSource) { observer->onSourceLoaded(base); if (attributionChanged) { - observer->onSourceAttributionChanged(base, newTileset.attribution); + observer->onSourceChanged(base); } } }); |