Hide doClone implementations behind a macro

This way we will avoid inconsistencies. It also means making some of the
copy() implementations more clever.

Change-Id: Ic79c9ec7c9c32f8951d5d9f5184592880bf8d5fd
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index 60f7e71fd..17fea861a 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -63,6 +63,8 @@ void QTransformPrivate::copy(const QNodePrivate *ref)
     QComponentPrivate::copy(ref);
     const QTransformPrivate *transform = static_cast<const QTransformPrivate *>(ref);
     m_matrix = transform->m_matrix;
+    Q_FOREACH (QAbstractTransform *t, transform->m_transforms)
+        q_func()->appendTransform(qobject_cast<QAbstractTransform *>(QNodePrivate::get(t)->clone()));
 }
 
 QTransform::QTransform(QNode *parent)
@@ -94,16 +96,6 @@ QTransform::QTransform(QTransformPrivate &dd, QNode *parent)
 {
 }
 
-QTransform *QTransform::doClone() const
-{
-    Q_D(const QTransform);
-    QTransform *clone = new QTransform();
-    clone->d_func()->copy(d_func());
-    Q_FOREACH (QAbstractTransform *t, d->m_transforms)
-        clone->appendTransform(qobject_cast<QAbstractTransform *>(QNodePrivate::get(t)->clone()));
-    return clone;
-}
-
 void QTransform::setTransformsDirty()
 {
     Q_D(QTransform);