diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-03-09 19:28:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 18:13:37 +0100 |
| commit | f69c9059d6c0bfb911bf0bdcec1e7470c38fa7e2 (patch) | |
| tree | d2ec791666f98347c8ef83eb1aeb47b37321c94a /src/gui/text/qfontengine_p.h | |
| parent | b047f48612e2ba38ff63979bd60e0f203d77ceb3 (diff) | |
Replace HB types used in API with Qt analogs
hb_uint32 <-> quint32
HB_Glyph <-> glyph_t
HB_Fixed <-> QFixed, HB_FixedPoint <-> QFixedPoint
HB_GlyphAttributes <-> QGlyphAttributes
Change-Id: I4338ec4ce9a9c20ea591606ab10e6ef4f19931b8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 7ce920b6af..4f29aff9d7 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -60,16 +60,12 @@ #include "private/qtextengine_p.h" #include "private/qfont_p.h" - +#include "private/qharfbuzz_copy_p.h" #include <private/qfontengineglyphcache_p.h> -struct glyph_metrics_t; -typedef unsigned int glyph_t; - QT_BEGIN_NAMESPACE -class QChar; class QPainterPath; struct QGlyphLayout; @@ -257,7 +253,7 @@ public: HB_Face initializedHarfbuzzFace() const; bool supportsScript(QChar::Script script) const; - virtual HB_Error getPointInOutline(HB_Glyph glyph, int flags, hb_uint32 point, HB_Fixed *xpos, HB_Fixed *ypos, hb_uint32 *nPoints); + virtual int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints); void setGlyphCache(const void *key, QFontEngineGlyphCache *data); QFontEngineGlyphCache *glyphCache(const void *key, QFontEngineGlyphCache::Type type, const QTransform &transform) const; |