diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-09-21 17:39:17 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-09-28 14:10:01 -0700 |
| commit | 0c4c7ed901a2c984f120b1f23abf0dd528991b38 (patch) | |
| tree | 1f18fb15910e702794014000efd770647f07a5c2 | |
| parent | 588fed9a9d01e03165ff70b537b892995a1d24e3 (diff) | |
| download | qtlocation-mapboxgl-0c4c7ed901a2c984f120b1f23abf0dd528991b38.tar.gz | |
map/annotation.* ⇢ annotation/annotation_manager.*
| -rw-r--r-- | src/mbgl/annotation/annotation_manager.cpp (renamed from src/mbgl/map/annotation.cpp) | 2 | ||||
| -rw-r--r-- | src/mbgl/annotation/annotation_manager.hpp (renamed from src/mbgl/map/annotation.hpp) | 0 | ||||
| -rw-r--r-- | src/mbgl/map/live_tile_data.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/map/map_context.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/map/map_data.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/style/style_parser.cpp | 2 |
6 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/map/annotation.cpp b/src/mbgl/annotation/annotation_manager.cpp index cfc9b4fae5..427401eea4 100644 --- a/src/mbgl/map/annotation.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -1,4 +1,4 @@ -#include <mbgl/map/annotation.hpp> +#include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/annotation/point_annotation.hpp> #include <mbgl/annotation/shape_annotation.hpp> #include <mbgl/map/tile_id.hpp> diff --git a/src/mbgl/map/annotation.hpp b/src/mbgl/annotation/annotation_manager.hpp index 60cafdf342..60cafdf342 100644 --- a/src/mbgl/map/annotation.hpp +++ b/src/mbgl/annotation/annotation_manager.hpp diff --git a/src/mbgl/map/live_tile_data.cpp b/src/mbgl/map/live_tile_data.cpp index fbb9c10de0..dec7d40263 100644 --- a/src/mbgl/map/live_tile_data.cpp +++ b/src/mbgl/map/live_tile_data.cpp @@ -1,4 +1,3 @@ -#include <mbgl/map/annotation.hpp> #include <mbgl/map/live_tile_data.hpp> #include <mbgl/map/live_tile.hpp> #include <mbgl/style/style_layer.hpp> diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index 0ebcd73f8b..5858918ae9 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -2,7 +2,6 @@ #include <mbgl/map/map_data.hpp> #include <mbgl/map/view.hpp> #include <mbgl/map/still_image.hpp> -#include <mbgl/map/annotation.hpp> #include <mbgl/annotation/sprite_store.hpp> #include <mbgl/platform/log.hpp> diff --git a/src/mbgl/map/map_data.hpp b/src/mbgl/map/map_data.hpp index aadc8dcd64..9cc76e8b82 100644 --- a/src/mbgl/map/map_data.hpp +++ b/src/mbgl/map/map_data.hpp @@ -11,7 +11,7 @@ #include <condition_variable> #include <mbgl/map/mode.hpp> -#include <mbgl/map/annotation.hpp> +#include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/util/exclusive.hpp> namespace mbgl { diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp index 6dc92a8d3d..2e298e9a6c 100644 --- a/src/mbgl/style/style_parser.cpp +++ b/src/mbgl/style/style_parser.cpp @@ -1,7 +1,7 @@ #include <mbgl/style/style_parser.hpp> #include <mbgl/map/source.hpp> #include <mbgl/style/style_layer.hpp> -#include <mbgl/map/annotation.hpp> +#include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/map/map_data.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/vec.hpp> |