summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/attribute_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/geometry/attribute_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/geometry/attribute_p.h')
-rw-r--r--src/render/geometry/attribute_p.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index cb952bcf7..83a5dfacf 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
namespace Render {
-class Q_AUTOTEST_EXPORT Attribute : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT Attribute : public Qt3DCore::QBackendNode
{
public:
Attribute();
@@ -65,31 +65,31 @@ 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;
- inline Qt3D::QNodeId bufferId() const { return m_bufferId; }
+ inline Qt3DCore::QNodeId bufferId() const { return m_bufferId; }
inline QString name() const { return m_name; }
- inline Qt3D::QAbstractAttribute::DataType dataType() const { return m_dataType; }
+ inline Qt3DCore::QAbstractAttribute::DataType dataType() const { return m_dataType; }
inline uint dataSize() const { return m_dataSize; }
inline uint count() const { return m_count; }
inline uint byteStride() const { return m_byteStride; }
inline uint byteOffset() const { return m_byteOffset; }
inline uint divisor() const { return m_divisor; }
- inline Qt3D::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
+ inline Qt3DCore::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
inline bool isDirty() const { return m_attributeDirty; }
void unsetDirty();
private:
- Qt3D::QNodeId m_bufferId;
+ Qt3DCore::QNodeId m_bufferId;
QString m_name;
- Qt3D::QAbstractAttribute::DataType m_dataType;
+ Qt3DCore::QAbstractAttribute::DataType m_dataType;
uint m_dataSize;
uint m_count;
uint m_byteStride;
uint m_byteOffset;
uint m_divisor;
- Qt3D::QAbstractAttribute::AttributeType m_attributeType;
+ Qt3DCore::QAbstractAttribute::AttributeType m_attributeType;
bool m_attributeDirty;
};