diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-26 15:12:43 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-10 11:33:17 -0800 |
| commit | 54e08b1f83504e12cbc19b08295d9f9ed5177ab5 (patch) | |
| tree | 40513395d4d0ed2d9003ef30a708f21b2e83e5ab /test/api | |
| parent | a5625675890213f94de7632d4ef152ade627c9a5 (diff) | |
| download | qtlocation-mapboxgl-54e08b1f83504e12cbc19b08295d9f9ed5177ab5.tar.gz | |
[core] Eliminate use of ClassProperties for paint
Diffstat (limited to 'test/api')
| -rw-r--r-- | test/api/annotations.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index 737c5314c6..a044d2f36d 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -2,7 +2,6 @@ #include <mbgl/annotation/point_annotation.hpp> #include <mbgl/annotation/shape_annotation.hpp> -#include <mbgl/style/style_properties.hpp> #include <mbgl/map/map.hpp> #include <mbgl/map/still_image.hpp> #include <mbgl/platform/default/headless_display.hpp> @@ -48,7 +47,7 @@ TEST(Annotations, LineAnnotation) { AnnotationSegments segments = {{ {{ { 0, 0 }, { 45, 45 } }} }}; - LinePaintProperties properties; + LineAnnotationProperties properties; properties.color = {{ 255, 0, 0, 1 }}; properties.width = 5; @@ -67,8 +66,8 @@ TEST(Annotations, FillAnnotation) { AnnotationSegments segments = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; - FillPaintProperties properties; - properties.fill_color = {{ 255, 0, 0, 1 }}; + FillAnnotationProperties properties; + properties.color = {{ 255, 0, 0, 1 }}; map.addShapeAnnotation(ShapeAnnotation(segments, properties)); @@ -118,8 +117,8 @@ TEST(Annotations, NonImmediateAdd) { AnnotationSegments segments = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; - FillPaintProperties properties; - properties.fill_color = {{ 255, 0, 0, 1 }}; + FillAnnotationProperties properties; + properties.color = {{ 255, 0, 0, 1 }}; map.addShapeAnnotation(ShapeAnnotation(segments, properties)); @@ -149,7 +148,7 @@ TEST(Annotations, RemoveShape) { AnnotationSegments segments = {{ {{ { 0, 0 }, { 45, 45 } }} }}; - LinePaintProperties properties; + LineAnnotationProperties properties; properties.color = {{ 255, 0, 0, 1 }}; properties.width = 5; |