Small doc fixes.

[profile/ivi/qtdeclarative.git] / src / quick / scenegraph / coreapi / qsgnode.cpp

diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index bc83a81..6185386 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -90,7 +90,7 @@ QSGNode::QSGNode()
     , m_lastChild(0)
     , m_nextSibling(0)
     , m_previousSibling(0)
-    , m_subtreeGeometryCount(0)
+    , m_subtreeRenderableCount(0)
     , m_nodeFlags(OwnedByParent)
     , m_dirtyState(0)
 {
@@ -104,7 +104,7 @@ QSGNode::QSGNode(NodeType type)
     , m_lastChild(0)
     , m_nextSibling(0)
     , m_previousSibling(0)
-    , m_subtreeGeometryCount(type == GeometryNodeType ? 1 : 0)
+    , m_subtreeRenderableCount(type == GeometryNodeType || type == RenderNodeType ? 1 : 0)
     , m_nodeFlags(OwnedByParent)
     , m_dirtyState(0)
 {
@@ -173,7 +173,7 @@ QSGNode::~QSGNode()
 
 bool QSGNode::isSubtreeBlocked() const
 {
-    return m_subtreeGeometryCount == 0;
+    return m_subtreeRenderableCount == 0;
 }
 
 /*!
@@ -471,16 +471,16 @@ void QSGNode::markDirty(DirtyState bits)
 
     DirtyState subtreeBits = DirtyState((bits & DirtyPropagationMask) << 16);
 
-    int geometryCountDiff = 0;
+    int renderableCountDiff = 0;
     if (bits & DirtyNodeAdded)
-        geometryCountDiff += m_subtreeGeometryCount;
+        renderableCountDiff += m_subtreeRenderableCount;
     if (bits & DirtyNodeRemoved)
-        geometryCountDiff -= m_subtreeGeometryCount;
+        renderableCountDiff -= m_subtreeRenderableCount;
 
     QSGNode *p = m_parent;
     while (p) {
         p->m_dirtyState |= subtreeBits;
-        p->m_subtreeGeometryCount += geometryCountDiff;
+        p->m_subtreeRenderableCount += renderableCountDiff;
         if (p->type() == RootNodeType)
             static_cast<QSGRootNode *>(p)->notifyNodeChange(this, bits);
         p = p->m_parent;
@@ -777,9 +777,9 @@ QSGClipNode::~QSGClipNode()
     Sets whether this clip node has a rectangular clip to \a rectHint.
 
     This is an optimization hint which means that the renderer can
-    use scissoring instead of stencil, which is significnatly faster.
+    use scissoring instead of stencil, which is significantly faster.
 
-    When this hint is and it is applicable, the clip region will be
+    When this hint is set and it is applicable, the clip region will be
     generated from clipRect() rather than geometry().
  */
 
@@ -791,7 +791,7 @@ void QSGClipNode::setIsRectangular(bool rectHint)
 
 
 /*!
-    \fn void QSGClipNode::clipRect() const
+    \fn QRectF QSGClipNode::clipRect() const
 
     Returns the clip rect of this node.
  */