diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-12-02 17:50:41 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-12-02 17:50:51 +0200 |
commit | 7bbb39777e0537a04cfcef3e7a9fded73e042714 (patch) | |
tree | f5dd914b750a2a6018efd04565802452b62ffbee | |
parent | ddd0655181a3997a7235df90e61433b9a421723e (diff) | |
download | qtlocation-mapboxgl-7bbb39777e0537a04cfcef3e7a9fded73e042714.tar.gz |
[core] Disable clang format for Layer::setProperty()
-rw-r--r-- | src/mbgl/style/layers/background_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/circle_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/fill_extrusion_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/fill_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/heatmap_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/hillshade_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/layer.cpp.ejs | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/line_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/raster_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/symbol_layer.cpp | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp index e06b4d84a5..45bbcee71b 100644 --- a/src/mbgl/style/layers/background_layer.cpp +++ b/src/mbgl/style/layers/background_layer.cpp @@ -172,6 +172,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> BackgroundLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -239,6 +240,7 @@ optional<Error> BackgroundLayer::setProperty(const std::string& name, const Conv } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty BackgroundLayer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp index 2575ca3222..9ddf870118 100644 --- a/src/mbgl/style/layers/circle_layer.cpp +++ b/src/mbgl/style/layers/circle_layer.cpp @@ -420,6 +420,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> CircleLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -592,6 +593,7 @@ optional<Error> CircleLayer::setProperty(const std::string& name, const Converti } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty CircleLayer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp index d6f7f080be..8029aab4ed 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp @@ -327,6 +327,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> FillExtrusionLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -474,6 +475,7 @@ optional<Error> FillExtrusionLayer::setProperty(const std::string& name, const C } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty FillExtrusionLayer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp index 00101057ce..98ba4b317a 100644 --- a/src/mbgl/style/layers/fill_layer.cpp +++ b/src/mbgl/style/layers/fill_layer.cpp @@ -296,6 +296,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> FillLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -426,6 +427,7 @@ optional<Error> FillLayer::setProperty(const std::string& name, const Convertibl } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty FillLayer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp index c8a39c01c7..f99444e66d 100644 --- a/src/mbgl/style/layers/heatmap_layer.cpp +++ b/src/mbgl/style/layers/heatmap_layer.cpp @@ -236,6 +236,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> HeatmapLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -327,6 +328,7 @@ optional<Error> HeatmapLayer::setProperty(const std::string& name, const Convert } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty HeatmapLayer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp index 02ce73df7c..14e6057f00 100644 --- a/src/mbgl/style/layers/hillshade_layer.cpp +++ b/src/mbgl/style/layers/hillshade_layer.cpp @@ -265,6 +265,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> HillshadeLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -366,6 +367,7 @@ optional<Error> HillshadeLayer::setProperty(const std::string& name, const Conve } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty HillshadeLayer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs index 0de442530e..a07c7a04cc 100644 --- a/src/mbgl/style/layers/layer.cpp.ejs +++ b/src/mbgl/style/layers/layer.cpp.ejs @@ -228,6 +228,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> <%- camelize(type) %>Layer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -284,6 +285,7 @@ optional<Error> <%- camelize(type) %>Layer::setProperty(const std::string& name, } <% } %> return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty <%- camelize(type) %>Layer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp index 6c6b06ed34..e0b3115ec6 100644 --- a/src/mbgl/style/layers/line_layer.cpp +++ b/src/mbgl/style/layers/line_layer.cpp @@ -494,6 +494,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> LineLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -714,6 +715,7 @@ optional<Error> LineLayer::setProperty(const std::string& name, const Convertibl } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty LineLayer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp index ec2ae2c1df..20ac863bf0 100644 --- a/src/mbgl/style/layers/raster_layer.cpp +++ b/src/mbgl/style/layers/raster_layer.cpp @@ -327,6 +327,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> RasterLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -439,6 +440,7 @@ optional<Error> RasterLayer::setProperty(const std::string& name, const Converti } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty RasterLayer::getProperty(const std::string& name) const { diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 3b682ef7f1..ed3c92efb4 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -1252,6 +1252,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map< } // namespace optional<Error> SymbolLayer::setProperty(const std::string& name, const Convertible& value) { + // clang-format off const auto it = layerProperties.find(name.c_str()); if (it == layerProperties.end()) { if (name == "visibility") return setVisibility(value); @@ -1771,6 +1772,7 @@ optional<Error> SymbolLayer::setProperty(const std::string& name, const Converti } return Error{"layer doesn't support this property"}; + // clang-format on } StyleProperty SymbolLayer::getProperty(const std::string& name) const { |