summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2015-06-02 18:05:18 +0300
committerThiago Marcos P. Santos <thiago@mapbox.com>2015-06-02 20:23:03 +0300
commit68989e671cba847ba65f3d6afd4327b4677be1f3 (patch)
treeb8dea011ba891cfb0821b2810989307ba12abc63 /src
parent88b3cfe37de7918723fb9ebb6b886aaec4808bcd (diff)
downloadqtlocation-mapboxgl-68989e671cba847ba65f3d6afd4327b4677be1f3.tar.gz
Remove references to ResourceLoader
ResourceLoader got merged with Style.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/map/map_context.hpp2
-rw-r--r--src/mbgl/style/style.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp
index d19c95a3bd..8894434242 100644
--- a/src/mbgl/map/map_context.hpp
+++ b/src/mbgl/map/map_context.hpp
@@ -54,7 +54,7 @@ public:
void setSourceTileCacheSize(size_t size);
void onLowMemory();
- // ResourceLoader::Observer implementation.
+ // Style::Observer implementation.
void onTileDataChanged() override;
void onResourceLoadingFailed(std::exception_ptr error) override;
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 035d148787..8999af3c7f 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -206,7 +206,7 @@ void Style::emitResourceLoadingFailed(std::exception_ptr error) {
std::rethrow_exception(error);
}
} catch(const std::exception& e) {
- Log::Error(Event::ResourceLoader, e.what());
+ Log::Error(Event::Style, e.what());
}
if (observer) {