diff options
Diffstat (limited to 'src/declarative/items')
37 files changed, 37 insertions, 67 deletions
diff --git a/src/declarative/items/qsganchors.cpp b/src/declarative/items/qsganchors.cpp index ff9351edbc..b491894532 100644 --- a/src/declarative/items/qsganchors.cpp +++ b/src/declarative/items/qsganchors.cpp @@ -1,4 +1,3 @@ -// Commit: 2c7cab4172f1acc86fd49345a2847417e162f2c3 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsganimatedimage.cpp b/src/declarative/items/qsganimatedimage.cpp index f036042ce2..0d7fb952d4 100644 --- a/src/declarative/items/qsganimatedimage.cpp +++ b/src/declarative/items/qsganimatedimage.cpp @@ -1,4 +1,3 @@ -// Commit: af33f9f2e7ec433b81f5c18e3e7395db4a56c5fe /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsganimation.cpp b/src/declarative/items/qsganimation.cpp index ad6ed030fd..ef21ec5622 100644 --- a/src/declarative/items/qsganimation.cpp +++ b/src/declarative/items/qsganimation.cpp @@ -1,4 +1,3 @@ -// Commit: 91501cc9b542de644cd70098a6bc5ff738cdeb49 /**************************************************************************** ** ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgborderimage.cpp b/src/declarative/items/qsgborderimage.cpp index 81df0a31e7..a0bb72ea35 100644 --- a/src/declarative/items/qsgborderimage.cpp +++ b/src/declarative/items/qsgborderimage.cpp @@ -1,4 +1,3 @@ -// Commit: 462429f5692f810bdd4e04b916db5f9af428d9e4 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp index fee58b87a8..30dc5cab02 100644 --- a/src/declarative/items/qsgcanvas.cpp +++ b/src/declarative/items/qsgcanvas.cpp @@ -394,7 +394,7 @@ void QSGCanvasPrivate::renderSceneGraph(const QSize &size) { context->renderer()->setDeviceRect(QRect(QPoint(0, 0), size)); context->renderer()->setViewportRect(QRect(QPoint(0, 0), size)); - context->renderer()->setProjectMatrixToDeviceRect(); + context->renderer()->setProjectionMatrixToDeviceRect(); context->renderNextFrame(); @@ -1759,10 +1759,8 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item) } } - if (dirty & QSGItemPrivate::ChildrenUpdateMask) { - while (itemPriv->childContainerNode()->childCount()) - itemPriv->childContainerNode()->removeChildNode(itemPriv->childContainerNode()->childAtIndex(0)); - } + if (dirty & QSGItemPrivate::ChildrenUpdateMask) + itemPriv->childContainerNode()->removeAllChildNodes(); if (effectRefEffectivelyChanged) { QSGNode *parent = itemPriv->clipNode; @@ -1795,15 +1793,12 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item) if (dirty & QSGItemPrivate::ChildrenUpdateMask) { QSGNode *groupNode = itemPriv->groupNode; - if (groupNode) { - for (int count = groupNode->childCount(); count; --count) - groupNode->removeChildNode(groupNode->childAtIndex(0)); - } + if (groupNode) + groupNode->removeAllChildNodes(); QList<QSGItem *> orderedChildren = itemPriv->paintOrderChildItems(); int ii = 0; - itemPriv->paintNodeIndex = 0; for (; ii < orderedChildren.count() && orderedChildren.at(ii)->z() < 0; ++ii) { QSGItemPrivate *childPrivate = QSGItemPrivate::get(orderedChildren.at(ii)); if (!childPrivate->explicitVisible && !childPrivate->effectRefCount) @@ -1812,8 +1807,8 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item) childPrivate->itemNode()->parent()->removeChildNode(childPrivate->itemNode()); itemPriv->childContainerNode()->appendChildNode(childPrivate->itemNode()); - itemPriv->paintNodeIndex++; } + itemPriv->beforePaintNode = itemPriv->groupNode ? itemPriv->groupNode->lastChild() : 0; if (itemPriv->paintNode) itemPriv->childContainerNode()->appendChildNode(itemPriv->paintNode); @@ -1869,10 +1864,10 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item) itemPriv->paintNode->parent() == itemPriv->childContainerNode()); if (itemPriv->paintNode && itemPriv->paintNode->parent() == 0) { - if (itemPriv->childContainerNode()->childCount() == itemPriv->paintNodeIndex) - itemPriv->childContainerNode()->appendChildNode(itemPriv->paintNode); - else - itemPriv->childContainerNode()->insertChildNodeBefore(itemPriv->paintNode, itemPriv->childContainerNode()->childAtIndex(itemPriv->paintNodeIndex)); + if (itemPriv->beforePaintNode) + itemPriv->childContainerNode()->insertChildNodeAfter(itemPriv->paintNode, itemPriv->beforePaintNode); + else + itemPriv->childContainerNode()->prependChildNode(itemPriv->paintNode); } } else if (itemPriv->paintNode) { delete itemPriv->paintNode; @@ -1908,8 +1903,8 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item) Q_ASSERT(parent == itemPriv->groupNode || parent->childCount() == 1); Q_ASSERT(child->parent() == parent); bool containsChild = false; - for (int i = 0; i < parent->childCount(); ++i) - containsChild |= (parent->childAtIndex(i) == child); + for (QSGNode *n = parent->firstChild(); n; n = n->nextSibling()) + containsChild |= (n == child); Q_ASSERT(containsChild); } ip = ic; diff --git a/src/declarative/items/qsgclipnode.cpp b/src/declarative/items/qsgclipnode.cpp index 2e40972620..b0a0a56534 100644 --- a/src/declarative/items/qsgclipnode.cpp +++ b/src/declarative/items/qsgclipnode.cpp @@ -1,4 +1,3 @@ - /**************************************************************************** ** ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgcontext2d.cpp b/src/declarative/items/qsgcontext2d.cpp index 2e60de189f..9dddc99557 100644 --- a/src/declarative/items/qsgcontext2d.cpp +++ b/src/declarative/items/qsgcontext2d.cpp @@ -786,12 +786,15 @@ static QScriptValue ctx2d_isPointInPath(QScriptContext *c, QScriptEngine *e) // text static QScriptValue ctx2d_font(QScriptContext *c, QScriptEngine *e) { + return QScriptValue(); } static QScriptValue ctx2d_textAlign(QScriptContext *c, QScriptEngine *e) { + return QScriptValue(); } static QScriptValue ctx2d_textBaseline(QScriptContext *c, QScriptEngine *e) { + return QScriptValue(); } static QScriptValue ctx2d_fillText(QScriptContext *c, QScriptEngine *e) { @@ -846,53 +849,61 @@ static QScriptValue ctx2d_drawImage(QScriptContext *c, QScriptEngine *e) static QScriptValue ctx2d_createImageData(QScriptContext *c, QScriptEngine *e) { //#TODO + return QScriptValue(); } static QScriptValue ctx2d_getImageData(QScriptContext *c, QScriptEngine *e) { //#TODO + return QScriptValue(); } static QScriptValue ctx2d_putImageData(QScriptContext *c, QScriptEngine *e) { //#TODO + return QScriptValue(); } //Image Data Interface static QScriptValue ctx2d_imageData_data(QScriptContext *c, QScriptEngine *e) { //#TODO + return QScriptValue(); } static QScriptValue ctx2d_imageData_height(QScriptContext *c, QScriptEngine *e) { //#TODO + return QScriptValue(); } static QScriptValue ctx2d_imageData_width(QScriptContext *c, QScriptEngine *e) { //#TODO + return QScriptValue(); } //CanvasPixelArray interface static QScriptValue ctx2d_pixelArray_length(QScriptContext *c, QScriptEngine *e) { //#TODO + return QScriptValue(); } //getter/setter by index how to? static QScriptValue ctx2d_pixelArray(QScriptContext *c, QScriptEngine *e) { //#TODO + return QScriptValue(); } //CanvasGradient interface static QScriptValue ctx2d_gradient_addColorStop(QScriptContext *c, QScriptEngine *e) { //#TODO - + return QScriptValue(); } //TextMetrics static QScriptValue ctx2d_textMetrics_width(QScriptContext *c, QScriptEngine *e) { //#TODO - + return QScriptValue(); } diff --git a/src/declarative/items/qsgevents.cpp b/src/declarative/items/qsgevents.cpp index 44ef38b037..773a3e3fe0 100644 --- a/src/declarative/items/qsgevents.cpp +++ b/src/declarative/items/qsgevents.cpp @@ -1,4 +1,3 @@ -// Commit: ac5c099cc3c5b8c7eec7a49fdeb8a21037230350 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qsgflickable.cpp index be0ac13bbf..48beef8422 100644 --- a/src/declarative/items/qsgflickable.cpp +++ b/src/declarative/items/qsgflickable.cpp @@ -1,4 +1,3 @@ -// Commit: d4fa1878ff1e7628d3e984d54f8a93810353c71b /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgflipable.cpp b/src/declarative/items/qsgflipable.cpp index a856d6360b..0439a4d827 100644 --- a/src/declarative/items/qsgflipable.cpp +++ b/src/declarative/items/qsgflipable.cpp @@ -1,4 +1,3 @@ -// Commit: caee66da925949cf7aef2ff8e1a86c38dd6e6efd /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgfocusscope.cpp b/src/declarative/items/qsgfocusscope.cpp index 84f19b1671..07fafc367f 100644 --- a/src/declarative/items/qsgfocusscope.cpp +++ b/src/declarative/items/qsgfocusscope.cpp @@ -1,4 +1,3 @@ -// Commit: ac5c099cc3c5b8c7eec7a49fdeb8a21037230350 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsggridview.cpp b/src/declarative/items/qsggridview.cpp index b65cd39e8e..ef4e969a14 100644 --- a/src/declarative/items/qsggridview.cpp +++ b/src/declarative/items/qsggridview.cpp @@ -1,4 +1,3 @@ -// Commit: 806f031efeda71d3f4d7d2f949b437493e79cf52 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgimage.cpp b/src/declarative/items/qsgimage.cpp index 706aaa7d5d..2e38313e80 100644 --- a/src/declarative/items/qsgimage.cpp +++ b/src/declarative/items/qsgimage.cpp @@ -1,4 +1,3 @@ -// Commit: 051a76c1d65d698f71dc75c89f91ae9021357eae /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgimagebase.cpp b/src/declarative/items/qsgimagebase.cpp index 9f2de03bbe..70a6f6de4f 100644 --- a/src/declarative/items/qsgimagebase.cpp +++ b/src/declarative/items/qsgimagebase.cpp @@ -1,4 +1,3 @@ -// Commit: 051a76c1d65d698f71dc75c89f91ae9021357eae /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgimplicitsizeitem.cpp b/src/declarative/items/qsgimplicitsizeitem.cpp index f2cc9bcbdb..f8e5b5f021 100644 --- a/src/declarative/items/qsgimplicitsizeitem.cpp +++ b/src/declarative/items/qsgimplicitsizeitem.cpp @@ -1,4 +1,3 @@ -// Commit: 6f78a6080b84cc3ef96b73a4ff58d1b5a72f08f4 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp index 328da16ff4..b87ba296e2 100644 --- a/src/declarative/items/qsgitem.cpp +++ b/src/declarative/items/qsgitem.cpp @@ -1,4 +1,3 @@ -// Commit: c44be8c0b27756a2025ebad1945632f3f7e4bebc /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). @@ -1181,7 +1180,7 @@ void QSGItemPrivate::initCanvas(InitializationState *state, QSGCanvas *c) rootNode = 0; groupNode = 0; paintNode = 0; - paintNodeIndex = 0; + beforePaintNode = 0; InitializationState _dummy; InitializationState *childState = state; @@ -1286,7 +1285,7 @@ QSGItemPrivate::QSGItemPrivate() dirtyAttributes(0), nextDirtyItem(0), prevDirtyItem(0), itemNodeInstance(0), opacityNode(0), clipNode(0), rootNode(0), groupNode(0), paintNode(0) - , paintNodeIndex(0), effectRefCount(0), hideRefCount(0) + , beforePaintNode(0), effectRefCount(0), hideRefCount(0) { } diff --git a/src/declarative/items/qsgitem_p.h b/src/declarative/items/qsgitem_p.h index 300ccdc49e..0b3348d7fc 100644 --- a/src/declarative/items/qsgitem_p.h +++ b/src/declarative/items/qsgitem_p.h @@ -388,7 +388,7 @@ public: QSGRootNode *rootNode; QSGNode *groupNode; QSGNode *paintNode; - int paintNodeIndex; + QSGNode *beforePaintNode; virtual QSGTransformNode *createTransformNode(); diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp index f1e3a0cb91..a3752fcec8 100644 --- a/src/declarative/items/qsgitemsmodule.cpp +++ b/src/declarative/items/qsgitemsmodule.cpp @@ -1,4 +1,3 @@ -// Commit: 2c7cab4172f1acc86fd49345a2847417e162f2c3 /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsglistview.cpp b/src/declarative/items/qsglistview.cpp index a61ca97256..eea546504a 100644 --- a/src/declarative/items/qsglistview.cpp +++ b/src/declarative/items/qsglistview.cpp @@ -1,4 +1,3 @@ -// Commit: 806f031efeda71d3f4d7d2f949b437493e79cf52 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgloader.cpp b/src/declarative/items/qsgloader.cpp index 6717098506..e5b7e499ec 100644 --- a/src/declarative/items/qsgloader.cpp +++ b/src/declarative/items/qsgloader.cpp @@ -1,4 +1,3 @@ -// Commit: 501180c6fbed0857126da2bb0ff1f17ee35472c6 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qsgmousearea.cpp index 6b4311e698..8ed72190f8 100644 --- a/src/declarative/items/qsgmousearea.cpp +++ b/src/declarative/items/qsgmousearea.cpp @@ -1,4 +1,3 @@ -// Commit: e1ffbc04131dc6f76fa76821c297d08162e4b1ee /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgpathview.cpp b/src/declarative/items/qsgpathview.cpp index fc3d39aef7..35b6e038ab 100644 --- a/src/declarative/items/qsgpathview.cpp +++ b/src/declarative/items/qsgpathview.cpp @@ -1,4 +1,3 @@ -// Commit: 806f031efeda71d3f4d7d2f949b437493e79cf52 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgpincharea.cpp b/src/declarative/items/qsgpincharea.cpp index f21d873e5e..6fc0c61359 100644 --- a/src/declarative/items/qsgpincharea.cpp +++ b/src/declarative/items/qsgpincharea.cpp @@ -1,4 +1,3 @@ -// Commit: f707672eb4c51ea82fbd98e1da16ece61a74c690 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgpositioners.cpp b/src/declarative/items/qsgpositioners.cpp index f174612af6..0106d8fea9 100644 --- a/src/declarative/items/qsgpositioners.cpp +++ b/src/declarative/items/qsgpositioners.cpp @@ -1,4 +1,3 @@ -// Commit: 1f38d41854fa2daa51d938a4eb398752b1751e0b /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgrectangle.cpp b/src/declarative/items/qsgrectangle.cpp index e97abe3e1c..09bf34dc15 100644 --- a/src/declarative/items/qsgrectangle.cpp +++ b/src/declarative/items/qsgrectangle.cpp @@ -1,4 +1,3 @@ -// Commit: acc903853d5ac54d646d324b7386c998bc07d464 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgrepeater.cpp b/src/declarative/items/qsgrepeater.cpp index ac6086fc62..3a0ef84ed3 100644 --- a/src/declarative/items/qsgrepeater.cpp +++ b/src/declarative/items/qsgrepeater.cpp @@ -1,4 +1,3 @@ -// Commit: a9f1eaa6a368bf7a72b52c428728a3e3e0a76209 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgscalegrid.cpp b/src/declarative/items/qsgscalegrid.cpp index 4a73801159..9f1b7bf8a6 100644 --- a/src/declarative/items/qsgscalegrid.cpp +++ b/src/declarative/items/qsgscalegrid.cpp @@ -1,4 +1,3 @@ -// Commit: 7ddec9f3179bfd854ae53e23ab292de1f9a26377 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgshadereffectmesh.cpp b/src/declarative/items/qsgshadereffectmesh.cpp index dbc3472d09..05131285df 100644 --- a/src/declarative/items/qsgshadereffectmesh.cpp +++ b/src/declarative/items/qsgshadereffectmesh.cpp @@ -135,11 +135,6 @@ QSGGeometry *QSGGridMesh::updateGeometry(QSGGeometry *geometry, const QVector<QB break; } - if (error) { - delete geometry; - return 0; - } - geometry = new QSGGeometry(attrCount == 1 ? QSGGeometry::defaultAttributes_Point2D() : QSGGeometry::defaultAttributes_TexturedPoint2D(), diff --git a/src/declarative/items/qsgshadereffectsource.cpp b/src/declarative/items/qsgshadereffectsource.cpp index e2c50bb80e..c4c09868d2 100644 --- a/src/declarative/items/qsgshadereffectsource.cpp +++ b/src/declarative/items/qsgshadereffectsource.cpp @@ -214,8 +214,8 @@ void QSGShaderEffectTexture::grab() return; } QSGNode *root = m_item; - while (root->childCount() && root->type() != QSGNode::RootNodeType) - root = root->childAtIndex(0); + while (root->firstChild() && root->type() != QSGNode::RootNodeType) + root = root->firstChild(); if (root->type() != QSGNode::RootNodeType) return; @@ -310,7 +310,7 @@ void QSGShaderEffectTexture::grab() m_renderer->setDeviceRect(m_size); m_renderer->setViewportRect(m_size); QRectF mirrored(m_rect.left(), m_rect.bottom(), m_rect.width(), -m_rect.height()); - m_renderer->setProjectMatrixToRect(mirrored); + m_renderer->setProjectionMatrixToRect(mirrored); m_renderer->setClearColor(Qt::transparent); if (m_multisampling) { @@ -391,6 +391,7 @@ void QSGShaderEffectTexture::grab() rather than each element individually. \endlist + \table \row \o \image declarative-shadereffectsource.png \o \qml @@ -420,6 +421,7 @@ void QSGShaderEffectTexture::grab() } \endqml \endrow + \endtable The ShaderEffectSource element does not redirect any mouse or keyboard input to \l sourceItem. If you hide the \l sourceItem by setting diff --git a/src/declarative/items/qsgstateoperations.cpp b/src/declarative/items/qsgstateoperations.cpp index 5390440e39..0c6491ed58 100644 --- a/src/declarative/items/qsgstateoperations.cpp +++ b/src/declarative/items/qsgstateoperations.cpp @@ -1,4 +1,3 @@ -// Commit: 726a8b16c52fe4608c89d740b47361a2b073ce01 /**************************************************************************** ** ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgtext.cpp b/src/declarative/items/qsgtext.cpp index ae9bffc795..3398824f69 100644 --- a/src/declarative/items/qsgtext.cpp +++ b/src/declarative/items/qsgtext.cpp @@ -1,4 +1,3 @@ -// Commit: cce89db1e2555cbca8fc28072e1c6dd737cec6c4 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgtextedit.cpp b/src/declarative/items/qsgtextedit.cpp index 1c199ecc28..01d068d131 100644 --- a/src/declarative/items/qsgtextedit.cpp +++ b/src/declarative/items/qsgtextedit.cpp @@ -1,4 +1,3 @@ -// Commit: ec40dd2bb51868bca10dbd0c9116f3224ff2b29b /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp index 1db4474d4a..94f54712c3 100644 --- a/src/declarative/items/qsgtextinput.cpp +++ b/src/declarative/items/qsgtextinput.cpp @@ -1,4 +1,3 @@ -// Commit: 47712d1f330e4b22ce6dd30e7557288ef7f7fca0 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgtextnode.cpp b/src/declarative/items/qsgtextnode.cpp index 876c9785b4..6909d8cfca 100644 --- a/src/declarative/items/qsgtextnode.cpp +++ b/src/declarative/items/qsgtextnode.cpp @@ -81,8 +81,7 @@ void QSGTextNode::setColor(const QColor &color) if (m_usePixmapCache) { setUpdateFlag(UpdateNodes); } else { - for (int i=0; i<childCount(); ++i) { - QSGNode *childNode = childAtIndex(i); + for (QSGNode *childNode = firstChild(); childNode; childNode = childNode->nextSibling()) { if (childNode->subType() == GlyphNodeSubType) { QSGGlyphNode *glyphNode = static_cast<QSGGlyphNode *>(childNode); if (glyphNode->color() == m_color) @@ -103,8 +102,7 @@ void QSGTextNode::setStyleColor(const QColor &styleColor) if (m_usePixmapCache) { setUpdateFlag(UpdateNodes); } else { - for (int i=0; i<childCount(); ++i) { - QSGNode *childNode = childAtIndex(i); + for (QSGNode *childNode = firstChild(); childNode; childNode = childNode->nextSibling()) { if (childNode->subType() == GlyphNodeSubType) { QSGGlyphNode *glyphNode = static_cast<QSGGlyphNode *>(childNode); if (glyphNode->color() == m_styleColor) @@ -371,8 +369,8 @@ void QSGTextNode::addTextBlock(const QPointF &position, QTextDocument *textDocum void QSGTextNode::deleteContent() { - while (childCount() > 0) - delete childAtIndex(0); + while (firstChild() > 0) + delete firstChild(); } #if 0 diff --git a/src/declarative/items/qsgtranslate.cpp b/src/declarative/items/qsgtranslate.cpp index 5f7112bd42..1c453d6f57 100644 --- a/src/declarative/items/qsgtranslate.cpp +++ b/src/declarative/items/qsgtranslate.cpp @@ -1,4 +1,3 @@ -// Commit: ac5c099cc3c5b8c7eec7a49fdeb8a21037230350 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgview.cpp b/src/declarative/items/qsgview.cpp index 1169c59a1b..830a232db2 100644 --- a/src/declarative/items/qsgview.cpp +++ b/src/declarative/items/qsgview.cpp @@ -1,4 +1,3 @@ -// Commit: 55c4d94dfea78951f3371d3697a3cb28539b3012 /**************************************************************************** ** ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/items/qsgvisualitemmodel.cpp b/src/declarative/items/qsgvisualitemmodel.cpp index daf67b573a..a24b65f766 100644 --- a/src/declarative/items/qsgvisualitemmodel.cpp +++ b/src/declarative/items/qsgvisualitemmodel.cpp @@ -1,4 +1,3 @@ -// Commit: dcb9148091cbf6872b60407c301d7c92427583a6 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). |