Fix API consistency in QAttribute

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

2 files changed, 22 insertions, 6 deletions

diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp
index fd1ceee60..cee0c5d13 100644
--- a/src/render/geometry/qattribute.cpp
+++ b/src/render/geometry/qattribute.cpp
@@ -287,7 +287,7 @@ void QAttribute::setName(const QString &name)
     emit nameChanged(name);
 }
 
-void QAttribute::setDataType(VertexBaseType type)
+void QAttribute::setVertexBaseType(VertexBaseType type)
 {
     Q_D(QAttribute);
 
@@ -295,19 +295,31 @@ void QAttribute::setDataType(VertexBaseType type)
         return;
 
     d->m_dataType = type;
+    emit vertexBaseTypeChanged(type);
     emit dataTypeChanged(type);
 }
 
-void QAttribute::setDataSize(uint size)
+void QAttribute::setVertexSize(uint size)
 {
     Q_D(QAttribute);
     if (d->m_dataSize == size)
         return;
     Q_ASSERT(size >= 1 && size <= 4);
     d->m_dataSize = size;
+    emit vertexSizeChanged(size);
     emit dataSizeChanged(size);
 }
 
+void QAttribute::setDataType(VertexBaseType type)
+{
+    setVertexBaseType(type);
+}
+
+void QAttribute::setDataSize(uint size)
+{
+    setVertexSize(size);
+}
+
 void QAttribute::setCount(uint count)
 {
     Q_D(QAttribute);
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index e6b525dc4..e907c64e1 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -58,8 +58,8 @@ class QT3DRENDERSHARED_EXPORT QAttribute : public Qt3DCore::QNode
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(VertexBaseType vertexBaseType READ vertexBaseType WRITE setDataType NOTIFY dataTypeChanged)
-    Q_PROPERTY(uint vertexSize READ vertexSize WRITE setDataSize NOTIFY dataSizeChanged)
+    Q_PROPERTY(VertexBaseType vertexBaseType READ vertexBaseType WRITE setVertexBaseType NOTIFY vertexBaseTypeChanged)
+    Q_PROPERTY(uint vertexSize READ vertexSize WRITE setVertexSize NOTIFY vertexSizeChanged)
     Q_PROPERTY(uint count READ count WRITE setCount NOTIFY countChanged)
     Q_PROPERTY(uint byteStride READ byteStride WRITE setByteStride NOTIFY byteStrideChanged)
     Q_PROPERTY(uint byteOffset READ byteOffset WRITE setByteOffset NOTIFY byteOffsetChanged)
@@ -111,8 +111,10 @@ public:
 public Q_SLOTS:
     void setBuffer(QBuffer *buffer);
     void setName(const QString &name);
-    void setDataType(VertexBaseType type);
-    void setDataSize(uint size);
+    void setVertexBaseType(VertexBaseType type);
+    void setVertexSize(uint size);
+    QT_DEPRECATED void setDataType(VertexBaseType type);
+    QT_DEPRECATED void setDataSize(uint size);
     void setCount(uint count);
     void setByteStride(uint byteStride);
     void setByteOffset(uint byteOffset);
@@ -122,6 +124,8 @@ public Q_SLOTS:
 Q_SIGNALS:
     void bufferChanged(QBuffer *buffer);
     void nameChanged(const QString &name);
+    void vertexBaseTypeChanged(VertexBaseType vertexBaseType);
+    void vertexSizeChanged(uint vertexSize);
     void dataTypeChanged(VertexBaseType vertexBaseType);
     void dataSizeChanged(uint vertexSize);
     void countChanged(uint count);