From 3482c451aca41fd61ee4746fe991f1baab8ae84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 24 Jul 2013 23:46:55 +0200 Subject: [PATCH] Text: no need to have virtual destructor here. Protected constructor and destructor is sufficient, AbstractTextRenderer itself isn't meant to be deleted (via pointer). --- src/Text/TextRenderer.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Text/TextRenderer.h b/src/Text/TextRenderer.h index ce0d0b0db..3c38429ad 100644 --- a/src/Text/TextRenderer.h +++ b/src/Text/TextRenderer.h @@ -62,16 +62,6 @@ class MAGNUM_TEXT_EXPORT AbstractTextRenderer { */ static std::tuple, std::vector, std::vector, Rectangle> render(AbstractFont* font, const GlyphCache* cache, Float size, const std::string& text); - /** - * @brief Constructor - * @param font Font - * @param cache Glyph cache - * @param size Font size - */ - explicit AbstractTextRenderer(AbstractFont* font, const GlyphCache* cache, Float size); - - virtual ~AbstractTextRenderer() = 0; - /** * @brief Capacity for rendered glyphs * @@ -118,6 +108,17 @@ class MAGNUM_TEXT_EXPORT AbstractTextRenderer { */ void render(const std::string& text); + protected: + /** + * @brief Constructor + * @param font Font + * @param cache Glyph cache + * @param size Font size + */ + explicit AbstractTextRenderer(AbstractFont* font, const GlyphCache* cache, Float size); + + ~AbstractTextRenderer(); + #ifndef DOXYGEN_GENERATING_OUTPUT protected: #else