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/qrenderpass.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/qrenderpass.cpp')
-rw-r--r-- | src/render/frontend/qrenderpass.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp index 7057103f5..ea267418b 100644 --- a/src/render/frontend/qrenderpass.cpp +++ b/src/render/frontend/qrenderpass.cpp @@ -61,18 +61,18 @@ QRenderPassPrivate::QRenderPassPrivate(QRenderPass *qq) { } -void QRenderPassPrivate::copy(const QNodePrivate *ref) +void QRenderPass::copy(const QNode *ref) { - QNodePrivate::copy(ref); - const QRenderPassPrivate *other = static_cast<const QRenderPassPrivate*>(ref); - m_shader = qobject_cast<QShaderProgram *>(QNodePrivate::get(other->m_shader)->clone()); - - Q_FOREACH (QCriterion *crit, other->m_criteriaList) - q_func()->addCriterion(qobject_cast<QCriterion *>(QNodePrivate::get(crit)->clone())); - Q_FOREACH (QParameterMapper *binding, other->m_bindings) - q_func()->addBinding(qobject_cast<QParameterMapper *>(QNodePrivate::get(binding)->clone())); - Q_FOREACH (QRenderState *renderState, other->m_renderStates) - q_func()->addRenderState(qobject_cast<QRenderState *>(QNodePrivate::get(renderState)->clone())); + QNode::copy(ref); + const QRenderPass *other = static_cast<const QRenderPass*>(ref); + d_func()->m_shader = qobject_cast<QShaderProgram *>(QNodePrivate::get(other->d_func()->m_shader)->clone()); + + Q_FOREACH (QCriterion *crit, other->d_func()->m_criteriaList) + addCriterion(qobject_cast<QCriterion *>(QNodePrivate::get(crit)->clone())); + Q_FOREACH (QParameterMapper *binding, other->d_func()->m_bindings) + addBinding(qobject_cast<QParameterMapper *>(QNodePrivate::get(binding)->clone())); + Q_FOREACH (QRenderState *renderState, other->d_func()->m_renderStates) + addRenderState(qobject_cast<QRenderState *>(QNodePrivate::get(renderState)->clone())); } QRenderPass::QRenderPass(QNode *parent) |