Browse Source

Text: removed redundant `inline` keyword.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
345abcc7ba
  1. 4
      src/Text/AbstractFont.h
  2. 8
      src/Text/GlyphCache.h
  3. 6
      src/Text/TextRenderer.h

4
src/Text/AbstractFont.h

@ -87,7 +87,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
virtual void close() = 0; virtual void close() = 0;
/** @brief Font size */ /** @brief Font size */
inline Float size() const { return _size; } Float size() const { return _size; }
/** /**
* @brief Create glyph cache for given character set * @brief Create glyph cache for given character set
@ -132,7 +132,7 @@ class MAGNUM_TEXT_EXPORT AbstractLayouter {
virtual ~AbstractLayouter() = 0; virtual ~AbstractLayouter() = 0;
/** @brief Count of glyphs in laid out text */ /** @brief Count of glyphs in laid out text */
inline UnsignedInt glyphCount() const { UnsignedInt glyphCount() const {
return _glyphCount; return _glyphCount;
} }

8
src/Text/GlyphCache.h

@ -81,13 +81,13 @@ class MAGNUM_TEXT_EXPORT GlyphCache {
* *
* Size of unscaled glyph cache texture. * Size of unscaled glyph cache texture.
*/ */
inline Vector2i textureSize() const { return _size; } Vector2i textureSize() const { return _size; }
/** @brief Count of glyphs in the cache */ /** @brief Count of glyphs in the cache */
inline std::size_t glyphCount() const { return glyphs.size(); } std::size_t glyphCount() const { return glyphs.size(); }
/** @brief Cache texture */ /** @brief Cache texture */
inline Texture2D* texture() { return &_texture; } Texture2D* texture() { return &_texture; }
/** /**
* @brief Parameters of given glyph * @brief Parameters of given glyph
@ -97,7 +97,7 @@ class MAGNUM_TEXT_EXPORT GlyphCache {
* second element is glyph region in texture atlas. If no glyph is * second element is glyph region in texture atlas. If no glyph is
* found, glyph on zero index is returned. * found, glyph on zero index is returned.
*/ */
inline std::pair<Vector2i, Rectanglei> operator[](UnsignedInt glyph) const { std::pair<Vector2i, Rectanglei> operator[](UnsignedInt glyph) const {
auto it = glyphs.find(glyph); auto it = glyphs.find(glyph);
return it == glyphs.end() ? glyphs.at(0) : it->second; return it == glyphs.end() ? glyphs.at(0) : it->second;
} }

6
src/Text/TextRenderer.h

@ -77,13 +77,13 @@ class MAGNUM_TEXT_EXPORT AbstractTextRenderer {
* *
* @see reserve() * @see reserve()
*/ */
inline UnsignedInt capacity() const { return _capacity; } UnsignedInt capacity() const { return _capacity; }
/** @brief Rectangle spanning the rendered text */ /** @brief Rectangle spanning the rendered text */
inline Rectangle rectangle() const { return _rectangle; } Rectangle rectangle() const { return _rectangle; }
/** @brief Text mesh */ /** @brief Text mesh */
inline Mesh* mesh() { return &_mesh; } Mesh* mesh() { return &_mesh; }
/** /**
* @brief Reserve capacity for rendered glyphs * @brief Reserve capacity for rendered glyphs

Loading…
Cancel
Save