Update to work with QGlyphs -> QGlyphRun renaming

Just some search replace to make the repository compile after
QGlyphs and related APIs were renamed.

8 files changed, 20 insertions, 20 deletions

diff --git a/src/declarative/items/qsgtextnode.cpp b/src/declarative/items/qsgtextnode.cpp
index a887c2360a..33325a14ab 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<QGlyphs> glyphsList(textLayout->glyphs());
+    QList<QGlyphRun> glyphsList(textLayout->glyphRuns());
     for (int i=0; i<glyphsList.size(); ++i) {
-        QGlyphs glyphs = glyphsList.at(i);
-        QRawFont font = glyphs.font();
+        QGlyphRun glyphs = glyphsList.at(i);
+        QRawFont font = glyphs.rawFont();
         addGlyphs(position + QPointF(0, font.ascent()), glyphs, color, style, styleColor);
     }
 
@@ -356,10 +356,10 @@ void QSGTextNode::addTextBlock(const QPointF &position, QTextDocument *textDocum
                     ? overrideColor
                     : charFormat.foreground().color();
 
-            QList<QGlyphs> glyphsList = fragment.glyphs();
+            QList<QGlyphRun> glyphsList = fragment.glyphRuns();
             for (int i=0; i<glyphsList.size(); ++i) {
-                QGlyphs glyphs = glyphsList.at(i);
-                QRawFont font = glyphs.font();
+                QGlyphRun glyphs = glyphsList.at(i);
+                QRawFont font = glyphs.rawFont();
                 QSGGlyphNode *glyphNode = addGlyphs(position + blockPosition + QPointF(0, font.ascent()),
                                                     glyphs, color, style, styleColor);
 
diff --git a/src/declarative/items/qsgtextnode_p.h b/src/declarative/items/qsgtextnode_p.h
index e7bd95faee..7a49f51dbe 100644
--- a/src/declarative/items/qsgtextnode_p.h
+++ b/src/declarative/items/qsgtextnode_p.h
@@ -72,7 +72,7 @@ public:
 private:
     void addTextBlock(const QPointF &position, QTextDocument *textDocument, const QTextBlock &block,
                       const QColor &overrideColor, QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor());
-    QSGGlyphNode *addGlyphs(const QPointF &position, const QGlyphs &glyphs, const QColor &color,
+    QSGGlyphNode *addGlyphs(const QPointF &position, const QGlyphRun &glyphs, const QColor &color,
                                   QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor());
     void addTextDecorations(const QPointF &position, const QRawFont &font, const QColor &color,
                             qreal width, bool hasOverline, bool hasStrikeOut, bool hasUnderline);
diff --git a/src/declarative/scenegraph/qsgadaptationlayer_p.h b/src/declarative/scenegraph/qsgadaptationlayer_p.h
index 22d202d404..e0748de837 100644
--- a/src/declarative/scenegraph/qsgadaptationlayer_p.h
+++ b/src/declarative/scenegraph/qsgadaptationlayer_p.h
@@ -49,7 +49,7 @@
 #include <QtCore/qrect.h>
 #include <QtGui/qcolor.h>
 #include <QtCore/qsharedpointer.h>
-#include <QtGui/qglyphs.h>
+#include <QtGui/qglyphrun.h>
 #include <QtCore/qurl.h>
 
 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 57482a9cf4..a5a28a334e 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 9e93bc4368..1f1319781c 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 318fc4a009..a21fccefcf 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
@@ -49,7 +49,7 @@
 #include <private/qsgcontext_p.h>
 #include <private/qrawfont_p.h>
 #include <qglfunctions.h>
-#include <qglyphs.h>
+#include <qglyphrun.h>
 #include <qrawfont.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
index ed2dba1ea3..d826f7f1e7 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 d42f187af3..e97972579c 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;