diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-06-02 18:05:18 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-06-02 20:23:03 +0300 |
| commit | 68989e671cba847ba65f3d6afd4327b4677be1f3 (patch) | |
| tree | b8dea011ba891cfb0821b2810989307ba12abc63 | |
| parent | 88b3cfe37de7918723fb9ebb6b886aaec4808bcd (diff) | |
| download | qtlocation-mapboxgl-68989e671cba847ba65f3d6afd4327b4677be1f3.tar.gz | |
Remove references to ResourceLoader
ResourceLoader got merged with Style.
| -rw-r--r-- | include/mbgl/platform/event.hpp | 4 | ||||
| -rw-r--r-- | src/mbgl/map/map_context.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/style/style.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/platform/event.hpp b/include/mbgl/platform/event.hpp index 8cdd1d50a9..c80186da27 100644 --- a/include/mbgl/platform/event.hpp +++ b/include/mbgl/platform/event.hpp @@ -29,7 +29,7 @@ enum class Event : uint8_t { ParseStyle, ParseTile, Render, - ResourceLoader, + Style, Database, HttpRequest, Sprite, @@ -47,7 +47,7 @@ MBGL_DEFINE_ENUM_CLASS(EventClass, Event, { { Event::ParseStyle, "ParseStyle" }, { Event::ParseTile, "ParseTile" }, { Event::Render, "Render" }, - { Event::ResourceLoader, "ResourceLoader" }, + { Event::Style, "Style" }, { Event::Database, "Database" }, { Event::HttpRequest, "HttpRequest" }, { Event::Sprite, "Sprite" }, 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) { |