diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/style/layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/background_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/circle_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/custom_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/fill_extrusion_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/fill_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/heatmap_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/hillshade_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/layer.hpp.ejs | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/line_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/raster_layer.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index 849cb436be..b50ca75067 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -115,7 +115,7 @@ public: const conversion::Convertible& value) = 0; optional<conversion::Error> setVisibility(const conversion::Convertible& value); - virtual StyleProperty getPaintProperty(const std::string&) const = 0; + virtual StyleProperty getProperty(const std::string&) const = 0; // Private implementation // TODO : We should not have public mutable data members. diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp index ad40e49660..ebdce35d0f 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -24,7 +24,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Paint properties diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index f0bd18a825..842094f944 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -24,7 +24,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Paint properties diff --git a/include/mbgl/style/layers/custom_layer.hpp b/include/mbgl/style/layers/custom_layer.hpp index ad27226505..c193cfb8d9 100644 --- a/include/mbgl/style/layers/custom_layer.hpp +++ b/include/mbgl/style/layers/custom_layer.hpp @@ -71,7 +71,7 @@ public: // Dynamic properties optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string&) const final; + StyleProperty getProperty(const std::string&) const final; // Private implementation class Impl; diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp index f2a5284fb9..76c2359617 100644 --- a/include/mbgl/style/layers/fill_extrusion_layer.hpp +++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp @@ -24,7 +24,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Paint properties diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index 0f4ce02aea..9ec33d7e96 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -24,7 +24,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Paint properties diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp index 233ed32e36..2dec03b927 100644 --- a/include/mbgl/style/layers/heatmap_layer.hpp +++ b/include/mbgl/style/layers/heatmap_layer.hpp @@ -25,7 +25,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Paint properties diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp index aaed4597dc..824606c29b 100644 --- a/include/mbgl/style/layers/hillshade_layer.hpp +++ b/include/mbgl/style/layers/hillshade_layer.hpp @@ -24,7 +24,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Paint properties diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index 20dcb86abd..7b60fcf6ea 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -40,7 +40,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; <% if (layoutProperties.length) { -%> // Layout properties diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index 410b518f7b..4f2cf53708 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -27,7 +27,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Layout properties diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index 91dab175ec..bff38d42ac 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -24,7 +24,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Paint properties diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 0c128f84a6..92e214919a 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -26,7 +26,7 @@ public: optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final; optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final; - StyleProperty getPaintProperty(const std::string& name) const final; + StyleProperty getProperty(const std::string& name) const final; // Layout properties |