summaryrefslogtreecommitdiff
path: root/include/mbgl/style
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-08-31 17:13:16 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-09-06 12:52:14 -0700
commit3a48c60813b18c092c8d8d75c80a318bdd8859bb (patch)
tree46b12d272e40b3780bd39c9fc7c1c0ed1ed6d70f /include/mbgl/style
parent3635b9f1476ffd5d8f38a7abdf5742faef012850 (diff)
downloadqtlocation-mapboxgl-3a48c60813b18c092c8d8d75c80a318bdd8859bb.tar.gz
[core] Add missing classed paint property getter
Diffstat (limited to 'include/mbgl/style')
-rw-r--r--include/mbgl/style/layers/background_layer.hpp6
-rw-r--r--include/mbgl/style/layers/circle_layer.hpp14
-rw-r--r--include/mbgl/style/layers/fill_layer.hpp14
-rw-r--r--include/mbgl/style/layers/layer.hpp.ejs2
-rw-r--r--include/mbgl/style/layers/line_layer.hpp20
-rw-r--r--include/mbgl/style/layers/raster_layer.hpp14
-rw-r--r--include/mbgl/style/layers/symbol_layer.hpp28
7 files changed, 49 insertions, 49 deletions
diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index 68aebfd37c..c120b7f493 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -19,15 +19,15 @@ public:
// Paint properties
static PropertyValue<Color> getDefaultBackgroundColor();
- PropertyValue<Color> getBackgroundColor() const;
+ PropertyValue<Color> getBackgroundColor(const optional<std::string>& klass = {}) const;
void setBackgroundColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<std::string> getDefaultBackgroundPattern();
- PropertyValue<std::string> getBackgroundPattern() const;
+ PropertyValue<std::string> getBackgroundPattern(const optional<std::string>& klass = {}) const;
void setBackgroundPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultBackgroundOpacity();
- PropertyValue<float> getBackgroundOpacity() const;
+ PropertyValue<float> getBackgroundOpacity(const optional<std::string>& klass = {}) const;
void setBackgroundOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
// Private implementation
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index 39ea61c5f3..587f0023e3 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -27,31 +27,31 @@ public:
// Paint properties
static PropertyValue<float> getDefaultCircleRadius();
- PropertyValue<float> getCircleRadius() const;
+ PropertyValue<float> getCircleRadius(const optional<std::string>& klass = {}) const;
void setCircleRadius(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<Color> getDefaultCircleColor();
- PropertyValue<Color> getCircleColor() const;
+ PropertyValue<Color> getCircleColor(const optional<std::string>& klass = {}) const;
void setCircleColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultCircleBlur();
- PropertyValue<float> getCircleBlur() const;
+ PropertyValue<float> getCircleBlur(const optional<std::string>& klass = {}) const;
void setCircleBlur(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultCircleOpacity();
- PropertyValue<float> getCircleOpacity() const;
+ PropertyValue<float> getCircleOpacity(const optional<std::string>& klass = {}) const;
void setCircleOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<std::array<float, 2>> getDefaultCircleTranslate();
- PropertyValue<std::array<float, 2>> getCircleTranslate() const;
+ PropertyValue<std::array<float, 2>> getCircleTranslate(const optional<std::string>& klass = {}) const;
void setCircleTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
static PropertyValue<TranslateAnchorType> getDefaultCircleTranslateAnchor();
- PropertyValue<TranslateAnchorType> getCircleTranslateAnchor() const;
+ PropertyValue<TranslateAnchorType> getCircleTranslateAnchor(const optional<std::string>& klass = {}) const;
void setCircleTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
static PropertyValue<CirclePitchScaleType> getDefaultCirclePitchScale();
- PropertyValue<CirclePitchScaleType> getCirclePitchScale() const;
+ PropertyValue<CirclePitchScaleType> getCirclePitchScale(const optional<std::string>& klass = {}) const;
void setCirclePitchScale(PropertyValue<CirclePitchScaleType>, const optional<std::string>& klass = {});
// Private implementation
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index 72bb7c498f..4b9201641d 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -27,31 +27,31 @@ public:
// Paint properties
static PropertyValue<bool> getDefaultFillAntialias();
- PropertyValue<bool> getFillAntialias() const;
+ PropertyValue<bool> getFillAntialias(const optional<std::string>& klass = {}) const;
void setFillAntialias(PropertyValue<bool>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultFillOpacity();
- PropertyValue<float> getFillOpacity() const;
+ PropertyValue<float> getFillOpacity(const optional<std::string>& klass = {}) const;
void setFillOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<Color> getDefaultFillColor();
- PropertyValue<Color> getFillColor() const;
+ PropertyValue<Color> getFillColor(const optional<std::string>& klass = {}) const;
void setFillColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<Color> getDefaultFillOutlineColor();
- PropertyValue<Color> getFillOutlineColor() const;
+ PropertyValue<Color> getFillOutlineColor(const optional<std::string>& klass = {}) const;
void setFillOutlineColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<std::array<float, 2>> getDefaultFillTranslate();
- PropertyValue<std::array<float, 2>> getFillTranslate() const;
+ PropertyValue<std::array<float, 2>> getFillTranslate(const optional<std::string>& klass = {}) const;
void setFillTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
static PropertyValue<TranslateAnchorType> getDefaultFillTranslateAnchor();
- PropertyValue<TranslateAnchorType> getFillTranslateAnchor() const;
+ PropertyValue<TranslateAnchorType> getFillTranslateAnchor(const optional<std::string>& klass = {}) const;
void setFillTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
static PropertyValue<std::string> getDefaultFillPattern();
- PropertyValue<std::string> getFillPattern() const;
+ PropertyValue<std::string> getFillPattern(const optional<std::string>& klass = {}) const;
void setFillPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
// Private implementation
diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs
index 9d542b75b6..15d0fcee61 100644
--- a/include/mbgl/style/layers/layer.hpp.ejs
+++ b/include/mbgl/style/layers/layer.hpp.ejs
@@ -55,7 +55,7 @@ public:
<% for (const property of paintProperties) { -%>
static PropertyValue<<%- propertyType(property) %>> getDefault<%- camelize(property.name) %>();
- PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() const;
+ PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>(const optional<std::string>& klass = {}) const;
void set<%- camelize(property.name) %>(PropertyValue<<%- propertyType(property) %>>, const optional<std::string>& klass = {});
<% } -%>
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index 8549ad0a6c..c3c1026bcd 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -47,43 +47,43 @@ public:
// Paint properties
static PropertyValue<float> getDefaultLineOpacity();
- PropertyValue<float> getLineOpacity() const;
+ PropertyValue<float> getLineOpacity(const optional<std::string>& klass = {}) const;
void setLineOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<Color> getDefaultLineColor();
- PropertyValue<Color> getLineColor() const;
+ PropertyValue<Color> getLineColor(const optional<std::string>& klass = {}) const;
void setLineColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<std::array<float, 2>> getDefaultLineTranslate();
- PropertyValue<std::array<float, 2>> getLineTranslate() const;
+ PropertyValue<std::array<float, 2>> getLineTranslate(const optional<std::string>& klass = {}) const;
void setLineTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
static PropertyValue<TranslateAnchorType> getDefaultLineTranslateAnchor();
- PropertyValue<TranslateAnchorType> getLineTranslateAnchor() const;
+ PropertyValue<TranslateAnchorType> getLineTranslateAnchor(const optional<std::string>& klass = {}) const;
void setLineTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultLineWidth();
- PropertyValue<float> getLineWidth() const;
+ PropertyValue<float> getLineWidth(const optional<std::string>& klass = {}) const;
void setLineWidth(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultLineGapWidth();
- PropertyValue<float> getLineGapWidth() const;
+ PropertyValue<float> getLineGapWidth(const optional<std::string>& klass = {}) const;
void setLineGapWidth(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultLineOffset();
- PropertyValue<float> getLineOffset() const;
+ PropertyValue<float> getLineOffset(const optional<std::string>& klass = {}) const;
void setLineOffset(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultLineBlur();
- PropertyValue<float> getLineBlur() const;
+ PropertyValue<float> getLineBlur(const optional<std::string>& klass = {}) const;
void setLineBlur(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<std::vector<float>> getDefaultLineDasharray();
- PropertyValue<std::vector<float>> getLineDasharray() const;
+ PropertyValue<std::vector<float>> getLineDasharray(const optional<std::string>& klass = {}) const;
void setLineDasharray(PropertyValue<std::vector<float>>, const optional<std::string>& klass = {});
static PropertyValue<std::string> getDefaultLinePattern();
- PropertyValue<std::string> getLinePattern() const;
+ PropertyValue<std::string> getLinePattern(const optional<std::string>& klass = {}) const;
void setLinePattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
// Private implementation
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index c5479bd2ab..ae6ec7f91c 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -22,31 +22,31 @@ public:
// Paint properties
static PropertyValue<float> getDefaultRasterOpacity();
- PropertyValue<float> getRasterOpacity() const;
+ PropertyValue<float> getRasterOpacity(const optional<std::string>& klass = {}) const;
void setRasterOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultRasterHueRotate();
- PropertyValue<float> getRasterHueRotate() const;
+ PropertyValue<float> getRasterHueRotate(const optional<std::string>& klass = {}) const;
void setRasterHueRotate(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultRasterBrightnessMin();
- PropertyValue<float> getRasterBrightnessMin() const;
+ PropertyValue<float> getRasterBrightnessMin(const optional<std::string>& klass = {}) const;
void setRasterBrightnessMin(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultRasterBrightnessMax();
- PropertyValue<float> getRasterBrightnessMax() const;
+ PropertyValue<float> getRasterBrightnessMax(const optional<std::string>& klass = {}) const;
void setRasterBrightnessMax(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultRasterSaturation();
- PropertyValue<float> getRasterSaturation() const;
+ PropertyValue<float> getRasterSaturation(const optional<std::string>& klass = {}) const;
void setRasterSaturation(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultRasterContrast();
- PropertyValue<float> getRasterContrast() const;
+ PropertyValue<float> getRasterContrast(const optional<std::string>& klass = {}) const;
void setRasterContrast(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultRasterFadeDuration();
- PropertyValue<float> getRasterFadeDuration() const;
+ PropertyValue<float> getRasterFadeDuration(const optional<std::string>& klass = {}) const;
void setRasterFadeDuration(PropertyValue<float>, const optional<std::string>& klass = {});
// Private implementation
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 5d1882fd4b..1e2e6ac454 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -167,59 +167,59 @@ public:
// Paint properties
static PropertyValue<float> getDefaultIconOpacity();
- PropertyValue<float> getIconOpacity() const;
+ PropertyValue<float> getIconOpacity(const optional<std::string>& klass = {}) const;
void setIconOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<Color> getDefaultIconColor();
- PropertyValue<Color> getIconColor() const;
+ PropertyValue<Color> getIconColor(const optional<std::string>& klass = {}) const;
void setIconColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<Color> getDefaultIconHaloColor();
- PropertyValue<Color> getIconHaloColor() const;
+ PropertyValue<Color> getIconHaloColor(const optional<std::string>& klass = {}) const;
void setIconHaloColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultIconHaloWidth();
- PropertyValue<float> getIconHaloWidth() const;
+ PropertyValue<float> getIconHaloWidth(const optional<std::string>& klass = {}) const;
void setIconHaloWidth(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultIconHaloBlur();
- PropertyValue<float> getIconHaloBlur() const;
+ PropertyValue<float> getIconHaloBlur(const optional<std::string>& klass = {}) const;
void setIconHaloBlur(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<std::array<float, 2>> getDefaultIconTranslate();
- PropertyValue<std::array<float, 2>> getIconTranslate() const;
+ PropertyValue<std::array<float, 2>> getIconTranslate(const optional<std::string>& klass = {}) const;
void setIconTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
static PropertyValue<TranslateAnchorType> getDefaultIconTranslateAnchor();
- PropertyValue<TranslateAnchorType> getIconTranslateAnchor() const;
+ PropertyValue<TranslateAnchorType> getIconTranslateAnchor(const optional<std::string>& klass = {}) const;
void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultTextOpacity();
- PropertyValue<float> getTextOpacity() const;
+ PropertyValue<float> getTextOpacity(const optional<std::string>& klass = {}) const;
void setTextOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<Color> getDefaultTextColor();
- PropertyValue<Color> getTextColor() const;
+ PropertyValue<Color> getTextColor(const optional<std::string>& klass = {}) const;
void setTextColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<Color> getDefaultTextHaloColor();
- PropertyValue<Color> getTextHaloColor() const;
+ PropertyValue<Color> getTextHaloColor(const optional<std::string>& klass = {}) const;
void setTextHaloColor(PropertyValue<Color>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultTextHaloWidth();
- PropertyValue<float> getTextHaloWidth() const;
+ PropertyValue<float> getTextHaloWidth(const optional<std::string>& klass = {}) const;
void setTextHaloWidth(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<float> getDefaultTextHaloBlur();
- PropertyValue<float> getTextHaloBlur() const;
+ PropertyValue<float> getTextHaloBlur(const optional<std::string>& klass = {}) const;
void setTextHaloBlur(PropertyValue<float>, const optional<std::string>& klass = {});
static PropertyValue<std::array<float, 2>> getDefaultTextTranslate();
- PropertyValue<std::array<float, 2>> getTextTranslate() const;
+ PropertyValue<std::array<float, 2>> getTextTranslate(const optional<std::string>& klass = {}) const;
void setTextTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
static PropertyValue<TranslateAnchorType> getDefaultTextTranslateAnchor();
- PropertyValue<TranslateAnchorType> getTextTranslateAnchor() const;
+ PropertyValue<TranslateAnchorType> getTextTranslateAnchor(const optional<std::string>& klass = {}) const;
void setTextTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
// Private implementation