summaryrefslogtreecommitdiff
path: root/src/mbgl/style/layers/background_layer.cpp
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-25 23:31:56 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-26 11:57:39 +0300
commite78c31c4b53326f260a4274018b5cb98fac0dbb6 (patch)
treec81f74500b9a1d5a618ee2b12b54324ceaeec175 /src/mbgl/style/layers/background_layer.cpp
parentb5862c212769ee1372e4005dd1b96d49b72171e3 (diff)
downloadqtlocation-mapboxgl-e78c31c4b53326f260a4274018b5cb98fac0dbb6.tar.gz
[core] LayerProperty -> StyleProperty
Diffstat (limited to 'src/mbgl/style/layers/background_layer.cpp')
-rw-r--r--src/mbgl/style/layers/background_layer.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp
index 735d653e85..0e9e95d51a 100644
--- a/src/mbgl/style/layers/background_layer.cpp
+++ b/src/mbgl/style/layers/background_layer.cpp
@@ -150,7 +150,7 @@ using namespace conversion;
namespace {
-enum class Property {
+enum class Property : uint8_t {
BackgroundColor,
BackgroundOpacity,
BackgroundPattern,
@@ -244,7 +244,7 @@ optional<Error> BackgroundLayer::setPaintProperty(const std::string& name, const
return Error{"layer doesn't support this property"};
}
-LayerProperty BackgroundLayer::getPaintProperty(const std::string& name) const {
+StyleProperty BackgroundLayer::getPaintProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};
@@ -252,17 +252,17 @@ LayerProperty BackgroundLayer::getPaintProperty(const std::string& name) const {
switch (static_cast<Property>(it->second)) {
case Property::BackgroundColor:
- return makeLayerProperty(getBackgroundColor());
+ return makeStyleProperty(getBackgroundColor());
case Property::BackgroundOpacity:
- return makeLayerProperty(getBackgroundOpacity());
+ return makeStyleProperty(getBackgroundOpacity());
case Property::BackgroundPattern:
- return makeLayerProperty(getBackgroundPattern());
+ return makeStyleProperty(getBackgroundPattern());
case Property::BackgroundColorTransition:
- return makeLayerProperty(getBackgroundColorTransition());
+ return makeStyleProperty(getBackgroundColorTransition());
case Property::BackgroundOpacityTransition:
- return makeLayerProperty(getBackgroundOpacityTransition());
+ return makeStyleProperty(getBackgroundOpacityTransition());
case Property::BackgroundPatternTransition:
- return makeLayerProperty(getBackgroundPatternTransition());
+ return makeStyleProperty(getBackgroundPatternTransition());
}
return {};
}