diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-04 09:59:09 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2014-07-05 19:06:21 +0200 |
commit | e14d91b6522cbbae08c307e036cff37b0fc6b529 (patch) | |
tree | 5416044c313179296b43421877f90d8f01e8979b /src/core/transforms | |
parent | 603e22c60e240773a01e578372fe263d132504b6 (diff) |
Renamed Node to QNode
Change-Id: I0a0ebde1c107db8831b596eab1e512a2062979f7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/transforms')
-rw-r--r-- | src/core/transforms/abstracttransform.cpp | 4 | ||||
-rw-r--r-- | src/core/transforms/abstracttransform.h | 6 | ||||
-rw-r--r-- | src/core/transforms/lookattransform.cpp | 2 | ||||
-rw-r--r-- | src/core/transforms/lookattransform.h | 2 | ||||
-rw-r--r-- | src/core/transforms/rotatetransform.cpp | 2 | ||||
-rw-r--r-- | src/core/transforms/rotatetransform.h | 2 | ||||
-rw-r--r-- | src/core/transforms/scaletransform.cpp | 2 | ||||
-rw-r--r-- | src/core/transforms/scaletransform.h | 2 | ||||
-rw-r--r-- | src/core/transforms/transform.cpp | 4 | ||||
-rw-r--r-- | src/core/transforms/transform.h | 4 | ||||
-rw-r--r-- | src/core/transforms/translatetransform.cpp | 2 | ||||
-rw-r--r-- | src/core/transforms/translatetransform.h | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/src/core/transforms/abstracttransform.cpp b/src/core/transforms/abstracttransform.cpp index b8bebbbef..51b1edc70 100644 --- a/src/core/transforms/abstracttransform.cpp +++ b/src/core/transforms/abstracttransform.cpp @@ -45,8 +45,8 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -AbstractTransform::AbstractTransform(Node *parent) - : Node(parent) +AbstractTransform::AbstractTransform(QNode *parent) + : QNode(parent) { } diff --git a/src/core/transforms/abstracttransform.h b/src/core/transforms/abstracttransform.h index 6543196b4..a05f5c0ec 100644 --- a/src/core/transforms/abstracttransform.h +++ b/src/core/transforms/abstracttransform.h @@ -42,7 +42,7 @@ #ifndef QT3D_ABSTRACT_TRANSFORM_H #define QT3D_ABSTRACT_TRANSFORM_H -#include <Qt3DCore/node.h> +#include <Qt3DCore/qnode.h> #include <Qt3DCore/qt3dcore_global.h> #include <QMatrix4x4> @@ -51,11 +51,11 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class QT3DCORESHARED_EXPORT AbstractTransform : public Node +class QT3DCORESHARED_EXPORT AbstractTransform : public QNode { Q_OBJECT public: - explicit AbstractTransform(Node *parent = 0); + explicit AbstractTransform(QNode *parent = 0); virtual ~AbstractTransform(); virtual QMatrix4x4 matrix() const = 0; diff --git a/src/core/transforms/lookattransform.cpp b/src/core/transforms/lookattransform.cpp index 4383f900f..bedec7e2d 100644 --- a/src/core/transforms/lookattransform.cpp +++ b/src/core/transforms/lookattransform.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -LookAtTransform::LookAtTransform(Node *parent) +LookAtTransform::LookAtTransform(QNode *parent) : AbstractTransform(parent) , m_matrixDirty(true) { diff --git a/src/core/transforms/lookattransform.h b/src/core/transforms/lookattransform.h index 3bc114941..a673aede6 100644 --- a/src/core/transforms/lookattransform.h +++ b/src/core/transforms/lookattransform.h @@ -60,7 +60,7 @@ class QT3DCORESHARED_EXPORT LookAtTransform : public Qt3D::AbstractTransform Q_PROPERTY(QVector3D viewVector READ viewVector NOTIFY viewVectorChanged) public: - explicit LookAtTransform(Node *parent = 0); + explicit LookAtTransform(QNode *parent = 0); QMatrix4x4 matrix() const Q_DECL_OVERRIDE; diff --git a/src/core/transforms/rotatetransform.cpp b/src/core/transforms/rotatetransform.cpp index ecfde03e3..551ad3711 100644 --- a/src/core/transforms/rotatetransform.cpp +++ b/src/core/transforms/rotatetransform.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -RotateTransform::RotateTransform(Node *parent) +RotateTransform::RotateTransform(QNode *parent) : AbstractTransform(parent), m_angleDeg(0) { diff --git a/src/core/transforms/rotatetransform.h b/src/core/transforms/rotatetransform.h index bbc6c4af4..be47cc762 100644 --- a/src/core/transforms/rotatetransform.h +++ b/src/core/transforms/rotatetransform.h @@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT RotateTransform : public AbstractTransform Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged) public: - explicit RotateTransform(Node *parent = 0); + explicit RotateTransform(QNode *parent = 0); float angleDeg() const; diff --git a/src/core/transforms/scaletransform.cpp b/src/core/transforms/scaletransform.cpp index e4ee8f436..c36e261bf 100644 --- a/src/core/transforms/scaletransform.cpp +++ b/src/core/transforms/scaletransform.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -ScaleTransform::ScaleTransform(Node *parent) : +ScaleTransform::ScaleTransform(QNode *parent) : AbstractTransform(parent) { } diff --git a/src/core/transforms/scaletransform.h b/src/core/transforms/scaletransform.h index 2fb8eb24a..d9848d75f 100644 --- a/src/core/transforms/scaletransform.h +++ b/src/core/transforms/scaletransform.h @@ -55,7 +55,7 @@ class QT3DCORESHARED_EXPORT ScaleTransform : public AbstractTransform Q_PROPERTY(QVector3D scale3D READ scale3D WRITE setScale3D NOTIFY scale3DChanged) Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged) public: - explicit ScaleTransform(Node *parent = 0); + explicit ScaleTransform(QNode *parent = 0); QVector3D scale3D() const; void setScale3D(const QVector3D &scale3D); diff --git a/src/core/transforms/transform.cpp b/src/core/transforms/transform.cpp index 6da32efcc..17ab5839b 100644 --- a/src/core/transforms/transform.cpp +++ b/src/core/transforms/transform.cpp @@ -57,14 +57,14 @@ TransformPrivate::TransformPrivate(Transform *qq) { } -Transform::Transform(Node *parent) +Transform::Transform(QNode *parent) : Qt3D::Component(*new TransformPrivate(this), parent) { Q_D(Transform); d->m_transformsDirty.fetchAndStoreOrdered(0); } -Transform::Transform(TransformPrivate &dd, Node *parent) +Transform::Transform(TransformPrivate &dd, QNode *parent) : Component(dd, parent) { diff --git a/src/core/transforms/transform.h b/src/core/transforms/transform.h index 04f6cecdf..ad83b8f6c 100644 --- a/src/core/transforms/transform.h +++ b/src/core/transforms/transform.h @@ -59,7 +59,7 @@ class QT3DCORESHARED_EXPORT Transform : public Component Q_OBJECT public: - explicit Transform(Node *parent = 0); + explicit Transform(QNode *parent = 0); QMatrix4x4 matrix() const; void setMatrix(const QMatrix4x4 &m); @@ -90,7 +90,7 @@ protected: QList<AbstractTransform *> transformList() const; Q_DECLARE_PRIVATE(Transform) - Transform(TransformPrivate &dd, Node *parent = 0); + Transform(TransformPrivate &dd, QNode *parent = 0); }; } // namespace Qt3D diff --git a/src/core/transforms/translatetransform.cpp b/src/core/transforms/translatetransform.cpp index f76ac63dd..a4a398674 100644 --- a/src/core/transforms/translatetransform.cpp +++ b/src/core/transforms/translatetransform.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -TranslateTransform::TranslateTransform(Node *parent) +TranslateTransform::TranslateTransform(QNode *parent) : AbstractTransform(parent) { } diff --git a/src/core/transforms/translatetransform.h b/src/core/transforms/translatetransform.h index ea0972ad0..08c027118 100644 --- a/src/core/transforms/translatetransform.h +++ b/src/core/transforms/translatetransform.h @@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT TranslateTransform : public AbstractTransform Q_PROPERTY(QVector3D t READ translation WRITE setTranslation NOTIFY translateChanged) public: - explicit TranslateTransform(Node *parent = 0); + explicit TranslateTransform(QNode *parent = 0); float dx() const; float dy() const; |