diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-01-25 12:16:52 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-02-07 15:18:31 +0000 |
commit | d1a7fcf6969cfebe16c3590a01e7811fd4a718f3 (patch) | |
tree | dc6c14d346cc633f5849612cb7d335f461e13d40 /src/render/framegraph/framegraphnode_p.h | |
parent | 6931ac1c9461278baaddfef032101ab9e73694c4 (diff) |
Removed factory member variable
The variable was removed from QBackendNode and subsequently
all areas it appeared.
Task-number: QTBUG-49682
Change-Id: I5904714b55aaefbe07ee11008ff49cd1d9b89950
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/framegraph/framegraphnode_p.h')
-rw-r--r-- | src/render/framegraph/framegraphnode_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index a0a45f37c..e6d35849a 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -131,9 +131,9 @@ public: { } - Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE { - return createBackendFrameGraphNode(frontend, factory); + return createBackendFrameGraphNode(frontend); } Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE @@ -147,13 +147,12 @@ public: } protected: - Backend *createBackendFrameGraphNode(Qt3DCore::QNode *n, const Qt3DCore::QBackendNodeFactory *factory) const + Backend *createBackendFrameGraphNode(Qt3DCore::QNode *n) const { Frontend *f = qobject_cast<Frontend *>(n); if (f != Q_NULLPTR) { if (!m_manager->containsNode(n->id())) { Backend *backend = new Backend(); - backend->setFactory(factory); backend->setFrameGraphManager(m_manager); backend->setPeer(f); QFrameGraphNode *parentFGNode = static_cast<QFrameGraphNode *>(n)->parentFrameGraphNode(); @@ -175,7 +174,7 @@ class FrameGraphComponentFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit FrameGraphComponentFunctor(AbstractRenderer *renderer); - Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE; Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; |