diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-17 13:07:27 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-18 23:46:50 +0300 |
commit | c20c1d6a6b3eb301db88ca3e74993f445cc4d839 (patch) | |
tree | 7011952bc5cc49d62b2be4b96ba3c3c7bbd3e54d /src/mbgl/text/glyph.hpp | |
parent | 41497e9c4174d310f3a62548f3cfeb9da2852849 (diff) | |
download | qtlocation-mapboxgl-c20c1d6a6b3eb301db88ca3e74993f445cc4d839.tar.gz |
[core] Avoid redundant 'inline' usage
Diffstat (limited to 'src/mbgl/text/glyph.hpp')
-rw-r--r-- | src/mbgl/text/glyph.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/text/glyph.hpp b/src/mbgl/text/glyph.hpp index ce07b1b3fd..975dc4ad23 100644 --- a/src/mbgl/text/glyph.hpp +++ b/src/mbgl/text/glyph.hpp @@ -28,8 +28,8 @@ struct GlyphMetrics { }; struct Glyph { - inline explicit Glyph() : rect(0, 0, 0, 0), metrics() {} - inline explicit Glyph(Rect<uint16_t> rect_, GlyphMetrics metrics_) + explicit Glyph() : rect(0, 0, 0, 0), metrics() {} + explicit Glyph(Rect<uint16_t> rect_, GlyphMetrics metrics_) : rect(std::move(rect_)), metrics(std::move(metrics_)) {} operator bool() const { @@ -44,7 +44,7 @@ typedef std::map<uint32_t, Glyph> GlyphPositions; class PositionedGlyph { public: - inline explicit PositionedGlyph(uint32_t glyph_, float x_, float y_) + explicit PositionedGlyph(uint32_t glyph_, float x_, float y_) : glyph(glyph_), x(x_), y(y_) {} uint32_t glyph = 0; @@ -54,8 +54,8 @@ public: class Shaping { public: - inline explicit Shaping() : top(0), bottom(0), left(0), right(0) {} - inline explicit Shaping(float x, float y, std::u32string text_) + explicit Shaping() : top(0), bottom(0), left(0), right(0) {} + explicit Shaping(float x, float y, std::u32string text_) : text(std::move(text_)), top(y), bottom(y), left(x), right(x) {} std::vector<PositionedGlyph> positionedGlyphs; std::u32string text; |