diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-03 07:49:07 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-07 08:46:16 +0200 |
commit | f696ddad0eaab53104f2f2ed85979ecd2c1a9259 (patch) | |
tree | 66618f6871a6d16ef60b6a0059b1b4fa047589df | |
parent | cecd47b7b37567d1dbc09684e470e9a6a929a175 (diff) |
move QSGNodeUpdater into private header where it belongs
Change-Id: I5cb12cac3d49cfd9b1682b405e65b2cdea4eb57d
Reviewed-on: http://codereview.qt.nokia.com/4306
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r-- | src/declarative/scenegraph/coreapi/qsgnode.cpp | 29 | ||||
-rw-r--r-- | src/declarative/scenegraph/coreapi/qsgnode.h | 13 | ||||
-rw-r--r-- | src/declarative/scenegraph/coreapi/qsgrenderer.cpp | 27 | ||||
-rw-r--r-- | src/declarative/scenegraph/coreapi/qsgrenderer_p.h | 15 |
4 files changed, 42 insertions, 42 deletions
diff --git a/src/declarative/scenegraph/coreapi/qsgnode.cpp b/src/declarative/scenegraph/coreapi/qsgnode.cpp index 65b4bf926b..fac44dad71 100644 --- a/src/declarative/scenegraph/coreapi/qsgnode.cpp +++ b/src/declarative/scenegraph/coreapi/qsgnode.cpp @@ -1247,35 +1247,6 @@ QDebug operator<<(QDebug d, const QSGNode *n) return d; } - -/*! - \class QSGNodeDumper - \brief The QSGNodeDumper class provides a way of dumping a scene grahp to the console. - - This class is solely for debugging purposes. - - \internal - */ - -void QSGNodeDumper::dump(QSGNode *n) -{ - QSGNodeDumper dump; - dump.visitNode(n); -} - -void QSGNodeDumper::visitNode(QSGNode *n) -{ - qDebug() << QString(m_indent * 2, QLatin1Char(' ')) << n; - QSGNodeVisitor::visitNode(n); -} - -void QSGNodeDumper::visitChildren(QSGNode *n) -{ - ++m_indent; - QSGNodeVisitor::visitChildren(n); - --m_indent; -} - #endif QT_END_NAMESPACE diff --git a/src/declarative/scenegraph/coreapi/qsgnode.h b/src/declarative/scenegraph/coreapi/qsgnode.h index 95c89b996d..c4f4674a79 100644 --- a/src/declarative/scenegraph/coreapi/qsgnode.h +++ b/src/declarative/scenegraph/coreapi/qsgnode.h @@ -339,19 +339,6 @@ Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGTransformNode *n); Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGOpacityNode *n); Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGRootNode *n); -class QSGNodeDumper : public QSGNodeVisitor { - -public: - static void dump(QSGNode *n); - - QSGNodeDumper() : m_indent(0) {} - void visitNode(QSGNode *n); - void visitChildren(QSGNode *n); - -private: - int m_indent; -}; - #endif QT_END_NAMESPACE diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp index 57a3059d58..e8e67601fa 100644 --- a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp @@ -698,6 +698,33 @@ void QSGRenderer::draw(const QSGMaterialShader *shader, const QSGGeometry *g) } +/*! + \class QSGNodeDumper + \brief The QSGNodeDumper class provides a way of dumping a scene grahp to the console. + + This class is solely for debugging purposes. + + \internal + */ + +void QSGNodeDumper::dump(QSGNode *n) +{ + QSGNodeDumper dump; + dump.visitNode(n); +} + +void QSGNodeDumper::visitNode(QSGNode *n) +{ + qDebug() << QString(m_indent * 2, QLatin1Char(' ')) << n; + QSGNodeVisitor::visitNode(n); +} + +void QSGNodeDumper::visitChildren(QSGNode *n) +{ + ++m_indent; + QSGNodeVisitor::visitChildren(n); + --m_indent; +} QT_END_NAMESPACE diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer_p.h b/src/declarative/scenegraph/coreapi/qsgrenderer_p.h index eed6483cdb..05fb9b42fd 100644 --- a/src/declarative/scenegraph/coreapi/qsgrenderer_p.h +++ b/src/declarative/scenegraph/coreapi/qsgrenderer_p.h @@ -212,6 +212,21 @@ QSGMaterialShader::RenderState QSGRenderer::state(QSGMaterialShader::RenderState } +class Q_DECLARATIVE_EXPORT QSGNodeDumper : public QSGNodeVisitor { + +public: + static void dump(QSGNode *n); + + QSGNodeDumper() : m_indent(0) {} + void visitNode(QSGNode *n); + void visitChildren(QSGNode *n); + +private: + int m_indent; +}; + + + QT_END_NAMESPACE QT_END_HEADER |