summaryrefslogtreecommitdiffstats
path: root/src/render/texture/texture_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/texture_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/texture_p.h')
-rw-r--r--src/render/texture/texture_p.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index d520afae7..313dc40b0 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -71,14 +71,14 @@ class TextureDataManager;
typedef uint TextureDNA;
-class Texture : public Qt3D::QBackendNode
+class Texture : public Qt3DCore::QBackendNode
{
public:
Texture();
~Texture();
void cleanup();
- void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+ void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
QOpenGLTexture* getOrCreateGLTexture() ;
@@ -86,7 +86,7 @@ public:
bool isTextureReset() const;
- void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+ void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
TextureDNA dna() const;
void setTextureManager(TextureManager *manager);
@@ -145,16 +145,16 @@ private:
void updateDNA();
};
-class TextureFunctor : public Qt3D::QBackendNodeFunctor
+class TextureFunctor : public Qt3DCore::QBackendNodeFunctor
{
public:
explicit TextureFunctor(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;