diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-26 16:04:22 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-26 16:04:22 -0800 |
| commit | 84c3191044362a9bb6742d3fc24b46af7efa9171 (patch) | |
| tree | e0f14ff0a3b13935ac7e87080bf22b24a675763f | |
| parent | 01ecbaf51ab24b8e1bb92e931361c4c6cd0e95b8 (diff) | |
| download | qtlocation-mapboxgl-84c3191044362a9bb6742d3fc24b46af7efa9171.tar.gz | |
Eliminate Map::getActiveSources()
| -rw-r--r-- | include/mbgl/map/map.hpp | 1 | ||||
| -rw-r--r-- | src/map/map.cpp | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 8df4e91a5c..f29c8f1df9 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -71,7 +71,6 @@ public: void resize(uint16_t width, uint16_t height, float ratio, uint16_t fb_width, uint16_t fb_height); // Styling - const std::set<util::ptr<StyleSource>> getActiveSources() const; void setAppliedClasses(const std::vector<std::string> &classes); void toggleClass(const std::string &name); const std::vector<std::string> &getAppliedClasses() const; diff --git a/src/map/map.cpp b/src/map/map.cpp index 22eb0de69f..c6d376c13b 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -621,10 +621,6 @@ void Map::updateSources() { }); } -const std::set<util::ptr<StyleSource>> Map::getActiveSources() const { - return activeSources; -} - void Map::updateSources(const util::ptr<StyleLayerGroup> &group) { if (!group) { return; @@ -642,7 +638,7 @@ void Map::updateSources(const util::ptr<StyleLayerGroup> &group) { } void Map::updateTiles() { - for (const util::ptr<StyleSource> &source : getActiveSources()) { + for (const auto& source : activeSources) { source->source->update(*this, getWorker(), style, glyphAtlas, *glyphStore, spriteAtlas, getSprite(), |