diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-07-09 16:50:32 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 03:23:41 +0200 |
| commit | 1db99a6250f96892362f57180b3cccfd09bf7ff4 (patch) | |
| tree | 69deac3a0fe79053548513c0941d63edb08b72dc /src/gui/text/qfontengine_qpf_p.h | |
| parent | 84792b5ad5d49013fe31d9cf258e978250d4ed7f (diff) | |
Move ShaperFlags enum from QTextEngine to QFontEngine
These flags are specific to font engine(s) and has nothing
to do with the text engine or the text layout.
Change-Id: I4bb793c3c634b3cf0ae0a8a8c23b946fad5874b6
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui/text/qfontengine_qpf_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_qpf_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontengine_qpf_p.h b/src/gui/text/qfontengine_qpf_p.h index a31d578805..22cc27ff1a 100644 --- a/src/gui/text/qfontengine_qpf_p.h +++ b/src/gui/text/qfontengine_qpf_p.h @@ -170,8 +170,8 @@ public: FaceId faceId() const { return face_id; } bool getSfntTableData(uint tag, uchar *buffer, uint *length) const; - bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const; - void recalcAdvances(QGlyphLayout *, QTextEngine::ShaperFlags) const; + bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const; + void recalcAdvances(QGlyphLayout *, ShaperFlags) const; void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si); void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags); @@ -207,7 +207,7 @@ public: #if !defined(QT_NO_FREETYPE) FT_Face lockFace() const; void unlockFace() const; - void doKerning(QGlyphLayout *g, QTextEngine::ShaperFlags flags) const; + void doKerning(QGlyphLayout *g, ShaperFlags flags) const; virtual HB_Error getPointInOutline(HB_Glyph glyph, int flags, hb_uint32 point, HB_Fixed *xpos, HB_Fixed *ypos, hb_uint32 *nPoints); virtual QFixed emSquareSize() const; #endif |