QAttribute: merge with QAbstractAttribute

remove asVector and dump functions

Change-Id: I0c4e4e240ed4b69f72b3de6379c6866743d48b17
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index 610cc74e1..dcf321be8 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -73,26 +73,26 @@ public:
 
     inline Qt3DCore::QNodeId bufferId() const { return m_bufferId; }
     inline QString name() const { return m_name; }
-    inline QAbstractAttribute::DataType dataType() const { return m_dataType; }
+    inline QAttribute::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 QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
+    inline QAttribute::AttributeType attributeType() const { return m_attributeType; }
     inline bool isDirty() const { return m_attributeDirty; }
     void unsetDirty();
 
 private:
     Qt3DCore::QNodeId m_bufferId;
     QString m_name;
-    QAbstractAttribute::DataType m_dataType;
+    QAttribute::DataType m_dataType;
     uint m_dataSize;
     uint m_count;
     uint m_byteStride;
     uint m_byteOffset;
     uint m_divisor;
-    QAbstractAttribute::AttributeType m_attributeType;
+    QAttribute::AttributeType m_attributeType;
     bool m_attributeDirty;
 };