Changeset 769 for trunk/src/gui/text/qfontengine_s60_p.h

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

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

trunk/src/gui/text/qfontengine_s60_p.h

@@ -57 +57 @@
 #include "qfontengine_p.h"
 #include "qsize.h"
-#include <OPENFONT.H>
+#include <>
 
-class CFbsBitmap;
-class CFbsBitmapDevice;
-class CFbsBitGc;
 class CFont;
 
 QT_BEGIN_NAMESPACE
 
-// ..gives us access to truetype tables, UTF-16<->GlyphID mapping, and glyph outlines
-class QFontEngineS60Extensions
+// ..gives us access to truetype tables
+class Qs
 {
 public:
-    QFontEngineS60Extensions(CFont* fontOwner, COpenFont *font);
+    Qs(CFont* fontOwner, COpenFont *font);
 
     QByteArray getSfntTable(uint tag) const;
+
     const unsigned char *cmap() const;
-    QPainterPath glyphOutline(glyph_t glyph) const;
     CFont *fontOwner() const;
 
 private:
     COpenFont *m_font;
-    const MOpenFontShapingExtension *m_shapingExtension;
     mutable MOpenFontTrueTypeExtension *m_trueTypeExtension;
     mutable const unsigned char *m_cmap;
@@ -90 +86 @@
 {
 public:
-    QFontEngineS60(const QFontDef &fontDef, const QFontEngineS60Extensions *extensions);
+    QFontEngineS60(const QFontDef &fontDef, const Qs);
     ~QFontEngineS60();
 
@@ -110 +106 @@
 
     QByteArray getSfntTable(uint tag) const;
+
 
     static qreal pixelsToPoints(qreal pixels, Qt::Orientation orientation = Qt::Horizontal);
@@ -130 +127 @@
     static void releaseFont(CFont *&font);
 
-    const QFontEngineS60Extensions *m_extensions;
+    const Qs;
     CFont* m_originalFont;
     const qreal m_originalFontSizeInPixels;