diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-14 10:51:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 11:53:26 +0200 |
| commit | bfb3c424abc7c839dc44de0e36024ede99ece736 (patch) | |
| tree | b6814d0238bead8518b23c078beb818432de6ce4 /src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp | |
| parent | 2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (diff) | |
Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.
All the classes and files in the declarative/items
directory have been renamed.
In particular, for classes that are currently public,
the renaming is as follows:
QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem
The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).
Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp')
| -rw-r--r-- | src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp index 3586c9daa2..5426c3b40a 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp +++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp @@ -51,7 +51,7 @@ QSGDistanceFieldGlyphNode::QSGDistanceFieldGlyphNode(QSGDistanceFieldGlyphCacheM , m_glyph_cacheManager(cacheManager) , m_glyph_cache(0) , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 0) - , m_style(QSGText::Normal) + , m_style(QQuickText::Normal) , m_antialiasingMode(GrayAntialiasing) , m_dirtyFont(false) , m_dirtyGeometry(false) @@ -102,7 +102,7 @@ void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphR m_dirtyMaterial = true; } -void QSGDistanceFieldGlyphNode::setStyle(QSGText::TextStyle style) +void QSGDistanceFieldGlyphNode::setStyle(QQuickText::TextStyle style) { if (m_style == style) return; @@ -255,7 +255,7 @@ void QSGDistanceFieldGlyphNode::updateMaterial() { delete m_material; - if (m_style == QSGText::Normal) { + if (m_style == QQuickText::Normal) { switch (m_antialiasingMode) { case HighQualitySubPixelAntialiasing: m_material = new QSGHiQSubPixelDistanceFieldTextMaterial; @@ -270,11 +270,11 @@ void QSGDistanceFieldGlyphNode::updateMaterial() } } else { QSGDistanceFieldStyledTextMaterial *material; - if (m_style == QSGText::Outline) { + if (m_style == QQuickText::Outline) { material = new QSGDistanceFieldOutlineTextMaterial; } else { QSGDistanceFieldShiftedStyleTextMaterial *sMaterial = new QSGDistanceFieldShiftedStyleTextMaterial; - if (m_style == QSGText::Raised) + if (m_style == QQuickText::Raised) sMaterial->setShift(QPointF(0.0, 1.0)); else sMaterial->setShift(QPointF(0.0, -1.0)); |