diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-05-02 15:25:48 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-05-02 17:44:18 +0200 |
commit | 2489afdd0db97de0664198f5ae64bd94db6b6fc7 (patch) | |
tree | a7a52194daab971f58f60ef21bd45b1a0d517f4b /include/mbgl/style/layers/fill_layer.hpp | |
parent | a48152a9811a856e467eff3e396a76a059558fb1 (diff) | |
download | qtlocation-mapboxgl-2489afdd0db97de0664198f5ae64bd94db6b6fc7.tar.gz |
[build] change style code generator to sort properties alphabetically
JSON keys in our style specification don't have a defined order. This change sorts them alphabetically so that we can rely on the order remaining them same across code generation runs.
Diffstat (limited to 'include/mbgl/style/layers/fill_layer.hpp')
-rw-r--r-- | include/mbgl/style/layers/fill_layer.hpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index e4872a5fd8..e029ccc67e 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -30,24 +30,30 @@ public: void setFillAntialiasTransition(const TransitionOptions&); TransitionOptions getFillAntialiasTransition() const; - static PropertyValue<float> getDefaultFillOpacity(); - const PropertyValue<float>& getFillOpacity() const; - void setFillOpacity(const PropertyValue<float>&); - void setFillOpacityTransition(const TransitionOptions&); - TransitionOptions getFillOpacityTransition() const; - static PropertyValue<Color> getDefaultFillColor(); const PropertyValue<Color>& getFillColor() const; void setFillColor(const PropertyValue<Color>&); void setFillColorTransition(const TransitionOptions&); TransitionOptions getFillColorTransition() const; + static PropertyValue<float> getDefaultFillOpacity(); + const PropertyValue<float>& getFillOpacity() const; + void setFillOpacity(const PropertyValue<float>&); + void setFillOpacityTransition(const TransitionOptions&); + TransitionOptions getFillOpacityTransition() const; + static PropertyValue<Color> getDefaultFillOutlineColor(); const PropertyValue<Color>& getFillOutlineColor() const; void setFillOutlineColor(const PropertyValue<Color>&); void setFillOutlineColorTransition(const TransitionOptions&); TransitionOptions getFillOutlineColorTransition() const; + static PropertyValue<std::string> getDefaultFillPattern(); + const PropertyValue<std::string>& getFillPattern() const; + void setFillPattern(const PropertyValue<std::string>&); + void setFillPatternTransition(const TransitionOptions&); + TransitionOptions getFillPatternTransition() const; + static PropertyValue<std::array<float, 2>> getDefaultFillTranslate(); const PropertyValue<std::array<float, 2>>& getFillTranslate() const; void setFillTranslate(const PropertyValue<std::array<float, 2>>&); @@ -60,12 +66,6 @@ public: void setFillTranslateAnchorTransition(const TransitionOptions&); TransitionOptions getFillTranslateAnchorTransition() const; - static PropertyValue<std::string> getDefaultFillPattern(); - const PropertyValue<std::string>& getFillPattern() const; - void setFillPattern(const PropertyValue<std::string>&); - void setFillPatternTransition(const TransitionOptions&); - TransitionOptions getFillPatternTransition() const; - // Private implementation class Impl; |