summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/renderpass_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-10-12 20:45:19 +0100
committerPaul Lemire <paul.lemire@kdab.com>2015-10-13 13:19:50 +0000
commit7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch)
tree53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/render/materialsystem/renderpass_p.h
parent0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff)
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/renderpass_p.h')
-rw-r--r--src/render/materialsystem/renderpass_p.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h
index 70f3fdf25..2d5a2a6d8 100644
--- a/src/render/materialsystem/renderpass_p.h
+++ b/src/render/materialsystem/renderpass_p.h
@@ -71,7 +71,7 @@ namespace Render {
class RenderPassManager;
class RenderState;
-class Q_AUTOTEST_EXPORT RenderPass : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT RenderPass : public Qt3DCore::QBackendNode
{
public:
RenderPass();
@@ -79,29 +79,29 @@ public:
void cleanup();
- void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
- void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+ void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+ void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
- Qt3D::QNodeId shaderProgram() const;
+ Qt3DCore::QNodeId shaderProgram() const;
QList<ParameterMapping> bindings() const;
- QList<Qt3D::QNodeId> annotations() const;
+ QList<Qt3DCore::QNodeId> annotations() const;
QList<RenderState *> renderStates() const;
- QList<Qt3D::QNodeId> parameters() const;
+ QList<Qt3DCore::QNodeId> parameters() const;
private:
- void appendAnnotation(const Qt3D::QNodeId &criterionId);
- void removeAnnotation(const Qt3D::QNodeId &criterionId);
+ void appendAnnotation(const Qt3DCore::QNodeId &criterionId);
+ void removeAnnotation(const Qt3DCore::QNodeId &criterionId);
void appendBinding(const ParameterMapping &binding);
- void removeBinding(const Qt3D::QNodeId &bindingId);
+ void removeBinding(const Qt3DCore::QNodeId &bindingId);
- void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState);
- void removeRenderState(const Qt3D::QNodeId &renderStateId);
+ void appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState);
+ void removeRenderState(const Qt3DCore::QNodeId &renderStateId);
- Qt3D::QNodeId m_shaderUuid;
- QHash<Qt3D::QNodeId, ParameterMapping> m_bindings;
- QHash<Qt3D::QNodeId, RenderState *> m_renderStates;
- QList<Qt3D::QNodeId> m_annotationList;
+ Qt3DCore::QNodeId m_shaderUuid;
+ QHash<Qt3DCore::QNodeId, ParameterMapping> m_bindings;
+ QHash<Qt3DCore::QNodeId, RenderState *> m_renderStates;
+ QList<Qt3DCore::QNodeId> m_annotationList;
ParameterPack m_parameterPack;
};