diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-02-10 13:59:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-19 19:36:25 +0100 |
| commit | 4de3c5db238f45404feb6c6ce60810a3e11eae84 (patch) | |
| tree | bc0a4d7af2f757fed94c1b52ca6bcd0e74bae25f /src/gui/text/qfontengine_ft_p.h | |
| parent | 30fd22b9574def54726e7b193127cc0c901c1b4c (diff) | |
Unify glyph format between QFontEngine and QFontEngineGlyphCache
Instead of the glyph cache having its own cache type that always mapped
one to one to a font engine glyph format, causing confusion and needless
conversions, the glyph caches now use QFontEngine's glyph format enum.
This also removes the iffy use of an int for the glyphFormat in the font
engines.
Change-Id: I529bad5c179e004f63e152f7dcc311d298c3db98
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/gui/text/qfontengine_ft_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_ft_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index 7df66b9678..ad1598ba6d 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -264,7 +264,7 @@ private: virtual void unlockAlphaMapForGlyph(); virtual void removeGlyphFromCache(glyph_t glyph); - virtual int glyphMargin(QFontEngineGlyphCache::Type /* type */) { return 0; } + virtual int glyphMargin(QFontEngine::GlyphFormat /* format */) { return 0; } virtual int glyphCount() const; |