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>

1 files changed, 7 insertions, 10 deletions

diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h
index ac01c78399..65be14b90f 100644
--- a/src/gui/text/qfontengineglyphcache_p.h
+++ b/src/gui/text/qfontengineglyphcache_p.h
@@ -58,6 +58,7 @@
 #include "QtCore/qatomic.h"
 #include <QtCore/qvarlengtharray.h>
 #include "private/qfont_p.h"
+#include "private/qfontengine_p.h"
 
 
 
@@ -66,22 +67,18 @@ QT_BEGIN_NAMESPACE
 class QFontEngineGlyphCache: public QSharedData
 {
 public:
-    enum Type {
-        Raster_RGBMask,
-        Raster_A8,
-        Raster_Mono,
-        Raster_ARGB
-    };
-
-    QFontEngineGlyphCache(const QTransform &matrix, Type type) : m_transform(matrix), m_type(type) { }
+    QFontEngineGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix) : m_format(format), m_transform(matrix)
+    {
+        Q_ASSERT(m_format != QFontEngine::Format_None);
+    }
 
     virtual ~QFontEngineGlyphCache() { }
 
-    Type cacheType() const { return m_type; }
+    QFontEngine::GlyphFormat glyphFormat() const { return m_format; }
     const QTransform &transform() const { return m_transform; }
 
+    QFontEngine::GlyphFormat m_format;
     QTransform m_transform;
-    QFontEngineGlyphCache::Type m_type;
 };
 typedef QHash<void *, QList<QFontEngineGlyphCache *> > GlyphPointerHash;
 typedef QHash<int, QList<QFontEngineGlyphCache *> > GlyphIntHash;