diff options
author | Paul Lemire <paul.lemire.ecortex.kdab.com> | 2014-10-29 08:43:13 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-11-02 12:43:17 +0100 |
commit | 25855a0ef286516a4025768a3a435a96bcf2bcfc (patch) | |
tree | 627e42dda096368a84a32242c4a463e616d0eb3d | |
parent | f7e6874cb200c31eed32c69c6ef10ba92ed1250e (diff) | |
download | qt3d-25855a0ef286516a4025768a3a435a96bcf2bcfc.tar.gz |
Renamed NodeVisitor to QNodeVisitor
Change-Id: I98c4df45a05eedeb8c825a58b67868fd0412a2a0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/core/nodes/nodevisitor.cpp | 12 | ||||
-rw-r--r-- | src/core/nodes/nodevisitor.h | 6 | ||||
-rw-r--r-- | src/render/backend/qrenderaspect.cpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/core/nodes/nodevisitor.cpp b/src/core/nodes/nodevisitor.cpp index 31b582d4f..c9f1a4ea2 100644 --- a/src/core/nodes/nodevisitor.cpp +++ b/src/core/nodes/nodevisitor.cpp @@ -45,31 +45,31 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -NodeVisitor::NodeVisitor() +QNodeVisitor::QNodeVisitor() : m_traverseDisabled(false) { } -NodeVisitor::~NodeVisitor() +QNodeVisitor::~QNodeVisitor() { } -QNode* NodeVisitor::rootNode() const +QNode* QNodeVisitor::rootNode() const { return m_path.front(); } -QNode* NodeVisitor::currentNode() const +QNode* QNodeVisitor::currentNode() const { return m_path.back(); } -NodeList NodeVisitor::path() const +NodeList QNodeVisitor::path() const { return m_path; } -void NodeVisitor::setTraverseDisabled(bool on) +void QNodeVisitor::setTraverseDisabled(bool on) { m_traverseDisabled = on; } diff --git a/src/core/nodes/nodevisitor.h b/src/core/nodes/nodevisitor.h index 12d8c673f..87c54c1ae 100644 --- a/src/core/nodes/nodevisitor.h +++ b/src/core/nodes/nodevisitor.h @@ -53,11 +53,11 @@ namespace Qt3D typedef QList<QNode *> NodeList; -class QT3DCORESHARED_EXPORT NodeVisitor +class QT3DCORESHARED_EXPORT QNodeVisitor { public: - NodeVisitor(); - virtual ~NodeVisitor(); + QNodeVisitor(); + virtual ~QNodeVisitor(); template<typename NodeVisitorFunc, typename EntityVisitorFunc> void traverse(QNode *rootNode_, NodeVisitorFunc fN, EntityVisitorFunc fE) diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp index 5ad668fee..0f0b65575 100644 --- a/src/render/backend/qrenderaspect.cpp +++ b/src/render/backend/qrenderaspect.cpp @@ -192,7 +192,7 @@ void QRenderAspect::sceneNodeAdded(QSceneChangePtr &e) QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); QNode *n = nodePtr.data(); - NodeVisitor visitor; + QNodeVisitor visitor; visitor.traverse(n, this, &QRenderAspect::visitNode, &QRenderAspect::visitNode); } @@ -207,7 +207,7 @@ void QRenderAspect::sceneNodeRemoved(QSceneChangePtr &e) void QRenderAspect::setRootEntity(QEntity *rootObject) { // setSceneGraphRoot is synchronized using the Renderer's mutex - NodeVisitor visitor; + QNodeVisitor visitor; visitor.traverse(rootObject, this, &QRenderAspect::visitNode, &QRenderAspect::visitNode); m_renderer->setSceneGraphRoot(m_renderer->renderNodesManager()->lookupResource(rootObject->uuid())); } |