QAttribute API changes

- rename dataType to vertexBaseType
- rename dataSize to vertexSize

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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/render/jobs/calcboundingvolumejob.cpp b/src/render/jobs/calcboundingvolumejob.cpp
index f876e2d0d..7bc67f25a 100644
--- a/src/render/jobs/calcboundingvolumejob.cpp
+++ b/src/render/jobs/calcboundingvolumejob.cpp
@@ -97,8 +97,8 @@ void calculateLocalBoundingVolume(NodeManagers *manager, Entity *node)
             if (pickVolumeAttribute) {
                 if (!pickVolumeAttribute
                         || pickVolumeAttribute->attributeType() != QAttribute::VertexAttribute
-                        || pickVolumeAttribute->dataType() != QAttribute::Float
-                        || pickVolumeAttribute->dataSize() < 3) {
+                        || pickVolumeAttribute->vertexBaseType() != QAttribute::Float
+                        || pickVolumeAttribute->vertexSize() < 3) {
                     qWarning() << "QBoundingVolumeSpecifier pickVolume Attribute not suited for bounding volume computation";
                     return;
                 }
@@ -123,7 +123,7 @@ void calculateLocalBoundingVolume(NodeManagers *manager, Entity *node)
                     const QByteArray buffer = buf->data();
                     const char *rawBuffer = buffer.constData();
                     rawBuffer += pickVolumeAttribute->byteOffset();
-                    const int stride = pickVolumeAttribute->byteStride() ? pickVolumeAttribute->byteStride() : sizeof(float) * pickVolumeAttribute->dataSize();
+                    const int stride = pickVolumeAttribute->byteStride() ? pickVolumeAttribute->byteStride() : sizeof(float) * pickVolumeAttribute->vertexSize();
                     QVector<QVector3D> vertices(pickVolumeAttribute->count());
 
                     // TODO avoid copying the vertices
@@ -131,7 +131,7 @@ void calculateLocalBoundingVolume(NodeManagers *manager, Entity *node)
                         QVector3D v;
                         const float *fptr = reinterpret_cast<const float*>(rawBuffer);
                         // TODO unwrap loop (switch?)
-                        for (uint i = 0, m = qMin(pickVolumeAttribute->dataSize(), 3U); i < m; ++i)
+                        for (uint i = 0, m = qMin(pickVolumeAttribute->vertexSize(), 3U); i < m; ++i)
                             v[i] = fptr[i];
                         vertices[c] = v;
                         rawBuffer += stride;