diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/painting/qtextureglyphcache_p.h --- a/src/gui/painting/qtextureglyphcache_p.h Tue Jan 26 12:42:25 2010 +0200 +++ b/src/gui/painting/qtextureglyphcache_p.h Tue Feb 02 00:43:10 2010 +0200 @@ -76,7 +76,7 @@ { public: QTextureGlyphCache(QFontEngineGlyphCache::Type type, const QTransform &matrix) - : QFontEngineGlyphCache(matrix), m_w(0), m_h(0), m_cx(0), m_cy(0), m_type(type) { } + : QFontEngineGlyphCache(matrix, type), m_w(0), m_h(0), m_cx(0), m_cy(0) { } virtual ~QTextureGlyphCache() { } @@ -98,8 +98,6 @@ virtual void resizeTextureData(int width, int height) = 0; virtual int glyphMargin() const { return 0; } - QFontEngineGlyphCache::Type cacheType() const { return m_type; } - virtual void fillTexture(const Coord &coord, glyph_t glyph) = 0; inline void createCache(int width, int height) { @@ -121,7 +119,6 @@ int m_h; // image height int m_cx; // current x int m_cy; // current y - QFontEngineGlyphCache::Type m_type; };