summaryrefslogtreecommitdiff
path: root/src/mbgl/style
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-12-01 17:30:44 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-12-03 15:38:36 +0100
commitd5fb535058d4d97567b08064e0203f45c2c8370f (patch)
treef10e6d116f86405f1a432a6dc2fbc0122749169d /src/mbgl/style
parent6feb89cbbc50d31557c3d74d3a7ca97b474a7507 (diff)
downloadqtlocation-mapboxgl-d5fb535058d4d97567b08064e0203f45c2c8370f.tar.gz
[core] add namespace comment to closing brace
Diffstat (limited to 'src/mbgl/style')
-rw-r--r--src/mbgl/style/class_dictionary.cpp2
-rw-r--r--src/mbgl/style/class_dictionary.hpp2
-rw-r--r--src/mbgl/style/filter_expression.cpp2
-rw-r--r--src/mbgl/style/filter_expression.hpp2
-rw-r--r--src/mbgl/style/filter_expression_private.hpp2
-rw-r--r--src/mbgl/style/function.cpp2
-rw-r--r--src/mbgl/style/function.hpp2
-rw-r--r--src/mbgl/style/layout_property.hpp2
-rw-r--r--src/mbgl/style/paint_property.hpp2
-rw-r--r--src/mbgl/style/property_parsing.cpp2
-rw-r--r--src/mbgl/style/property_parsing.hpp2
-rw-r--r--src/mbgl/style/property_transition.hpp2
-rw-r--r--src/mbgl/style/style.cpp2
-rw-r--r--src/mbgl/style/style.hpp2
-rw-r--r--src/mbgl/style/style_bucket_parameters.cpp2
-rw-r--r--src/mbgl/style/style_bucket_parameters.hpp2
-rw-r--r--src/mbgl/style/style_calculation_parameters.hpp2
-rw-r--r--src/mbgl/style/style_cascade_parameters.hpp2
-rw-r--r--src/mbgl/style/style_layer.cpp2
-rw-r--r--src/mbgl/style/style_layer.hpp2
-rw-r--r--src/mbgl/style/style_parser.cpp2
-rw-r--r--src/mbgl/style/style_parser.hpp2
-rw-r--r--src/mbgl/style/value.hpp4
-rw-r--r--src/mbgl/style/value_comparison.hpp4
-rw-r--r--src/mbgl/style/zoom_history.hpp2
25 files changed, 27 insertions, 27 deletions
diff --git a/src/mbgl/style/class_dictionary.cpp b/src/mbgl/style/class_dictionary.cpp
index 021f791adc..53ea5c1484 100644
--- a/src/mbgl/style/class_dictionary.cpp
+++ b/src/mbgl/style/class_dictionary.cpp
@@ -46,4 +46,4 @@ ClassID ClassDictionary::normalize(ClassID id) {
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/class_dictionary.hpp b/src/mbgl/style/class_dictionary.hpp
index ecf80be3e3..8a06a77c7a 100644
--- a/src/mbgl/style/class_dictionary.hpp
+++ b/src/mbgl/style/class_dictionary.hpp
@@ -32,6 +32,6 @@ private:
uint32_t offset = 0;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/filter_expression.cpp b/src/mbgl/style/filter_expression.cpp
index bb755c5644..a93674410c 100644
--- a/src/mbgl/style/filter_expression.cpp
+++ b/src/mbgl/style/filter_expression.cpp
@@ -125,4 +125,4 @@ FilterExpression parseFilterExpression(const rapidjson::Value& value) {
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/filter_expression.hpp b/src/mbgl/style/filter_expression.hpp
index 8c6f447770..7fe244632f 100644
--- a/src/mbgl/style/filter_expression.hpp
+++ b/src/mbgl/style/filter_expression.hpp
@@ -120,6 +120,6 @@ struct NoneExpression {
bool evaluate(const Extractor&) const;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/filter_expression_private.hpp b/src/mbgl/style/filter_expression_private.hpp
index ff6301b7c6..67a37c2d4c 100644
--- a/src/mbgl/style/filter_expression_private.hpp
+++ b/src/mbgl/style/filter_expression_private.hpp
@@ -116,4 +116,4 @@ bool NoneExpression::evaluate(const Extractor& extractor) const {
return true;
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/function.cpp b/src/mbgl/style/function.cpp
index c656f86888..88fb1d6a9b 100644
--- a/src/mbgl/style/function.cpp
+++ b/src/mbgl/style/function.cpp
@@ -136,4 +136,4 @@ Faded<T> Function<Faded<T>>::evaluate(const StyleCalculationParameters& paramete
template class Function<Faded<std::string>>;
template class Function<Faded<std::vector<float>>>;
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/function.hpp b/src/mbgl/style/function.hpp
index 3f5c479512..00d4319e0b 100644
--- a/src/mbgl/style/function.hpp
+++ b/src/mbgl/style/function.hpp
@@ -53,6 +53,6 @@ private:
std::vector<std::pair<float, T>> stops;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/layout_property.hpp b/src/mbgl/style/layout_property.hpp
index 5634efd0a3..7feb931204 100644
--- a/src/mbgl/style/layout_property.hpp
+++ b/src/mbgl/style/layout_property.hpp
@@ -33,6 +33,6 @@ public:
T value;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp
index a82bf028ba..88feb1307b 100644
--- a/src/mbgl/style/paint_property.hpp
+++ b/src/mbgl/style/paint_property.hpp
@@ -147,6 +147,6 @@ public:
Result value;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/property_parsing.cpp b/src/mbgl/style/property_parsing.cpp
index 9a67af8eb2..63e1fe57e9 100644
--- a/src/mbgl/style/property_parsing.cpp
+++ b/src/mbgl/style/property_parsing.cpp
@@ -404,4 +404,4 @@ optional<Function<Faded<std::string>>> parseProperty(const char* name, const JSV
return Function<Faded<std::string>>(*constant);
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/property_parsing.hpp b/src/mbgl/style/property_parsing.hpp
index c4547a9e1e..d287468e79 100644
--- a/src/mbgl/style/property_parsing.hpp
+++ b/src/mbgl/style/property_parsing.hpp
@@ -18,6 +18,6 @@ using optional = mapbox::util::optional<T>;
template <typename T>
optional<T> parseProperty(const char* name, const JSVal&);
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/property_transition.hpp b/src/mbgl/style/property_transition.hpp
index 1cf1de0932..63bbf4607d 100644
--- a/src/mbgl/style/property_transition.hpp
+++ b/src/mbgl/style/property_transition.hpp
@@ -14,6 +14,6 @@ public:
mapbox::util::optional<Duration> delay;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index eb4f5a05ae..bb447b9a9e 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -379,4 +379,4 @@ void Style::dumpDebugLogs() const {
spriteStore->dumpDebugLogs();
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 26b94d18f7..f1e6145c3a 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -144,6 +144,6 @@ public:
Worker workers;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/style_bucket_parameters.cpp b/src/mbgl/style/style_bucket_parameters.cpp
index 1f9b5ab1c0..e8303e3d8f 100644
--- a/src/mbgl/style/style_bucket_parameters.cpp
+++ b/src/mbgl/style/style_bucket_parameters.cpp
@@ -16,4 +16,4 @@ void StyleBucketParameters::eachFilteredFeature(const FilterExpression& filter,
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/style_bucket_parameters.hpp b/src/mbgl/style/style_bucket_parameters.hpp
index 1650ddab8a..5a84a33d48 100644
--- a/src/mbgl/style/style_bucket_parameters.hpp
+++ b/src/mbgl/style/style_bucket_parameters.hpp
@@ -54,6 +54,6 @@ public:
CollisionTile& collisionTile;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/style_calculation_parameters.hpp b/src/mbgl/style/style_calculation_parameters.hpp
index 0c42d8fbfc..00a578d4e7 100644
--- a/src/mbgl/style/style_calculation_parameters.hpp
+++ b/src/mbgl/style/style_calculation_parameters.hpp
@@ -26,6 +26,6 @@ public:
Duration defaultFadeDuration;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/style_cascade_parameters.hpp b/src/mbgl/style/style_cascade_parameters.hpp
index 154890fd97..f801aa52c9 100644
--- a/src/mbgl/style/style_cascade_parameters.hpp
+++ b/src/mbgl/style/style_cascade_parameters.hpp
@@ -24,6 +24,6 @@ public:
PropertyTransition defaultTransition;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/style_layer.cpp b/src/mbgl/style/style_layer.cpp
index 75209afcce..3220a018a7 100644
--- a/src/mbgl/style/style_layer.cpp
+++ b/src/mbgl/style/style_layer.cpp
@@ -47,4 +47,4 @@ void StyleLayer::copy(const StyleLayer& src) {
visibility = src.visibility;
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp
index a1a0389fbe..ec29cc6790 100644
--- a/src/mbgl/style/style_layer.hpp
+++ b/src/mbgl/style/style_layer.hpp
@@ -65,6 +65,6 @@ protected:
void copy(const StyleLayer& source);
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp
index dd2f6e0f73..097f1af941 100644
--- a/src/mbgl/style/style_parser.cpp
+++ b/src/mbgl/style/style_parser.cpp
@@ -288,4 +288,4 @@ void StyleParser::parseVisibility(StyleLayer& layer, const JSVal& value) {
layer.visibility = VisibilityTypeClass({ value["visibility"].GetString(), value["visibility"].GetStringLength() });
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp
index 5ee2415abd..2c5a43065d 100644
--- a/src/mbgl/style/style_parser.hpp
+++ b/src/mbgl/style/style_parser.hpp
@@ -44,6 +44,6 @@ private:
std::forward_list<std::string> stack;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/value.hpp b/src/mbgl/style/value.hpp
index 4649134b20..0f3127e4f9 100644
--- a/src/mbgl/style/value.hpp
+++ b/src/mbgl/style/value.hpp
@@ -23,7 +23,7 @@ inline bool parseNumericString(const std::string &str, double &result) {
while (*end != '\0' && isspace(*end)) end++; // eat whitespace after the end
return errno == 0 && end - begin == long(str.size());
}
-}
+} // namespace util
template <typename T>
T toNumber(const Value &value) {
@@ -38,6 +38,6 @@ T toNumber(const Value &value) {
else return 0;
}
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/value_comparison.hpp b/src/mbgl/style/value_comparison.hpp
index 895c8a0869..9f6ae3a0de 100644
--- a/src/mbgl/style/value_comparison.hpp
+++ b/src/mbgl/style/value_comparison.hpp
@@ -102,8 +102,8 @@ inline bool relaxed_less_equal(Value const &lhs, Value const &rhs) {
return apply_visitor(detail::relaxed_operator_visitor<detail::relaxed_less_equal_operator>(), lhs, rhs);
}
-}
+} // namespace util
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/style/zoom_history.hpp b/src/mbgl/style/zoom_history.hpp
index 9eb76e5ec1..4e01af1fdd 100644
--- a/src/mbgl/style/zoom_history.hpp
+++ b/src/mbgl/style/zoom_history.hpp
@@ -34,6 +34,6 @@ struct ZoomHistory {
lastZoom = z;
}
};
-}
+} // namespace mbgl
#endif