diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-09-26 15:42:48 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-09-26 15:43:01 -0700 |
| commit | 0f5b194617e0250280e0536794625a733a7d447e (patch) | |
| tree | 7167f5a9b6b3a2c134b92c1e7839676bd1715161 | |
| parent | 7ff036cd01e0d3594dd3006cb8d313786d81799e (diff) | |
| download | qtlocation-mapboxgl-0f5b194617e0250280e0536794625a733a7d447e.tar.gz | |
[core, qt] Generalized source change notification
This same notification can in the future be used for other changes to a source.
| -rw-r--r-- | platform/qt/include/qmapbox.hpp | 2 | ||||
| -rw-r--r-- | platform/qt/src/qmapbox.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/map/change.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/map/map.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp index 0a6a41b3e1..4975076eee 100644 --- a/platform/qt/include/qmapbox.hpp +++ b/platform/qt/include/qmapbox.hpp @@ -46,7 +46,7 @@ enum MapChange { MapChangeDidFinishRenderingMap, MapChangeDidFinishRenderingMapFullyRendered, MapChangeDidFinishLoadingStyle, - MapChangeSourceAttributionDidChange + MapChangeSourceDidChange }; struct Q_DECL_EXPORT CameraOptions { diff --git a/platform/qt/src/qmapbox.cpp b/platform/qt/src/qmapbox.cpp index 4a871c151d..a101eb4986 100644 --- a/platform/qt/src/qmapbox.cpp +++ b/platform/qt/src/qmapbox.cpp @@ -32,7 +32,7 @@ static_assert(mbgl::underlying_type(QMapbox::MapChangeWillStartRenderingMap) == static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishRenderingMap) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMap), "error"); static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishRenderingMapFullyRendered) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMapFullyRendered), "error"); static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishLoadingStyle) == mbgl::underlying_type(mbgl::MapChangeDidFinishLoadingStyle), "error"); -static_assert(mbgl::underlying_type(QMapbox::MapChangeSourceAttributionDidChange) == mbgl::underlying_type(mbgl::MapChangeSourceAttributionDidChange), "error"); +static_assert(mbgl::underlying_type(QMapbox::MapChangeSourceDidChange) == mbgl::underlying_type(mbgl::MapChangeSourceDidChange), "error"); namespace QMapbox { diff --git a/src/mbgl/map/change.hpp b/src/mbgl/map/change.hpp index 50079af710..3925d655a4 100644 --- a/src/mbgl/map/change.hpp +++ b/src/mbgl/map/change.hpp @@ -20,7 +20,7 @@ enum MapChange : uint8_t { MapChangeDidFinishRenderingMap = 12, MapChangeDidFinishRenderingMapFullyRendered = 13, MapChangeDidFinishLoadingStyle = 14, - MapChangeSourceAttributionDidChange = 15 + MapChangeSourceDidChange = 15 }; } // namespace mbgl diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 0dfd079926..ce5e743868 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -982,7 +982,7 @@ void Map::onLowMemory() { } void Map::Impl::onSourceAttributionChanged(style::Source&, const std::string&) { - view.notifyMapChange(MapChangeSourceAttributionDidChange); + view.notifyMapChange(MapChangeSourceDidChange); } void Map::Impl::onUpdate(Update flags) { |