summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qrenderattachment.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-08-31 15:14:17 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-10-13 07:15:15 +0000
commitaf40840eedf35404ba4b39e890c158e2328ff6ec (patch)
treece4ac1f925c34b56704c99bd332e0436e68dbecc /src/render/frontend/qrenderattachment.h
parent0269afd106da5d4d999585b3bdb1332a2c01af12 (diff)
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/frontend/qrenderattachment.h')
-rw-r--r--src/render/frontend/qrenderattachment.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h
index 15706fb1d..49c14b146 100644
--- a/src/render/frontend/qrenderattachment.h
+++ b/src/render/frontend/qrenderattachment.h
@@ -34,24 +34,24 @@
**
****************************************************************************/
-#ifndef QT3D_QRENDERATTACHMENT_H
-#define QT3D_QRENDERATTACHMENT_H
+#ifndef QT3DRENDER_QRENDERATTACHMENT_H
+#define QT3DRENDER_QRENDERATTACHMENT_H
#include <Qt3DCore/qnode.h>
#include <Qt3DRenderer/qt3drenderer_global.h>
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DRender {
class QAbstractTextureProvider;
class QRenderAttachmentPrivate;
-class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public QNode
+class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3D::QNode
{
Q_OBJECT
Q_PROPERTY(RenderAttachmentType type READ type WRITE setType NOTIFY typeChanged)
- Q_PROPERTY(Qt3D::QAbstractTextureProvider *texture READ texture WRITE setTexture NOTIFY textureChanged)
+ Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *texture READ texture WRITE setTexture NOTIFY textureChanged)
Q_PROPERTY(int mipLevel READ mipLevel WRITE setMipLevel NOTIFY mipLevelChanged)
Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged)
Q_PROPERTY(CubeMapFace face READ face WRITE setFace NOTIFY faceChanged)
@@ -91,7 +91,7 @@ public:
};
Q_ENUM(CubeMapFace)
- explicit QRenderAttachment(QNode *parent = 0);
+ explicit QRenderAttachment(Qt3D::QNode *parent = 0);
~QRenderAttachment();
void setType(RenderAttachmentType type);
@@ -121,18 +121,18 @@ Q_SIGNALS:
void nameChanged();
protected:
- QRenderAttachment(QRenderAttachmentPrivate &dd, QNode *parent = 0);
- void copy(const QNode *ref) Q_DECL_OVERRIDE;
+ QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3D::QNode *parent = 0);
+ void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
private:
Q_DECLARE_PRIVATE(QRenderAttachment)
QT3D_CLONEABLE(QRenderAttachment)
};
-} // Qt3D
+} // namespace Qt3DRender
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QRenderAttachment::RenderAttachmentType)
+Q_DECLARE_METATYPE(Qt3DRender::QRenderAttachment::RenderAttachmentType)
-#endif // QT3D_QRENDERATTACHMENT_H
+#endif // QT3DRENDER_QRENDERATTACHMENT_H