From 762cbc75b94486ca93b964b4097c88ae24c667d3 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 10 May 2011 12:18:55 +0200 Subject: [PATCH] Update to work with QGlyphs -> QGlyphRun renaming Just some search replace to make the repository compile after QGlyphs and related APIs were renamed. --- src/declarative/items/qsgtextnode.cpp | 14 +++++++------- src/declarative/items/qsgtextnode_p.h | 2 +- src/declarative/scenegraph/qsgadaptationlayer_p.h | 4 ++-- src/declarative/scenegraph/qsgdefaultglyphnode.cpp | 4 ++-- src/declarative/scenegraph/qsgdefaultglyphnode_p.h | 4 ++-- .../scenegraph/qsgdistancefieldglyphcache.cpp | 2 +- .../scenegraph/qsgdistancefieldglyphnode.cpp | 6 +++--- .../scenegraph/qsgdistancefieldglyphnode_p.h | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/declarative/items/qsgtextnode.cpp b/src/declarative/items/qsgtextnode.cpp index a887c23..33325a1 100644 --- a/src/declarative/items/qsgtextnode.cpp +++ b/src/declarative/items/qsgtextnode.cpp @@ -153,7 +153,7 @@ void QSGTextNode::addTextDecorations(const QPointF &position, const QRawFont &fo } } -QSGGlyphNode *QSGTextNode::addGlyphs(const QPointF &position, const QGlyphs &glyphs, const QColor &color, +QSGGlyphNode *QSGTextNode::addGlyphs(const QPointF &position, const QGlyphRun &glyphs, const QColor &color, QSGText::TextStyle style, const QColor &styleColor) { QSGGlyphNode *node = m_context->createGlyphNode(); @@ -187,10 +187,10 @@ void QSGTextNode::addTextDocument(const QPointF &position, QTextDocument *textDo void QSGTextNode::addTextLayout(const QPointF &position, QTextLayout *textLayout, const QColor &color, QSGText::TextStyle style, const QColor &styleColor) { - QList glyphsList(textLayout->glyphs()); + QList glyphsList(textLayout->glyphRuns()); for (int i=0; i glyphsList = fragment.glyphs(); + QList glyphsList = fragment.glyphRuns(); for (int i=0; i #include #include -#include +#include #include QT_BEGIN_HEADER @@ -103,7 +103,7 @@ public: SubPixelAntialiasing }; - virtual void setGlyphs(const QPointF &position, const QGlyphs &glyphs) = 0; + virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs) = 0; virtual void setColor(const QColor &color) = 0; virtual QPointF baseLine() const = 0; diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode.cpp b/src/declarative/scenegraph/qsgdefaultglyphnode.cpp index 57482a9..a5a28a3 100644 --- a/src/declarative/scenegraph/qsgdefaultglyphnode.cpp +++ b/src/declarative/scenegraph/qsgdefaultglyphnode.cpp @@ -69,12 +69,12 @@ void QSGDefaultGlyphNode::setColor(const QColor &color) } } -void QSGDefaultGlyphNode::setGlyphs(const QPointF &position, const QGlyphs &glyphs) +void QSGDefaultGlyphNode::setGlyphs(const QPointF &position, const QGlyphRun &glyphs) { if (m_material != 0) delete m_material; - QRawFont font = glyphs.font(); + QRawFont font = glyphs.rawFont(); m_material = new QSGTextMaskMaterial(font); m_material->setColor(m_color); diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h b/src/declarative/scenegraph/qsgdefaultglyphnode_p.h index 9e93bc4..1f13197 100644 --- a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h +++ b/src/declarative/scenegraph/qsgdefaultglyphnode_p.h @@ -60,13 +60,13 @@ public: ~QSGDefaultGlyphNode(); virtual QPointF baseLine() const { return m_baseLine; } - virtual void setGlyphs(const QPointF &position, const QGlyphs &glyphs); + virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs); virtual void setColor(const QColor &color); virtual void setPreferredAntialiasingMode(AntialiasingMode) { } private: - QGlyphs m_glyphs; + QGlyphRun m_glyphs; QPointF m_position; QColor m_color; diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp index 318fc4a..a21fcce 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp +++ b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp index ed2dba1..d826f7f 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp +++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp @@ -87,9 +87,9 @@ void QSGDistanceFieldGlyphNode::setPreferredAntialiasingMode(AntialiasingMode mo updateMaterial(); } -void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphs &glyphs) +void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphRun &glyphs) { - QRawFont font = glyphs.font(); + QRawFont font = glyphs.rawFont(); m_position = QPointF(position.x(), position.y() - font.ascent()); m_glyphs = glyphs; @@ -187,7 +187,7 @@ void QSGDistanceFieldGlyphNode::updateGeometry() void QSGDistanceFieldGlyphNode::updateFont() { - m_glyph_cache = QSGDistanceFieldGlyphCache::get(QGLContext::currentContext(), m_glyphs.font()); + m_glyph_cache = QSGDistanceFieldGlyphCache::get(QGLContext::currentContext(), m_glyphs.rawFont()); } void QSGDistanceFieldGlyphNode::updateMaterial() diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h index d42f187..e979725 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h +++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h @@ -61,7 +61,7 @@ public: ~QSGDistanceFieldGlyphNode(); virtual QPointF baseLine() const { return m_baseLine; } - virtual void setGlyphs(const QPointF &position, const QGlyphs &glyphs); + virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs); virtual void setColor(const QColor &color); virtual void setPreferredAntialiasingMode(AntialiasingMode mode); @@ -78,7 +78,7 @@ private: QPointF m_baseLine; QSGDistanceFieldTextMaterial *m_material; QPointF m_position; - QGlyphs m_glyphs; + QGlyphRun m_glyphs; QSGDistanceFieldGlyphCache *m_glyph_cache; QSGGeometry m_geometry; QSGText::TextStyle m_style; -- 1.7.2.5