summaryrefslogtreecommitdiffstats
path: root/src/render/texture/textureimage_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/texture/textureimage_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/texture/textureimage_p.h')
-rw-r--r--src/render/texture/textureimage_p.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index 8b81a6756..bde1e58ca 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -66,13 +66,13 @@ class TextureDataManager;
typedef uint TextureImageDNA;
-class TextureImage : public Qt3D::QBackendNode
+class TextureImage : public Qt3DCore::QBackendNode
{
public:
TextureImage();
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;
int m_layer;
int m_mipmapLevel;
@@ -105,22 +105,22 @@ private:
TextureManager *m_textureManager;
TextureImageManager *m_textureImageManager;
TextureDataManager *m_textureDataManager;
- QList<Qt3D::QNodeId> m_referencedTextures;
+ QList<Qt3DCore::QNodeId> m_referencedTextures;
HTexture m_textureProvider;
- Qt3D::QNodeId m_textureProviderId;
+ Qt3DCore::QNodeId m_textureProviderId;
TextureImageDNA m_dna;
};
-class TextureImageFunctor : public Qt3D::QBackendNodeFunctor
+class TextureImageFunctor : public Qt3DCore::QBackendNodeFunctor
{
public:
explicit TextureImageFunctor(TextureManager *textureManager,
TextureImageManager *textureImageManager,
TextureDataManager *textureDataManager);
- Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL;
- Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
- void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
+ Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+ Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+ void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
private:
TextureManager *m_textureManager;