Changeset 846 for trunk/src/gui/text/qfontengine_ft_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qfontengine_ft_p.h (modified) (4 diffs)

trunk/src/gui/text/qfontengine_ft_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -181 +181 @@
         unsigned long id; // server sided id, GlyphSet for X11
         bool outline_drawing;
+
+
+
+
+
+
+
+
+
+
+
+
         mutable QHash<int, Glyph *> glyph_data; // maps from glyph index to glyph data
+
+
     };
 
@@ -253 +267 @@
     GlyphFormat defaultGlyphFormat() const { return defaultFormat; }
 
-    inline Glyph *cachedGlyph(glyph_t g) const { return defaultGlyphSet.glyph_data.value(g); }
+    inline Glyph *cachedGlyph(glyph_t g) const { return defaultGlyphSet.g(g); }
 
     QGlyphSet *loadTransformedGlyphSet(const QTransform &matrix);
@@ -291 +305 @@
     bool antialias;
     bool transform;
+
     SubpixelAntialiasingType subpixelType;
     int lcdFilterType;