summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-03-17 14:42:30 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-03-23 09:14:08 +0000
commit36d04cbeeddb85075b01cf0ae3e83b3d1e27ddaa (patch)
tree9cb0f7fb7831a93f99583a788f16bf7ad9d31339 /src/core
parente7e2a07fa743f681596919034ccbd3fd5a856cf8 (diff)
Make QAbstractTransform derive from QObject directly
The backend will never know about sub-transforms, so there is no any sense in making them a part of the scene. Change-Id: I575689ef4a2bbe871d16715ea6d7ff6b5858c566 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/transforms/qabstracttransform.cpp15
-rw-r--r--src/core/transforms/qabstracttransform.h11
-rw-r--r--src/core/transforms/qabstracttransform_p.h9
-rw-r--r--src/core/transforms/qlookattransform.cpp20
-rw-r--r--src/core/transforms/qlookattransform.h8
-rw-r--r--src/core/transforms/qlookattransform_p.h3
-rw-r--r--src/core/transforms/qmatrixtransform.cpp26
-rw-r--r--src/core/transforms/qmatrixtransform.h12
-rw-r--r--src/core/transforms/qmatrixtransform_p.h2
-rw-r--r--src/core/transforms/qrotatetransform.cpp17
-rw-r--r--src/core/transforms/qrotatetransform.h8
-rw-r--r--src/core/transforms/qrotatetransform_p.h2
-rw-r--r--src/core/transforms/qscaletransform.cpp16
-rw-r--r--src/core/transforms/qscaletransform.h7
-rw-r--r--src/core/transforms/qscaletransform_p.h2
-rw-r--r--src/core/transforms/qtransform.cpp2
-rw-r--r--src/core/transforms/qtranslatetransform.cpp17
-rw-r--r--src/core/transforms/qtranslatetransform.h8
-rw-r--r--src/core/transforms/qtranslatetransform_p.h2
19 files changed, 66 insertions, 121 deletions
diff --git a/src/core/transforms/qabstracttransform.cpp b/src/core/transforms/qabstracttransform.cpp
index 27240d574..aa40902b5 100644
--- a/src/core/transforms/qabstracttransform.cpp
+++ b/src/core/transforms/qabstracttransform.cpp
@@ -41,22 +41,19 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
-QAbstractTransformPrivate::QAbstractTransformPrivate(QAbstractTransform *qq)
- : QNodePrivate(qq)
+QAbstractTransformPrivate::QAbstractTransformPrivate()
+ : QObjectPrivate()
{
}
-QAbstractTransform::QAbstractTransform(QNode *parent)
- : QNode(*new QAbstractTransformPrivate(this), parent)
-{
-}
-QAbstractTransform::~QAbstractTransform()
+QAbstractTransform::QAbstractTransform(QObject *parent)
+ : QObject(*new QAbstractTransformPrivate, parent)
{
}
-QAbstractTransform::QAbstractTransform(QAbstractTransformPrivate &dd, QNode *parent)
- : QNode(dd, parent)
+QAbstractTransform::QAbstractTransform(QAbstractTransformPrivate &dd, QObject *parent)
+ : QObject(dd, parent)
{
}
diff --git a/src/core/transforms/qabstracttransform.h b/src/core/transforms/qabstracttransform.h
index c634a4b6f..091ab2bf4 100644
--- a/src/core/transforms/qabstracttransform.h
+++ b/src/core/transforms/qabstracttransform.h
@@ -37,7 +37,7 @@
#ifndef QT3D_QABSTRACT_TRANSFORM_H
#define QT3D_QABSTRACT_TRANSFORM_H
-#include <Qt3DCore/qnode.h>
+#include <QtCore/qobject.h>
#include <Qt3DCore/qt3dcore_global.h>
#include <QMatrix4x4>
@@ -47,25 +47,24 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
class QAbstractTransformPrivate;
-
-class QT3DCORESHARED_EXPORT QAbstractTransform : public QNode
+class QT3DCORESHARED_EXPORT QAbstractTransform : public QObject
{
Q_OBJECT
Q_PROPERTY(QMatrix4x4 transformMatrix READ transformMatrix NOTIFY transformMatrixChanged)
public:
- explicit QAbstractTransform(QNode *parent = 0);
- virtual ~QAbstractTransform();
+ explicit QAbstractTransform(QObject *parent = Q_NULLPTR);
virtual QMatrix4x4 transformMatrix() const = 0;
Q_SIGNALS:
void transformMatrixChanged();
protected:
- QAbstractTransform(QAbstractTransformPrivate &dd, QNode *parent = 0);
+ QAbstractTransform(QAbstractTransformPrivate &dd, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QAbstractTransform)
+ Q_DISABLE_COPY(QAbstractTransform)
};
} // namespace Qt3D
diff --git a/src/core/transforms/qabstracttransform_p.h b/src/core/transforms/qabstracttransform_p.h
index 1c27904f7..ceb15bc11 100644
--- a/src/core/transforms/qabstracttransform_p.h
+++ b/src/core/transforms/qabstracttransform_p.h
@@ -37,20 +37,17 @@
#ifndef QT3D_QABSTRACTTRANSFORM_P_H
#define QT3D_QABSTRACTTRANSFORM_P_H
-#include <private/qnode_p.h>
-#include <Qt3DCore/qt3dcore_global.h>
+#include <private/qobject_p.h>
#include <Qt3DCore/qabstracttransform.h>
QT_BEGIN_NAMESPACE
namespace Qt3D {
-class QAbstractTransform;
-
-class QT3DCORESHARED_EXPORT QAbstractTransformPrivate : public QNodePrivate
+class QAbstractTransformPrivate : public QObjectPrivate
{
public:
- QAbstractTransformPrivate(QAbstractTransform *qq);
+ QAbstractTransformPrivate();
Q_DECLARE_PUBLIC(QAbstractTransform)
};
diff --git a/src/core/transforms/qlookattransform.cpp b/src/core/transforms/qlookattransform.cpp
index 2ee8d544c..ce042e229 100644
--- a/src/core/transforms/qlookattransform.cpp
+++ b/src/core/transforms/qlookattransform.cpp
@@ -41,29 +41,19 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
-QLookAtTransformPrivate::QLookAtTransformPrivate(QLookAtTransform *qq)
- : QAbstractTransformPrivate(qq)
+QLookAtTransformPrivate::QLookAtTransformPrivate()
+ : QAbstractTransformPrivate()
, m_matrixDirty(true)
{
}
-QLookAtTransform::QLookAtTransform(QNode *parent)
- : QAbstractTransform(*new QLookAtTransformPrivate(this), parent)
-{
-}
-void QLookAtTransform::copy(const QNode *ref)
+QLookAtTransform::QLookAtTransform(QObject *parent)
+ : QAbstractTransform(*new QLookAtTransformPrivate, parent)
{
- QAbstractTransform::copy(ref);
- const QLookAtTransform *transform = static_cast<const QLookAtTransform*>(ref);
- d_func()->m_matrix = transform->d_func()->m_matrix;
- d_func()->m_position = transform->d_func()->m_position;
- d_func()->m_upVector = transform->d_func()->m_upVector;
- d_func()->m_viewCenter = transform->d_func()->m_viewCenter;
- d_func()->m_viewVector = transform->d_func()->m_viewVector;
}
-QLookAtTransform::QLookAtTransform(QLookAtTransformPrivate &dd, QNode *parent)
+QLookAtTransform::QLookAtTransform(QLookAtTransformPrivate &dd, QObject *parent)
: QAbstractTransform(dd, parent)
{
}
diff --git a/src/core/transforms/qlookattransform.h b/src/core/transforms/qlookattransform.h
index 079e51c84..df1f8790c 100644
--- a/src/core/transforms/qlookattransform.h
+++ b/src/core/transforms/qlookattransform.h
@@ -38,7 +38,6 @@
#define QT3D_QLOOKATTRANSFORM_H
#include <Qt3DCore/qabstracttransform.h>
-#include <Qt3DCore/qt3dcore_global.h>
#include <QVector3D>
@@ -57,7 +56,7 @@ class QT3DCORESHARED_EXPORT QLookAtTransform : public Qt3D::QAbstractTransform
Q_PROPERTY(QVector3D viewVector READ viewVector NOTIFY viewVectorChanged)
public:
- explicit QLookAtTransform(QNode *parent = 0);
+ explicit QLookAtTransform(QObject *parent = Q_NULLPTR);
QMatrix4x4 transformMatrix() const Q_DECL_OVERRIDE;
@@ -80,12 +79,11 @@ Q_SIGNALS:
void viewVectorChanged();
protected:
- QLookAtTransform(QLookAtTransformPrivate &dd, QNode *parent = 0);
- void copy(const QNode *ref) Q_DECL_OVERRIDE;
+ QLookAtTransform(QLookAtTransformPrivate &dd, QObject *parent = Q_NULLPTR);
private:
- QT3D_CLONEABLE(QLookAtTransform)
Q_DECLARE_PRIVATE(QLookAtTransform)
+ Q_DISABLE_COPY(QLookAtTransform)
};
} // namespace Qt3D
diff --git a/src/core/transforms/qlookattransform_p.h b/src/core/transforms/qlookattransform_p.h
index a46332bf9..095e46e54 100644
--- a/src/core/transforms/qlookattransform_p.h
+++ b/src/core/transforms/qlookattransform_p.h
@@ -43,10 +43,11 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
+class QLookAtTransform;
class QLookAtTransformPrivate : public QAbstractTransformPrivate
{
public :
- QLookAtTransformPrivate(QLookAtTransform *qq);
+ QLookAtTransformPrivate();
Q_DECLARE_PUBLIC(QLookAtTransform)
diff --git a/src/core/transforms/qmatrixtransform.cpp b/src/core/transforms/qmatrixtransform.cpp
index 8ccf8a5bb..a85812457 100644
--- a/src/core/transforms/qmatrixtransform.cpp
+++ b/src/core/transforms/qmatrixtransform.cpp
@@ -41,33 +41,27 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
-QMatrixTransformPrivate::QMatrixTransformPrivate(QMatrixTransform *qq)
- : QAbstractTransformPrivate(qq)
+QMatrixTransformPrivate::QMatrixTransformPrivate()
+ : QAbstractTransformPrivate()
{
}
-QMatrixTransform::QMatrixTransform(QMatrixTransformPrivate &dd, QNode *parent)
- : QAbstractTransform(dd, parent)
-{
-}
-void QMatrixTransform::copy(const QNode *ref)
+QMatrixTransform::QMatrixTransform(QObject *parent)
+ : QAbstractTransform(*new QMatrixTransformPrivate, parent)
{
- QAbstractTransform::copy(ref);
- const QMatrixTransform *matrix = static_cast<const QMatrixTransform*>(ref);
- d_func()->m_matrix = matrix->d_func()->m_matrix;
}
-QMatrixTransform::QMatrixTransform(QNode *parent)
- : QAbstractTransform(*new QMatrixTransformPrivate(this), parent)
+QMatrixTransform::QMatrixTransform(const QMatrix4x4 &m, QObject *parent)
+ : QAbstractTransform(*new QMatrixTransformPrivate, parent)
{
+ Q_D(QMatrixTransform);
+ d->m_matrix = m;
}
-QMatrixTransform::QMatrixTransform(const QMatrix4x4& m, QNode *parent)
- : QAbstractTransform(*new QMatrixTransformPrivate(this), parent)
+QMatrixTransform::QMatrixTransform(QMatrixTransformPrivate &dd, QObject *parent)
+ : QAbstractTransform(dd, parent)
{
- Q_D(QMatrixTransform);
- d->m_matrix = m;
}
QMatrix4x4 QMatrixTransform::matrix() const
diff --git a/src/core/transforms/qmatrixtransform.h b/src/core/transforms/qmatrixtransform.h
index 34427314f..4ab92c417 100644
--- a/src/core/transforms/qmatrixtransform.h
+++ b/src/core/transforms/qmatrixtransform.h
@@ -38,9 +38,6 @@
#define QT3D_QMATRIXTRANSFORM_H
#include <Qt3DCore/qabstracttransform.h>
-#include <Qt3DCore/qt3dcore_global.h>
-
-#include <QMatrix4x4>
QT_BEGIN_NAMESPACE
@@ -53,8 +50,8 @@ class QT3DCORESHARED_EXPORT QMatrixTransform : public Qt3D::QAbstractTransform
Q_OBJECT
Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged)
public:
- explicit QMatrixTransform(QNode *parent = 0);
- QMatrixTransform(const QMatrix4x4& m, QNode *parent = 0);
+ explicit QMatrixTransform(QObject *parent = Q_NULLPTR);
+ QMatrixTransform(const QMatrix4x4 &m, QObject *parent = Q_NULLPTR);
QMatrix4x4 matrix() const;
void setMatrix(const QMatrix4x4 &matrix);
@@ -65,12 +62,11 @@ Q_SIGNALS:
void matrixChanged();
protected:
- QMatrixTransform(QMatrixTransformPrivate &dd, QNode *parent = 0);
- void copy(const QNode *ref) Q_DECL_OVERRIDE;
+ QMatrixTransform(QMatrixTransformPrivate &dd, QObject *parent = Q_NULLPTR);
private:
- QT3D_CLONEABLE(QMatrixTransform)
Q_DECLARE_PRIVATE(QMatrixTransform)
+ Q_DISABLE_COPY(QMatrixTransform)
};
} // namespace Qt3D
diff --git a/src/core/transforms/qmatrixtransform_p.h b/src/core/transforms/qmatrixtransform_p.h
index 5278f0fe4..d2896523a 100644
--- a/src/core/transforms/qmatrixtransform_p.h
+++ b/src/core/transforms/qmatrixtransform_p.h
@@ -48,7 +48,7 @@ class QMatrixTransform;
class QMatrixTransformPrivate : public QAbstractTransformPrivate
{
public:
- QMatrixTransformPrivate(QMatrixTransform *qq);
+ QMatrixTransformPrivate();
Q_DECLARE_PUBLIC(QMatrixTransform)
QMatrix4x4 m_matrix;
diff --git a/src/core/transforms/qrotatetransform.cpp b/src/core/transforms/qrotatetransform.cpp
index f92ac45bd..b20168f9a 100644
--- a/src/core/transforms/qrotatetransform.cpp
+++ b/src/core/transforms/qrotatetransform.cpp
@@ -48,8 +48,8 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
-QRotateTransformPrivate::QRotateTransformPrivate(QRotateTransform *qq)
- : QAbstractTransformPrivate(qq)
+QRotateTransformPrivate::QRotateTransformPrivate()
+ : QAbstractTransformPrivate()
, m_angleDeg(0)
, m_axis(0.0f, 1.0f, 0.0f)
{
@@ -63,20 +63,13 @@ void QRotateTransformPrivate::updateMatrix()
m_matrix = m;
}
-void QRotateTransform::copy(const QNode *ref)
-{
- QAbstractTransform::copy(ref);
- const QRotateTransform *transform = static_cast<const QRotateTransform*>(ref);
- d_func()->m_axis = transform->d_func()->m_axis;
- d_func()->m_angleDeg = transform->d_func()->m_angleDeg;
-}
-QRotateTransform::QRotateTransform(QNode *parent)
- : QAbstractTransform(*new QRotateTransformPrivate(this), parent)
+QRotateTransform::QRotateTransform(QObject *parent)
+ : QAbstractTransform(*new QRotateTransformPrivate, parent)
{
}
-QRotateTransform::QRotateTransform(QRotateTransformPrivate &dd, QNode *parent)
+QRotateTransform::QRotateTransform(QRotateTransformPrivate &dd, QObject *parent)
: QAbstractTransform(dd, parent)
{
}
diff --git a/src/core/transforms/qrotatetransform.h b/src/core/transforms/qrotatetransform.h
index 661304d09..649da06c2 100644
--- a/src/core/transforms/qrotatetransform.h
+++ b/src/core/transforms/qrotatetransform.h
@@ -38,7 +38,6 @@
#define QT3D_QROTATETRANSFORM_H
#include <Qt3DCore/qabstracttransform.h>
-#include <Qt3DCore/qt3dcore_global.h>
#include <QVector3D>
@@ -56,7 +55,7 @@ class QT3DCORESHARED_EXPORT QRotateTransform : public QAbstractTransform
Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged)
public:
- explicit QRotateTransform(QNode *parent = 0);
+ explicit QRotateTransform(QObject *parent = Q_NULLPTR);
float angleDeg() const;
float angleRad() const;
@@ -73,12 +72,11 @@ Q_SIGNALS:
void angleChanged();
protected:
- QRotateTransform(QRotateTransformPrivate &dd, QNode *parent = 0);
- void copy(const QNode *ref) Q_DECL_OVERRIDE;
+ QRotateTransform(QRotateTransformPrivate &dd, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QRotateTransform)
- QT3D_CLONEABLE(QRotateTransform)
+ Q_DISABLE_COPY(QRotateTransform)
};
} // namespace Qt3D
diff --git a/src/core/transforms/qrotatetransform_p.h b/src/core/transforms/qrotatetransform_p.h
index b6b5d0077..77ba49c09 100644
--- a/src/core/transforms/qrotatetransform_p.h
+++ b/src/core/transforms/qrotatetransform_p.h
@@ -48,7 +48,7 @@ class QRotateTransform;
class QRotateTransformPrivate : public QAbstractTransformPrivate
{
public:
- QRotateTransformPrivate(QRotateTransform *qq);
+ QRotateTransformPrivate();
QMatrix4x4 m_matrix;
diff --git a/src/core/transforms/qscaletransform.cpp b/src/core/transforms/qscaletransform.cpp
index 6fa5b6243..82e7ad19e 100644
--- a/src/core/transforms/qscaletransform.cpp
+++ b/src/core/transforms/qscaletransform.cpp
@@ -42,25 +42,19 @@ QT_BEGIN_NAMESPACE
namespace Qt3D
{
-QScaleTransformPrivate::QScaleTransformPrivate(QScaleTransform *qq)
- : QAbstractTransformPrivate(qq)
+QScaleTransformPrivate::QScaleTransformPrivate()
+ : QAbstractTransformPrivate()
, m_scale3D(1.0f, 1.0f, 1.0f)
{
}
-void QScaleTransform::copy(const QNode *ref)
-{
- QAbstractTransform::copy(ref);
- const QScaleTransform *transform = static_cast<const QScaleTransform*>(ref);
- d_func()->m_scale3D = transform->d_func()->m_scale3D;
-}
-QScaleTransform::QScaleTransform(QNode *parent) :
- QAbstractTransform(*new QScaleTransformPrivate(this), parent)
+QScaleTransform::QScaleTransform(QObject *parent)
+ : QAbstractTransform(*new QScaleTransformPrivate, parent)
{
}
-QScaleTransform::QScaleTransform(QScaleTransformPrivate &dd, QNode *parent)
+QScaleTransform::QScaleTransform(QScaleTransformPrivate &dd, QObject *parent)
: QAbstractTransform(dd, parent)
{
}
diff --git a/src/core/transforms/qscaletransform.h b/src/core/transforms/qscaletransform.h
index 35fa1b802..42518f5a8 100644
--- a/src/core/transforms/qscaletransform.h
+++ b/src/core/transforms/qscaletransform.h
@@ -52,7 +52,7 @@ class QT3DCORESHARED_EXPORT QScaleTransform : public QAbstractTransform
Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged)
public:
- explicit QScaleTransform(QNode *parent = 0);
+ explicit QScaleTransform(QObject *parent = Q_NULLPTR);
QVector3D scale3D() const;
void setScale3D(const QVector3D &scale3D);
@@ -67,12 +67,11 @@ Q_SIGNALS:
void scaleChanged();
protected:
- QScaleTransform(QScaleTransformPrivate &dd, QNode *parent = 0);
- void copy(const QNode *ref) Q_DECL_OVERRIDE;
+ QScaleTransform(QScaleTransformPrivate &dd, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QScaleTransform)
- QT3D_CLONEABLE(QScaleTransform)
+ Q_DISABLE_COPY(QScaleTransform)
};
} // Qt3D
diff --git a/src/core/transforms/qscaletransform_p.h b/src/core/transforms/qscaletransform_p.h
index ff2c321e7..ccd979306 100644
--- a/src/core/transforms/qscaletransform_p.h
+++ b/src/core/transforms/qscaletransform_p.h
@@ -47,7 +47,7 @@ class QScaleTransform;
class QScaleTransformPrivate : public QAbstractTransformPrivate
{
public:
- QScaleTransformPrivate(QScaleTransform *qq);
+ QScaleTransformPrivate();
Q_DECLARE_PUBLIC(QScaleTransform)
QVector3D m_scale3D;
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index 0e98fdb0f..83107041e 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -110,8 +110,6 @@ void QTransform::copy(const QNode *ref)
QComponent::copy(ref);
const QTransform *transform = static_cast<const QTransform *>(ref);
d_func()->m_matrix = transform->d_func()->m_matrix;
- Q_FOREACH (QAbstractTransform *t, transform->d_func()->m_transforms)
- addTransform(qobject_cast<QAbstractTransform *>(QNode::clone(t)));
}
QList<QAbstractTransform *> QTransform::transforms() const
diff --git a/src/core/transforms/qtranslatetransform.cpp b/src/core/transforms/qtranslatetransform.cpp
index d0b6f38af..54f9cf997 100644
--- a/src/core/transforms/qtranslatetransform.cpp
+++ b/src/core/transforms/qtranslatetransform.cpp
@@ -42,25 +42,18 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
-QTranslateTransformPrivate::QTranslateTransformPrivate(QTranslateTransform *qq)
- : QAbstractTransformPrivate(qq)
+QTranslateTransformPrivate::QTranslateTransformPrivate()
+ : QAbstractTransformPrivate()
{
}
-QTranslateTransform::QTranslateTransform(QNode *parent)
- : QAbstractTransform(*new QTranslateTransformPrivate(this), parent)
-{
-}
-void QTranslateTransform::copy(const QNode *ref)
+QTranslateTransform::QTranslateTransform(QObject *parent)
+ : QAbstractTransform(*new QTranslateTransformPrivate, parent)
{
- QAbstractTransform::copy(ref);
- const QTranslateTransform *transform = static_cast<const QTranslateTransform*>(ref);
- d_func()->m_translation = transform->d_func()->m_translation;
}
-
-QTranslateTransform::QTranslateTransform(QTranslateTransformPrivate &dd, QNode *parent)
+QTranslateTransform::QTranslateTransform(QTranslateTransformPrivate &dd, QObject *parent)
: QAbstractTransform(dd, parent)
{
}
diff --git a/src/core/transforms/qtranslatetransform.h b/src/core/transforms/qtranslatetransform.h
index c3ddfbd50..4bf3b4c61 100644
--- a/src/core/transforms/qtranslatetransform.h
+++ b/src/core/transforms/qtranslatetransform.h
@@ -38,7 +38,6 @@
#define QT3D_QTRANSLATETRANSFORM_H
#include <Qt3DCore/qabstracttransform.h>
-#include <Qt3DCore/qt3dcore_global.h>
#include <QVector3D>
@@ -58,7 +57,7 @@ class QT3DCORESHARED_EXPORT QTranslateTransform : public QAbstractTransform
Q_PROPERTY(QVector3D translation READ translation WRITE setTranslation NOTIFY translateChanged)
public:
- explicit QTranslateTransform(QNode *parent = 0);
+ explicit QTranslateTransform(QObject *parent = Q_NULLPTR);
float dx() const;
float dy() const;
@@ -79,12 +78,11 @@ Q_SIGNALS:
void translateChanged();
protected:
- QTranslateTransform(QTranslateTransformPrivate &dd, QNode *parent = 0);
- void copy(const QNode *ref) Q_DECL_OVERRIDE;
+ QTranslateTransform(QTranslateTransformPrivate &dd, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QTranslateTransform)
- QT3D_CLONEABLE(QTranslateTransform)
+ Q_DISABLE_COPY(QTranslateTransform)
};
} // namespace Qt3D
diff --git a/src/core/transforms/qtranslatetransform_p.h b/src/core/transforms/qtranslatetransform_p.h
index 58bf11b33..6b9d5e8ab 100644
--- a/src/core/transforms/qtranslatetransform_p.h
+++ b/src/core/transforms/qtranslatetransform_p.h
@@ -47,7 +47,7 @@ class QTranslateTransform;
class QTranslateTransformPrivate : public QAbstractTransformPrivate
{
public:
- QTranslateTransformPrivate(QTranslateTransform *qq);
+ QTranslateTransformPrivate();
Q_DECLARE_PUBLIC(QTranslateTransform)
QVector3D m_translation;