qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to work with QGlyphs -> QGlyphRun renaming 

Just some search replace to make the repository compile after
QGlyphs and related APIs were renamed.
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2011-05-10 12:18:55 +02:00
parent b909a2433e
commit 762cbc75b9
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/declarative/items/qsgtextnode.cpp
View File

@ -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);

2
src/declarative/items/qsgtextnode_p.h
View File

@ -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);

4
src/declarative/scenegraph/qsgadaptationlayer_p.h
View File

@ -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;

4
src/declarative/scenegraph/qsgdefaultglyphnode.cpp
View File

@ -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);

4
src/declarative/scenegraph/qsgdefaultglyphnode_p.h
View File

@ -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;

2
src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
View File

@ -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

6
src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
View File

@ -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()

4
src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
View File

@ -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;