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/qdepthmask.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/qdepthmask.cpp')
-rw-r--r-- | src/render/frontend/qdepthmask.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/render/frontend/qdepthmask.cpp b/src/render/frontend/qdepthmask.cpp index bd0258089..d90d79988 100644 --- a/src/render/frontend/qdepthmask.cpp +++ b/src/render/frontend/qdepthmask.cpp @@ -58,8 +58,6 @@ public: { } - void copy(const QNodePrivate *ref) Q_DECL_OVERRIDE; - Q_DECLARE_PUBLIC(QDepthMask) bool m_mask; }; @@ -69,11 +67,11 @@ QDepthMask::QDepthMask(QNode *parent) { } -void QDepthMaskPrivate::copy(const QNodePrivate *ref) +void QDepthMask::copy(const QNode *ref) { - QRenderStatePrivate::copy(ref); - const QDepthMaskPrivate *refState = static_cast<const QDepthMaskPrivate *>(ref); - m_mask = refState->m_mask; + QRenderState::copy(ref); + const QDepthMask *refState = static_cast<const QDepthMask*>(ref); + d_func()->m_mask = refState->d_func()->m_mask; } bool QDepthMask::mask() const |