diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-07 13:00:14 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-07 13:00:14 (GMT) |
| commit | f5392a4290e5f7ae2bdf268c1fa8c037e776fdae (patch) | |
| tree | d3cc657639b8784dbc22eae2bae5e58e62db7a2f /src/gui/text/qfontengine_win_p.h | |
| parent | 0044b3c968f5023f502e3574c96d4e4df0de865d (diff) | |
| parent | 2a834d39a69430058df3916392afab064ca941ee (diff) | |
| download | Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.zip Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.tar.gz Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/network/socket/qlocalsocket.cpp
Diffstat (limited to 'src/gui/text/qfontengine_win_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_win_p.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/gui/text/qfontengine_win_p.h b/src/gui/text/qfontengine_win_p.h index a8da78a..b86bd00 100644 --- a/src/gui/text/qfontengine_win_p.h +++ b/src/gui/text/qfontengine_win_p.h @@ -80,7 +80,7 @@ public: virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, QPainterPath *path, QTextItem::RenderFlags flags); - HGDIOBJ selectDesignFont(QFixed *) const; + HGDIOBJ selectDesignFont() const; virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs); virtual glyph_metrics_t boundingBox(glyph_t g) { return boundingBox(g, QTransform()); } @@ -109,18 +109,14 @@ public: int getGlyphIndexes(const QChar *ch, int numChars, QGlyphLayout *glyphs, bool mirrored) const; void getCMap(); - QString _name; - HFONT hfont; + QString _name; + HFONT hfont; LOGFONT logfont; - uint stockFont : 1; - uint useTextOutA : 1; - uint ttf : 1; + uint stockFont : 1; + uint ttf : 1; uint hasOutline : 1; - union { - TEXTMETRICW w; - TEXTMETRICA a; - } tm; - int lw; + TEXTMETRIC tm; + int lw; const unsigned char *cmap; QByteArray cmapTable; mutable qreal lbearing; |