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 12:20:13 +0200 |
| commit | 051ef6f294e8cbfa1e30e99e7fd4cf5fb38393f4 (patch) | |
| tree | 19207e0507896bd06e6c63a09ecf0c7eb9ac77e7 /src/gui/text/qtextobject.h | |
| parent | a35b2d58d921ee944d48dadbebe871df0c5c6986 (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
(cherry picked from commit 84ef364302728b68d2d29ea9c4ccbec32c7bb115)
Diffstat (limited to 'src/gui/text/qtextobject.h')
| -rw-r--r-- | src/gui/text/qtextobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index ad8e6579dc..1588349a3f 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> #include <QtGui/qtextformat.h> -#include <QtGui/qglyphs.h> +#include <QtGui/qglyphrun.h> QT_BEGIN_HEADER @@ -317,7 +317,7 @@ public: QString text() const; #if !defined(QT_NO_RAWFONT) - QList<QGlyphs> glyphs() const; + QList<QGlyphRun> glyphRuns() const; #endif private: |