From 34ab7be2251bc8f6afca29c7a2ce3b6f1bc7cb10 Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Thu, 26 Sep 2019 14:58:00 +0300
Subject: [core] Layer::getPaintProperty() -> Layer::getProperty()

---
 src/mbgl/style/layers/background_layer.cpp     | 2 +-
 src/mbgl/style/layers/circle_layer.cpp         | 2 +-
 src/mbgl/style/layers/custom_layer.cpp         | 2 +-
 src/mbgl/style/layers/fill_extrusion_layer.cpp | 2 +-
 src/mbgl/style/layers/fill_layer.cpp           | 2 +-
 src/mbgl/style/layers/heatmap_layer.cpp        | 2 +-
 src/mbgl/style/layers/hillshade_layer.cpp      | 2 +-
 src/mbgl/style/layers/layer.cpp.ejs            | 2 +-
 src/mbgl/style/layers/line_layer.cpp           | 2 +-
 src/mbgl/style/layers/raster_layer.cpp         | 2 +-
 src/mbgl/style/layers/symbol_layer.cpp         | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp
index 0e9e95d51a..0a83af537c 100644
--- a/src/mbgl/style/layers/background_layer.cpp
+++ b/src/mbgl/style/layers/background_layer.cpp
@@ -244,7 +244,7 @@ optional<Error> BackgroundLayer::setPaintProperty(const std::string& name, const
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty BackgroundLayer::getPaintProperty(const std::string& name) const {
+StyleProperty BackgroundLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp
index 8b5359149c..f174aacadb 100644
--- a/src/mbgl/style/layers/circle_layer.cpp
+++ b/src/mbgl/style/layers/circle_layer.cpp
@@ -597,7 +597,7 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty CircleLayer::getPaintProperty(const std::string& name) const {
+StyleProperty CircleLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/custom_layer.cpp b/src/mbgl/style/layers/custom_layer.cpp
index 98ca68aa48..e13cf0069a 100644
--- a/src/mbgl/style/layers/custom_layer.cpp
+++ b/src/mbgl/style/layers/custom_layer.cpp
@@ -47,7 +47,7 @@ optional<Error> CustomLayer::setLayoutProperty(const std::string&, const Convert
     return Error { "layer doesn't support this property" };
 }
 
-StyleProperty CustomLayer::getPaintProperty(const std::string&) const {
+StyleProperty CustomLayer::getProperty(const std::string&) const {
     return {};
 }
 
diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp
index 690d74b2f5..a24ea6416a 100644
--- a/src/mbgl/style/layers/fill_extrusion_layer.cpp
+++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp
@@ -479,7 +479,7 @@ optional<Error> FillExtrusionLayer::setPaintProperty(const std::string& name, co
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty FillExtrusionLayer::getPaintProperty(const std::string& name) const {
+StyleProperty FillExtrusionLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp
index e4f2a8cc53..6b4b15f83f 100644
--- a/src/mbgl/style/layers/fill_layer.cpp
+++ b/src/mbgl/style/layers/fill_layer.cpp
@@ -431,7 +431,7 @@ optional<Error> FillLayer::setPaintProperty(const std::string& name, const Conve
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty FillLayer::getPaintProperty(const std::string& name) const {
+StyleProperty FillLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp
index 5cda778d0f..f1da87928d 100644
--- a/src/mbgl/style/layers/heatmap_layer.cpp
+++ b/src/mbgl/style/layers/heatmap_layer.cpp
@@ -332,7 +332,7 @@ optional<Error> HeatmapLayer::setPaintProperty(const std::string& name, const Co
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty HeatmapLayer::getPaintProperty(const std::string& name) const {
+StyleProperty HeatmapLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp
index 7e67409a35..28a3d903da 100644
--- a/src/mbgl/style/layers/hillshade_layer.cpp
+++ b/src/mbgl/style/layers/hillshade_layer.cpp
@@ -371,7 +371,7 @@ optional<Error> HillshadeLayer::setPaintProperty(const std::string& name, const
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty HillshadeLayer::getPaintProperty(const std::string& name) const {
+StyleProperty HillshadeLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs
index 723c2b87ca..69f7ed1765 100644
--- a/src/mbgl/style/layers/layer.cpp.ejs
+++ b/src/mbgl/style/layers/layer.cpp.ejs
@@ -265,7 +265,7 @@ optional<Error> <%- camelize(type) %>Layer::setPaintProperty(const std::string&
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty <%- camelize(type) %>Layer::getPaintProperty(const std::string& name) const {
+StyleProperty <%- camelize(type) %>Layer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp
index 96b84ee1c5..da2c801e10 100644
--- a/src/mbgl/style/layers/line_layer.cpp
+++ b/src/mbgl/style/layers/line_layer.cpp
@@ -668,7 +668,7 @@ optional<Error> LineLayer::setPaintProperty(const std::string& name, const Conve
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty LineLayer::getPaintProperty(const std::string& name) const {
+StyleProperty LineLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp
index 20640020e0..2e548dfa5b 100644
--- a/src/mbgl/style/layers/raster_layer.cpp
+++ b/src/mbgl/style/layers/raster_layer.cpp
@@ -444,7 +444,7 @@ optional<Error> RasterLayer::setPaintProperty(const std::string& name, const Con
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty RasterLayer::getPaintProperty(const std::string& name) const {
+StyleProperty RasterLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp
index 86c049e509..50906c51e2 100644
--- a/src/mbgl/style/layers/symbol_layer.cpp
+++ b/src/mbgl/style/layers/symbol_layer.cpp
@@ -1367,7 +1367,7 @@ optional<Error> SymbolLayer::setPaintProperty(const std::string& name, const Con
     return Error{"layer doesn't support this property"};
 }
 
-StyleProperty SymbolLayer::getPaintProperty(const std::string& name) const {
+StyleProperty SymbolLayer::getProperty(const std::string& name) const {
     const auto it = paintProperties.find(name.c_str());
     if (it == paintProperties.end()) {
         return {};
-- 
cgit v1.2.1