summaryrefslogtreecommitdiff
path: root/src/mbgl/text
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/text
parent6feb89cbbc50d31557c3d74d3a7ca97b474a7507 (diff)
downloadqtlocation-mapboxgl-d5fb535058d4d97567b08064e0203f45c2c8370f.tar.gz
[core] add namespace comment to closing brace
Diffstat (limited to 'src/mbgl/text')
-rw-r--r--src/mbgl/text/check_max_angle.cpp2
-rw-r--r--src/mbgl/text/check_max_angle.hpp2
-rw-r--r--src/mbgl/text/collision_feature.cpp2
-rw-r--r--src/mbgl/text/collision_feature.hpp2
-rw-r--r--src/mbgl/text/collision_tile.cpp2
-rw-r--r--src/mbgl/text/get_anchors.cpp2
-rw-r--r--src/mbgl/text/get_anchors.hpp2
-rw-r--r--src/mbgl/text/glyph.cpp2
-rw-r--r--src/mbgl/text/glyph_pbf.cpp4
-rw-r--r--src/mbgl/text/glyph_pbf.hpp2
-rw-r--r--src/mbgl/text/glyph_store.cpp2
-rw-r--r--src/mbgl/text/glyph_store.hpp2
-rw-r--r--src/mbgl/text/quads.cpp2
-rw-r--r--src/mbgl/text/quads.hpp2
-rw-r--r--src/mbgl/text/shaping.cpp2
-rw-r--r--src/mbgl/text/shaping.hpp2
16 files changed, 17 insertions, 17 deletions
diff --git a/src/mbgl/text/check_max_angle.cpp b/src/mbgl/text/check_max_angle.cpp
index 73e7dd26be..6e94c2ec17 100644
--- a/src/mbgl/text/check_max_angle.cpp
+++ b/src/mbgl/text/check_max_angle.cpp
@@ -75,4 +75,4 @@ bool checkMaxAngle(const std::vector<Coordinate> &line, Anchor &anchor, const fl
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/check_max_angle.hpp b/src/mbgl/text/check_max_angle.hpp
index 5a881ebbad..1354abe95e 100644
--- a/src/mbgl/text/check_max_angle.hpp
+++ b/src/mbgl/text/check_max_angle.hpp
@@ -9,6 +9,6 @@ namespace mbgl {
bool checkMaxAngle(const std::vector<Coordinate> &line, Anchor &anchor, const float labelLength,
const float windowSize, const float maxAngle);
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/text/collision_feature.cpp b/src/mbgl/text/collision_feature.cpp
index 2a61e0b10e..a84e75c85a 100644
--- a/src/mbgl/text/collision_feature.cpp
+++ b/src/mbgl/text/collision_feature.cpp
@@ -92,4 +92,4 @@ void CollisionFeature::bboxifyLabel(const std::vector<Coordinate> &line,
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp
index 06056c2a20..f112e17d85 100644
--- a/src/mbgl/text/collision_feature.hpp
+++ b/src/mbgl/text/collision_feature.hpp
@@ -57,6 +57,6 @@ namespace mbgl {
private:
void bboxifyLabel(const std::vector<Coordinate> &line, const Anchor &anchor, const float length, const float height);
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/text/collision_tile.cpp b/src/mbgl/text/collision_tile.cpp
index ecd615a520..dbd9a6cb10 100644
--- a/src/mbgl/text/collision_tile.cpp
+++ b/src/mbgl/text/collision_tile.cpp
@@ -101,4 +101,4 @@ Box CollisionTile::getTreeBox(const vec2<float> &anchor, const CollisionBox &box
};
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/get_anchors.cpp b/src/mbgl/text/get_anchors.cpp
index c19bc24958..2f991d8e87 100644
--- a/src/mbgl/text/get_anchors.cpp
+++ b/src/mbgl/text/get_anchors.cpp
@@ -93,4 +93,4 @@ Anchors getAnchors(const std::vector<Coordinate> &line, float spacing,
return resample(line, offset, spacing, angleWindowSize, maxAngle, labelLength * boxScale, continuedLine, false);
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/get_anchors.hpp b/src/mbgl/text/get_anchors.hpp
index 3f737ee6c7..fcb0578d5b 100644
--- a/src/mbgl/text/get_anchors.hpp
+++ b/src/mbgl/text/get_anchors.hpp
@@ -10,6 +10,6 @@ Anchors getAnchors(const std::vector<Coordinate> &line, float spacing,
const float maxAngle, const float textLeft, const float textRight,
const float iconLeft, const float iconRight,
const float glyphSize, const float boxScale, const float overscaling);
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/text/glyph.cpp b/src/mbgl/text/glyph.cpp
index 3dca03504c..a877d7a799 100644
--- a/src/mbgl/text/glyph.cpp
+++ b/src/mbgl/text/glyph.cpp
@@ -11,4 +11,4 @@ GlyphRange getGlyphRange(char32_t glyph) {
return { start, end };
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/glyph_pbf.cpp b/src/mbgl/text/glyph_pbf.cpp
index 9d7deb238d..c14f52de7a 100644
--- a/src/mbgl/text/glyph_pbf.cpp
+++ b/src/mbgl/text/glyph_pbf.cpp
@@ -59,7 +59,7 @@ void parseGlyphPBF(mbgl::FontStack& stack, const std::string& data) {
}
}
-}
+} // namespace
namespace mbgl {
@@ -138,4 +138,4 @@ void GlyphPBF::emitGlyphPBFLoadingFailed(const std::string& message) {
observer->onGlyphPBFLoadingFailed(error);
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/glyph_pbf.hpp b/src/mbgl/text/glyph_pbf.hpp
index 69d7747471..d595298516 100644
--- a/src/mbgl/text/glyph_pbf.hpp
+++ b/src/mbgl/text/glyph_pbf.hpp
@@ -50,6 +50,6 @@ private:
Observer* observer = nullptr;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/text/glyph_store.cpp b/src/mbgl/text/glyph_store.cpp
index 4c9a74b7e9..047db17b7d 100644
--- a/src/mbgl/text/glyph_store.cpp
+++ b/src/mbgl/text/glyph_store.cpp
@@ -82,4 +82,4 @@ void GlyphStore::setObserver(Observer* observer_) {
observer = observer_;
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/glyph_store.hpp b/src/mbgl/text/glyph_store.hpp
index 1f569664f2..4e665087ea 100644
--- a/src/mbgl/text/glyph_store.hpp
+++ b/src/mbgl/text/glyph_store.hpp
@@ -70,6 +70,6 @@ private:
Observer* observer = nullptr;
};
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp
index 379a6e71ee..20427924a4 100644
--- a/src/mbgl/text/quads.cpp
+++ b/src/mbgl/text/quads.cpp
@@ -208,4 +208,4 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText,
return quads;
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp
index 814452a72f..cdf7c23627 100644
--- a/src/mbgl/text/quads.hpp
+++ b/src/mbgl/text/quads.hpp
@@ -43,6 +43,6 @@ namespace mbgl {
SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText,
const float boxScale, const std::vector<Coordinate>& line, const SymbolLayoutProperties& layout,
const bool alongLine, const GlyphPositions& face);
-}
+} // namespace mbgl
#endif
diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp
index 6709a49aa2..735841e8ca 100644
--- a/src/mbgl/text/shaping.cpp
+++ b/src/mbgl/text/shaping.cpp
@@ -14,4 +14,4 @@ PositionedIcon shapeIcon(const Rect<uint16_t>& image, const SymbolLayoutProperti
return PositionedIcon(image, y1, y2, x1, x2);
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp
index 32b34cf5be..acf8c470bf 100644
--- a/src/mbgl/text/shaping.hpp
+++ b/src/mbgl/text/shaping.hpp
@@ -26,6 +26,6 @@ namespace mbgl {
PositionedIcon shapeIcon(const Rect<uint16_t>& image, const SymbolLayoutProperties&);
-}
+} // namespace mbgl
#endif