diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-05-10 09:43:00 +0200 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-05-10 10:50:47 +0200 |
commit | 84ef364302728b68d2d29ea9c4ccbec32c7bb115 (patch) | |
tree | 0e5ef75060e916dce48908c049033acb865a475c /src/gui/text/qtextlayout.h | |
parent | 821b8b540af491ce60d35bd84d3c91399ecc0d16 (diff) |
Rename QGlyphs -> QGlyphRun
API clean-up for QGlyphRun:
1. QGlyphs -> QGlyphRun
2. QGlyphRun's font()/setFont() -> rawFont()/setRawFont()
3. QPainter::drawGlyphs() -> drawGlyphRun()
4. QTextLayout and QTextFragment's glyphs() -> glyphRuns()
Reviewed-by: Jiang Jiang
Diffstat (limited to 'src/gui/text/qtextlayout.h')
-rw-r--r-- | src/gui/text/qtextlayout.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index 6aa81f9e7c..8fe488a95a 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -49,7 +49,7 @@ #include <QtCore/qobject.h> #include <QtGui/qevent.h> #include <QtGui/qtextformat.h> -#include <QtGui/qglyphs.h> +#include <QtGui/qglyphrun.h> #include <QtGui/qtextcursor.h> QT_BEGIN_HEADER @@ -174,7 +174,7 @@ public: qreal maximumWidth() const; #if !defined(QT_NO_RAWFONT) - QList<QGlyphs> glyphs() const; + QList<QGlyphRun> glyphRuns() const; #endif QTextEngine *engine() const { return d; } @@ -249,7 +249,7 @@ private: void layout_helper(int numGlyphs); #if !defined(QT_NO_RAWFONT) - QList<QGlyphs> glyphs(int from, int length) const; + QList<QGlyphRun> glyphs(int from, int length) const; #endif friend class QTextLayout; |