Dedicated QRenderBackendNode

Render aspect Backend nodes now subclass from QRenderBackendNode,
which is a subclass of QBackendNode. We may want to store aspect-
related data in each backend node

Change-Id: I4f00de09c8cc31d2347d919151d359ad44cf03a9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

15 files changed, 28 insertions, 30 deletions

diff --git a/src/render/materialsystem/annotation.cpp b/src/render/materialsystem/annotation.cpp
index 0e091e3b4..c3cf71b2d 100644
--- a/src/render/materialsystem/annotation.cpp
+++ b/src/render/materialsystem/annotation.cpp
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 namespace Render {
 
 Annotation::Annotation()
-    : QBackendNode()
+    : BackendNode()
 {
 }
 
diff --git a/src/render/materialsystem/annotation_p.h b/src/render/materialsystem/annotation_p.h
index 44da913b7..79c473372 100644
--- a/src/render/materialsystem/annotation_p.h
+++ b/src/render/materialsystem/annotation_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
+#include <Qt3DRender/private/backendnode_p.h>
 #include <Qt3DRender/qannotation.h>
-#include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,7 +64,7 @@ namespace Render {
 
 class CriterionManager;
 
-class Annotation : public Qt3DCore::QBackendNode
+class Annotation : public BackendNode
 {
 public:
     Annotation();
diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp
index 262aa6484..3cbfe9f9e 100644
--- a/src/render/materialsystem/effect.cpp
+++ b/src/render/materialsystem/effect.cpp
@@ -54,7 +54,7 @@ namespace Qt3DRender {
 namespace Render {
 
 Effect::Effect()
-    : QBackendNode()
+    : BackendNode()
 {
 }
 
diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h
index 39cf98932..1593a83c9 100644
--- a/src/render/materialsystem/effect_p.h
+++ b/src/render/materialsystem/effect_p.h
@@ -51,10 +51,9 @@
 // We mean it.
 //
 
+#include <Qt3DRender/private/backendnode_p.h>
 #include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DRender/private/parameterpack_p.h>
-#include <Qt3DCore/qbackendnode.h>
-#include <Qt3DCore/qnodeid.h>
 #include <QList>
 
 QT_BEGIN_NAMESPACE
@@ -65,7 +64,7 @@ class QTechnique;
 
 namespace Render {
 
-class Effect : public Qt3DCore::QBackendNode
+class Effect : public BackendNode
 {
 public:
     Effect();
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp
index 04006ae21..5c4f6f537 100644
--- a/src/render/materialsystem/material.cpp
+++ b/src/render/materialsystem/material.cpp
@@ -56,7 +56,7 @@ namespace Qt3DRender {
 namespace Render {
 
 Material::Material()
-    : QBackendNode()
+    : BackendNode()
     , m_enabled(true)
 {
 }
diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h
index 44893d83a..08736ef23 100644
--- a/src/render/materialsystem/material_p.h
+++ b/src/render/materialsystem/material_p.h
@@ -53,9 +53,9 @@
 
 #include <QVariant>
 
+#include <Qt3DRender/private/backendnode_p.h>
 #include <Qt3DRender/private/quniformvalue_p.h>
 #include <Qt3DRender/private/parameterpack_p.h>
-#include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -72,7 +72,7 @@ class Technique;
 class Effect;
 class MaterialManager;
 
-class Q_AUTOTEST_EXPORT Material : public Qt3DCore::QBackendNode
+class Q_AUTOTEST_EXPORT Material : public BackendNode
 {
 public:
     Material();
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp
index 991a368c8..b5007ae95 100644
--- a/src/render/materialsystem/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 namespace Render {
 
 Parameter::Parameter()
-    : QBackendNode()
+    : BackendNode()
     , m_nameId(-1)
 {
 }
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h
index 147e8fa4e..cf95342d8 100644
--- a/src/render/materialsystem/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qbackendnode.h>
+#include <Qt3DRender/private/backendnode_p.h>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -64,7 +64,7 @@ class ParameterManager;
 class ShaderDataManager;
 class TextureManager;
 
-class Parameter : public Qt3DCore::QBackendNode
+class Parameter : public BackendNode
 {
 public:
     Parameter();
diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp
index 85e71995b..6f4a6e117 100644
--- a/src/render/materialsystem/renderpass.cpp
+++ b/src/render/materialsystem/renderpass.cpp
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 namespace Render {
 
 RenderPass::RenderPass()
-    : QBackendNode()
+    : BackendNode()
 {
 }
 
diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h
index 0adf68c17..5b6ef6bf3 100644
--- a/src/render/materialsystem/renderpass_p.h
+++ b/src/render/materialsystem/renderpass_p.h
@@ -52,13 +52,12 @@
 // We mean it.
 //
 
+#include <Qt3DRender/private/backendnode_p.h>
 #include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DRender/private/parametermapping_p.h>
 #include <Qt3DRender/private/parameterpack_p.h>
 #include <Qt3DRender/private/renderstatecollection_p.h>
 #include <Qt3DCore/private/qabstractaspect_p.h>
-#include <Qt3DCore/qbackendnode.h>
-#include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -75,7 +74,7 @@ namespace Render {
 class RenderPassManager;
 class RenderState;
 
-class Q_AUTOTEST_EXPORT RenderPass : public Qt3DCore::QBackendNode, public RenderStateCollection
+class Q_AUTOTEST_EXPORT RenderPass : public BackendNode, public RenderStateCollection
 {
 public:
     RenderPass();
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp
index 13ead2dd6..6c07c1caf 100644
--- a/src/render/materialsystem/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 namespace Render {
 
 Shader::Shader()
-    : QBackendNode()
+    : BackendNode()
     , m_program(Q_NULLPTR)
     , m_isLoaded(false)
     , m_dna(0)
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index 5f45e9182..614914bd7 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -51,11 +51,11 @@
 // We mean it.
 //
 
-#include <QMutex>
-#include <QVector>
+#include <Qt3DRender/private/backendnode_p.h>
 #include <Qt3DRender/private/quniformvalue_p.h>
 #include <Qt3DRender/private/shadervariables_p.h>
-#include <Qt3DCore/qbackendnode.h>
+#include <QMutex>
+#include <QVector>
 
 QT_BEGIN_NAMESPACE
 
@@ -72,7 +72,7 @@ class AttachmentPack;
 
 typedef uint ProgramDNA;
 
-class Q_AUTOTEST_EXPORT Shader : public Qt3DCore::QBackendNode
+class Q_AUTOTEST_EXPORT Shader : public BackendNode
 {
 public:
     Shader();
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index 5ccff48ce..4a153f51e 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qbackendnode.h>
-#include <private/shadervariables_p.h>
+#include <Qt3DRender/private/backendnode_p.h>
+#include <Qt3DRender/private/shadervariables_p.h>
 #include <Qt3DRender/qshaderdata.h>
 #include <QMutex>
 #include <QMatrix4x4>
@@ -67,7 +67,7 @@ class GraphicsContext;
 class GLBuffer;
 class NodeManagers;
 
-class Q_AUTOTEST_EXPORT ShaderData : public Qt3DCore::QBackendNode
+class Q_AUTOTEST_EXPORT ShaderData : public BackendNode
 {
 public:
     ShaderData();
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index a464e68d6..2b1ba65b1 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -59,7 +59,7 @@ namespace Qt3DRender {
 namespace Render {
 
 Technique::Technique()
-    : QBackendNode()
+    : BackendNode()
     , m_graphicsApiFilter(Q_NULLPTR)
 {
 }
diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h
index 3cfcdd3f7..277dbdf7b 100644
--- a/src/render/materialsystem/technique_p.h
+++ b/src/render/materialsystem/technique_p.h
@@ -52,11 +52,11 @@
 // We mean it.
 //
 
-#include <QVector>
-#include <QStringList>
+#include <Qt3DRender/private/backendnode_p.h>
 #include <Qt3DRender/private/parameterpack_p.h>
 #include <Qt3DRender/qannotation.h>
-#include <Qt3DCore/qbackendnode.h>
+#include <QVector>
+#include <QStringList>
 
 QT_BEGIN_NAMESPACE
 
@@ -72,7 +72,7 @@ namespace Render {
 
 class TechniqueManager;
 
-class Technique : public Qt3DCore::QBackendNode
+class Technique : public BackendNode
 {
 public:
     Technique();