diff options
-rw-r--r-- | src/core/aspects/qaspectengine.cpp | 6 | ||||
-rw-r--r-- | src/core/aspects/qaspectengine.h | 3 | ||||
-rw-r--r-- | src/core/aspects/qaspectengine_p.h | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 272d290ce..f51e6c61e 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -134,10 +134,10 @@ QAspectEngine::~QAspectEngine() delete d->m_scene; } -void QAspectEngine::initNodeTree(QNode *node) +void QAspectEnginePrivate::initNodeTree(QNode *node) { QNodeVisitor visitor; - visitor.traverse(node, d_func(), &QAspectEnginePrivate::initNode, &QAspectEnginePrivate::initEntity); + visitor.traverse(node, this, &QAspectEnginePrivate::initNode, &QAspectEnginePrivate::initEntity); } void QAspectEngine::initialize() @@ -294,7 +294,7 @@ void QAspectEngine::setRootEntity(QEntity *root) // scene object and adding each node to the scene // TODO: We probably need a call symmetric to this one above in order to // deregister the nodes from the scene - initNodeTree(root); + d->initNodeTree(root); // Finally, tell the aspects about the new scene object tree. This is done // in a blocking manner to allow the backends to get synchronized before the diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h index 4dcc7a803..2396c5d5a 100644 --- a/src/core/aspects/qaspectengine.h +++ b/src/core/aspects/qaspectengine.h @@ -76,9 +76,6 @@ public: protected: Q_DECLARE_PRIVATE(QAspectEngine) QAspectEngine(QAspectEnginePrivate &dd, QObject *parent = 0); - -private: - void initNodeTree(QNode *node); }; } // namespace Qt3DCore diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h index be5b842a7..71f8bd8fc 100644 --- a/src/core/aspects/qaspectengine_p.h +++ b/src/core/aspects/qaspectengine_p.h @@ -77,6 +77,7 @@ public: QSharedPointer<QEntity> m_root; QList<QAbstractAspect*> m_aspects; + void initNodeTree(QNode *node); void initNode(QNode *node); void initEntity(QEntity *entity); }; |