diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2014-10-15 13:38:32 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-16 10:18:14 +0200 |
commit | cd1d21fdad54315c4a8ade860ce6b31aa5a6f4b9 (patch) | |
tree | c1c042dfdb6c7fd8644c2e45a1cdad18b0703e57 /src/render/frontend/qcylindermesh.cpp | |
parent | 0f1d0ff5b3adb16afcda091e4ff4657f53581f79 (diff) |
Have copy() only on QNode
It was previously both on QNode and QNodePrivate. The one on
QNodePrivate didn't give us much as it didn't eliminate the virtual of
QNode.
Change-Id: Ia1ea9dd831674109c84bd7005abe7fde3b1223fa
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qcylindermesh.cpp')
-rw-r--r-- | src/render/frontend/qcylindermesh.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/render/frontend/qcylindermesh.cpp b/src/render/frontend/qcylindermesh.cpp index da371db4d..dfcea7570 100644 --- a/src/render/frontend/qcylindermesh.cpp +++ b/src/render/frontend/qcylindermesh.cpp @@ -80,8 +80,6 @@ class QCylinderMeshPrivate : public QAbstractShapeMeshPrivate , m_length(1.0) {} - void copy(const QNodePrivate *ref) Q_DECL_OVERRIDE; - Q_DECLARE_PUBLIC(QCylinderMesh) int m_rings; int m_slices; @@ -89,14 +87,14 @@ class QCylinderMeshPrivate : public QAbstractShapeMeshPrivate float m_length; }; -void QCylinderMeshPrivate::copy(const QNodePrivate *ref) +void QCylinderMesh::copy(const QNode *ref) { - QAbstractShapeMeshPrivate::copy(ref); - const QCylinderMeshPrivate *mesh = static_cast<const QCylinderMeshPrivate *>(ref); - m_rings = mesh->m_rings; - m_slices = mesh->m_slices; - m_radius = mesh->m_radius; - m_length = mesh->m_length; + QAbstractShapeMesh::copy(ref); + const QCylinderMesh *mesh = static_cast<const QCylinderMesh*>(ref); + d_func()->m_rings = mesh->d_func()->m_rings; + d_func()->m_slices = mesh->d_func()->m_slices; + d_func()->m_radius = mesh->d_func()->m_radius; + d_func()->m_length = mesh->d_func()->m_length; } QCylinderMesh::QCylinderMesh(QNode *parent) |