summaryrefslogtreecommitdiffstats
path: root/src/declarative/items/qsgtextnode_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/items/qsgtextnode_p.h')
-rw-r--r--src/declarative/items/qsgtextnode_p.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/declarative/items/qsgtextnode_p.h b/src/declarative/items/qsgtextnode_p.h
index c4fed3e9b6..e7bd95faee 100644
--- a/src/declarative/items/qsgtextnode_p.h
+++ b/src/declarative/items/qsgtextnode_p.h
@@ -42,26 +42,25 @@
#ifndef QSGTEXTNODE_P_H
#define QSGTEXTNODE_P_H
-#include <node.h>
+#include <qsgnode.h>
#include <qsgtext_p.h>
QT_BEGIN_NAMESPACE
class QTextLayout;
-class GlyphNodeInterface;
+class QSGGlyphNode;
class QTextBlock;
class QColor;
class QTextDocument;
class QSGContext;
+class QRawFont;
-class QSGTextNode : public TransformNode
+class QSGTextNode : public QSGTransformNode
{
public:
QSGTextNode(QSGContext *);
~QSGTextNode();
- virtual NodeSubType subType() const { return TextNodeSubType; }
-
static bool isComplexRichText(QTextDocument *);
void deleteContent();
@@ -73,11 +72,10 @@ public:
private:
void addTextBlock(const QPointF &position, QTextDocument *textDocument, const QTextBlock &block,
const QColor &overrideColor, QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor());
- GlyphNodeInterface *addGlyphs(const QPointF &position, const QGlyphs &glyphs, const QColor &color,
+ QSGGlyphNode *addGlyphs(const QPointF &position, const QGlyphs &glyphs, const QColor &color,
QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor());
- void addTextDecorations(const QPointF &position, const QFont &font, const QColor &color,
- qreal width);
-
+ void addTextDecorations(const QPointF &position, const QRawFont &font, const QColor &color,
+ qreal width, bool hasOverline, bool hasStrikeOut, bool hasUnderline);
QSGContext *m_context;
};