Prefixed Q to transforms

QAbstractTransform also has a d-pointer.

Change-Id: I577dc48d21545f4f5cd1320529951612cbef0739
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

17 files changed, 201 insertions, 118 deletions

diff --git a/src/core/transforms/qabstracttransform.cpp b/src/core/transforms/qabstracttransform.cpp
new file mode 100644
index 000000000..9c69670bc
--- /dev/null
+++ b/src/core/transforms/qabstracttransform.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qabstracttransform.h"
+#include "qabstracttransform_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3D {
+
+QAbstractTransformPrivate::QAbstractTransformPrivate(QAbstractTransform *qq)
+    : QNodePrivate(qq)
+{
+}
+
+QAbstractTransform::QAbstractTransform(QNode *parent)
+    : QNode(*new QAbstractTransformPrivate(this), parent)
+{
+}
+
+QAbstractTransform::~QAbstractTransform()
+{
+}
+
+QAbstractTransform::QAbstractTransform(QAbstractTransformPrivate &dd, QNode *parent)
+    : QNode(dd, parent)
+{
+}
+
+} // namespace Qt3D
+
+QT_END_NAMESPACE
diff --git a/src/core/transforms/abstracttransform.h b/src/core/transforms/qabstracttransform.h
index a05f5c0ec..b25560d67 100644
--- a/src/core/transforms/abstracttransform.h
+++ b/src/core/transforms/qabstracttransform.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_ABSTRACT_TRANSFORM_H
-#define QT3D_ABSTRACT_TRANSFORM_H
+#ifndef QT3D_QABSTRACT_TRANSFORM_H
+#define QT3D_QABSTRACT_TRANSFORM_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -51,20 +51,25 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT AbstractTransform : public QNode
+class QAbstractTransformPrivate;
+
+class QT3DCORESHARED_EXPORT QAbstractTransform : public QNode
 {
     Q_OBJECT
 public:
-    explicit AbstractTransform(QNode *parent = 0);
-    virtual ~AbstractTransform();
+    explicit QAbstractTransform(QNode *parent = 0);
+    virtual ~QAbstractTransform();
 
     virtual QMatrix4x4 matrix() const = 0;
 Q_SIGNALS:
     void transformUpdated();
+protected:
+    Q_DECLARE_PRIVATE(QAbstractTransform)
+    QAbstractTransform(QAbstractTransformPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace Qt3D
 
 QT_END_NAMESPACE
 
-#endif // of QT3D_ABSTRACT_TRANSFORM_H
+#endif // of QT3D_QABSTRACT_TRANSFORM_H
diff --git a/src/core/transforms/abstracttransform.cpp b/src/core/transforms/qabstracttransform_p.h
index 51b1edc70..d296ef233 100644
--- a/src/core/transforms/abstracttransform.cpp
+++ b/src/core/transforms/qabstracttransform_p.h
@@ -39,21 +39,28 @@
 **
 ****************************************************************************/
 
-#include "abstracttransform.h"
+#ifndef QT3D_QABSTRACTTRANSFORM_P_H
+#define QT3D_QABSTRACTTRANSFORM_P_H
+
+#include <private/qnode_p.h>
+#include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-AbstractTransform::AbstractTransform(QNode *parent)
-    : QNode(parent)
-{
-}
+class QAbstractTransform;
 
-AbstractTransform::~AbstractTransform()
+class QT3DCORESHARED_EXPORT QAbstractTransformPrivate : public QNodePrivate
 {
-}
+public:
+    QAbstractTransformPrivate(QAbstractTransform *qq);
+    Q_DECLARE_PUBLIC(QAbstractTransform)
+};
 
-} // namespace Qt3D
+} // Qt3D
 
 QT_END_NAMESPACE
+
+
+#endif // QT3D_QABSTRACTTRANSFORM_P_H
diff --git a/src/core/transforms/lookattransform.cpp b/src/core/transforms/qlookattransform.cpp
index bedec7e2d..146c94d73 100644
--- a/src/core/transforms/lookattransform.cpp
+++ b/src/core/transforms/qlookattransform.cpp
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include "lookattransform.h"
+#include "qlookattransform.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-LookAtTransform::LookAtTransform(QNode *parent)
-    : AbstractTransform(parent)
+QLookAtTransform::QLookAtTransform(QNode *parent)
+    : QAbstractTransform(parent)
     , m_matrixDirty(true)
 {
 }
 
-QMatrix4x4 LookAtTransform::matrix() const
+QMatrix4x4 QLookAtTransform::matrix() const
 {
     if (m_matrixDirty) {
         m_matrix.setToIdentity();
@@ -61,12 +61,12 @@ QMatrix4x4 LookAtTransform::matrix() const
     return m_matrix;
 }
 
-QVector3D LookAtTransform::position() const
+QVector3D QLookAtTransform::position() const
 {
     return m_position;
 }
 
-void LookAtTransform::setPosition(const QVector3D &position)
+void QLookAtTransform::setPosition(const QVector3D &position)
 {
     if (m_position != position) {
         m_position = position;
@@ -78,7 +78,7 @@ void LookAtTransform::setPosition(const QVector3D &position)
     }
 }
 
-void LookAtTransform::setUpVector(const QVector3D &upVector)
+void QLookAtTransform::setUpVector(const QVector3D &upVector)
 {
     if (m_upVector != upVector) {
         m_upVector = upVector;
@@ -88,12 +88,12 @@ void LookAtTransform::setUpVector(const QVector3D &upVector)
     }
 }
 
-QVector3D LookAtTransform::upVector() const
+QVector3D QLookAtTransform::upVector() const
 {
     return m_upVector;
 }
 
-void LookAtTransform::setViewCenter(const QVector3D &viewCenter)
+void QLookAtTransform::setViewCenter(const QVector3D &viewCenter)
 {
     if (m_viewCenter != viewCenter) {
         m_viewCenter = viewCenter;
@@ -105,17 +105,17 @@ void LookAtTransform::setViewCenter(const QVector3D &viewCenter)
     }
 }
 
-QVector3D LookAtTransform::viewCenter() const
+QVector3D QLookAtTransform::viewCenter() const
 {
     return m_viewCenter;
 }
 
-void LookAtTransform::setViewVector(const QVector3D &viewVector)
+void QLookAtTransform::setViewVector(const QVector3D &viewVector)
 {
     m_viewVector = viewVector;
 }
 
-QVector3D LookAtTransform::viewVector() const
+QVector3D QLookAtTransform::viewVector() const
 {
     return m_viewVector;
 }
diff --git a/src/core/transforms/lookattransform.h b/src/core/transforms/qlookattransform.h
index a673aede6..fb1b21b73 100644
--- a/src/core/transforms/lookattransform.h
+++ b/src/core/transforms/qlookattransform.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_LOOKATTRANSFORM_H
-#define QT3D_LOOKATTRANSFORM_H
+#ifndef QT3D_QLOOKATTRANSFORM_H
+#define QT3D_QLOOKATTRANSFORM_H
 
-#include <Qt3DCore/abstracttransform.h>
+#include <Qt3DCore/qabstracttransform.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 #include <QVector3D>
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT LookAtTransform : public Qt3D::AbstractTransform
+class QT3DCORESHARED_EXPORT QLookAtTransform : public Qt3D::QAbstractTransform
 {
     Q_OBJECT
     Q_PROPERTY(QVector3D position READ position WRITE setPosition)
@@ -60,7 +60,7 @@ class QT3DCORESHARED_EXPORT LookAtTransform : public Qt3D::AbstractTransform
     Q_PROPERTY(QVector3D viewVector READ viewVector NOTIFY viewVectorChanged)
 
 public:
-    explicit LookAtTransform(QNode *parent = 0);
+    explicit QLookAtTransform(QNode *parent = 0);
 
     QMatrix4x4 matrix() const Q_DECL_OVERRIDE;
 
@@ -95,4 +95,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_LOOKATTRANSFORM_H
+#endif // QT3D_QLOOKATTRANSFORM_H
diff --git a/src/core/transforms/matrixtransform.cpp b/src/core/transforms/qmatrixtransform.cpp
index 50ae8b96b..719ab0074 100644
--- a/src/core/transforms/matrixtransform.cpp
+++ b/src/core/transforms/qmatrixtransform.cpp
@@ -39,22 +39,22 @@
 **
 ****************************************************************************/
 
-#include "matrixtransform.h"
+#include "qmatrixtransform.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-MatrixTransform::MatrixTransform()
+QMatrixTransform::QMatrixTransform()
 {
 }
 
-MatrixTransform::MatrixTransform(const QMatrix4x4& m) :
+QMatrixTransform::QMatrixTransform(const QMatrix4x4& m) :
     m_matrix(m)
 {
 }
 
-QMatrix4x4 MatrixTransform::matrix() const
+QMatrix4x4 QMatrixTransform::matrix() const
 {
     return m_matrix;
 }
diff --git a/src/core/transforms/matrixtransform.h b/src/core/transforms/qmatrixtransform.h
index 0154cf74f..4ae88e17e 100644
--- a/src/core/transforms/matrixtransform.h
+++ b/src/core/transforms/qmatrixtransform.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MATRIXTRANSFORM_H
-#define MATRIXTRANSFORM_H
+#ifndef QT3D_QMATRIXTRANSFORM_H
+#define QT3D_QMATRIXTRANSFORM_H
 
-#include <Qt3DCore/abstracttransform.h>
+#include <Qt3DCore/qabstracttransform.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 #include <QMatrix4x4>
@@ -51,12 +51,12 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT MatrixTransform : public AbstractTransform
+class QT3DCORESHARED_EXPORT QMatrixTransform : public QAbstractTransform
 {
 public:
-    MatrixTransform();
+    QMatrixTransform();
 
-    MatrixTransform( const QMatrix4x4& m );
+    QMatrixTransform( const QMatrix4x4& m );
 
     virtual QMatrix4x4 matrix() const;
 private:
@@ -67,4 +67,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // MATRIXTRANSFORM_H
+#endif // QT3D_QMATRIXTRANSFORM_H
diff --git a/src/core/transforms/rotatetransform.cpp b/src/core/transforms/qrotatetransform.cpp
index 551ad3711..4e7b5ea51 100644
--- a/src/core/transforms/rotatetransform.cpp
+++ b/src/core/transforms/qrotatetransform.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #define _USE_MATH_DEFINES // For MSVC
-#include "rotatetransform.h"
+#include "qrotatetransform.h"
 
 #include <cmath>
 
@@ -48,35 +48,35 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-RotateTransform::RotateTransform(QNode *parent)
-    : AbstractTransform(parent),
+QRotateTransform::QRotateTransform(QNode *parent)
+    : QAbstractTransform(parent),
       m_angleDeg(0)
 {
 }
 
-float RotateTransform::angleDeg() const
+float QRotateTransform::angleDeg() const
 {
     return m_angleDeg;
 }
 
-float Qt3D::RotateTransform::angleRad() const
+float Qt3D::QRotateTransform::angleRad() const
 {
     return (m_angleDeg / 180.0) * M_PI;
 }
 
-QVector3D RotateTransform::axis() const
+QVector3D QRotateTransform::axis() const
 {
     return m_axis;
 }
 
-QMatrix4x4 RotateTransform::matrix() const
+QMatrix4x4 QRotateTransform::matrix() const
 {
     QMatrix4x4 m;
     m.rotate(m_angleDeg, m_axis);
     return m;
 }
 
-void RotateTransform::setAngleDeg(float arg)
+void QRotateTransform::setAngleDeg(float arg)
 {
     if (m_angleDeg != arg) {
         m_angleDeg = arg;
@@ -85,13 +85,13 @@ void RotateTransform::setAngleDeg(float arg)
     }
 }
 
-void RotateTransform::setAngleRad(float arg)
+void QRotateTransform::setAngleRad(float arg)
 {
     float angleDeg = (arg * M_PI) / 180.0f;
     setAngleDeg(angleDeg);
 }
 
-void RotateTransform::setAxis(const QVector3D& arg)
+void QRotateTransform::setAxis(const QVector3D& arg)
 {
     if (m_axis != arg) {
         m_axis = arg;
diff --git a/src/core/transforms/rotatetransform.h b/src/core/transforms/qrotatetransform.h
index be47cc762..e1bf8eb57 100644
--- a/src/core/transforms/rotatetransform.h
+++ b/src/core/transforms/qrotatetransform.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_ROTATETRANSFORM_H
-#define QT3D_ROTATETRANSFORM_H
+#ifndef QT3D_QROTATETRANSFORM_H
+#define QT3D_QROTATETRANSFORM_H
 
-#include <Qt3DCore/abstracttransform.h>
+#include <Qt3DCore/qabstracttransform.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 #include <QVector3D>
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT RotateTransform : public AbstractTransform
+class QT3DCORESHARED_EXPORT QRotateTransform : public QAbstractTransform
 {
     Q_OBJECT
 
@@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT RotateTransform : public AbstractTransform
     Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged)
 
 public:
-    explicit RotateTransform(QNode *parent = 0);
+    explicit QRotateTransform(QNode *parent = 0);
 
     float angleDeg() const;
 
@@ -92,4 +92,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_ROTATETRANSFORM_H
+#endif // QT3D_QROTATETRANSFORM_H
diff --git a/src/core/transforms/scaletransform.cpp b/src/core/transforms/qscaletransform.cpp
index c36e261bf..c06fcf410 100644
--- a/src/core/transforms/scaletransform.cpp
+++ b/src/core/transforms/qscaletransform.cpp
@@ -39,24 +39,24 @@
 **
 ****************************************************************************/
 
-#include "scaletransform.h"
+#include "qscaletransform.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D
 {
 
-ScaleTransform::ScaleTransform(QNode *parent) :
-    AbstractTransform(parent)
+QScaleTransform::QScaleTransform(QNode *parent) :
+    QAbstractTransform(parent)
 {
 }
 
-QVector3D ScaleTransform::scale3D() const
+QVector3D QScaleTransform::scale3D() const
 {
     return m_scale3D;
 }
 
-void ScaleTransform::setScale3D(const QVector3D &scale3D)
+void QScaleTransform::setScale3D(const QVector3D &scale3D)
 {
     if (scale3D != m_scale3D) {
         m_scale3D = scale3D;
@@ -65,12 +65,12 @@ void ScaleTransform::setScale3D(const QVector3D &scale3D)
     }
 }
 
-float ScaleTransform::scale() const
+float QScaleTransform::scale() const
 {
     return m_scale3D.x();
 }
 
-void ScaleTransform::setScale(float scale)
+void QScaleTransform::setScale(float scale)
 {
     if (scale != m_scale3D.x()) {
         setScale3D(QVector3D(scale, scale, scale));
@@ -78,7 +78,7 @@ void ScaleTransform::setScale(float scale)
     }
 }
 
-QMatrix4x4 ScaleTransform::matrix() const
+QMatrix4x4 QScaleTransform::matrix() const
 {
     QMatrix4x4 mat;
     mat.scale(m_scale3D);
diff --git a/src/core/transforms/scaletransform.h b/src/core/transforms/qscaletransform.h
index d9848d75f..144a8a368 100644
--- a/src/core/transforms/scaletransform.h
+++ b/src/core/transforms/qscaletransform.h
@@ -39,23 +39,23 @@
 **
 ****************************************************************************/
 
-#ifndef SCALETRANSFORM_H
-#define SCALETRANSFORM_H
+#ifndef QT3D_SCALETRANSFORM_H
+#define QT3D_SCALETRANSFORM_H
 
-#include <Qt3DCore/abstracttransform.h>
+#include <Qt3DCore/qabstracttransform.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT ScaleTransform : public AbstractTransform
+class QT3DCORESHARED_EXPORT QScaleTransform : public QAbstractTransform
 {
     Q_OBJECT
 
     Q_PROPERTY(QVector3D scale3D READ scale3D WRITE setScale3D NOTIFY scale3DChanged)
     Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged)
 public:
-    explicit ScaleTransform(QNode *parent = 0);
+    explicit QScaleTransform(QNode *parent = 0);
 
     QVector3D scale3D() const;
     void    setScale3D(const QVector3D &scale3D);
@@ -77,4 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // SCALETRANSFORM_H
+#endif // QT3D_SCALETRANSFORM_H
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index 4b3997580..5cc51d911 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -43,7 +43,7 @@
 #include "qtransform_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
-#include <matrixtransform.h>
+#include <qmatrixtransform.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -97,7 +97,7 @@ void QTransform::setMatrix(const QMatrix4x4 &m)
     Q_D(QTransform);
     qDeleteAll(d->m_transforms);
     d->m_transforms.clear();
-    appendTransform(new MatrixTransform(m));
+    appendTransform(new QMatrixTransform(m));
     setTransformsDirty();
 }
 
@@ -109,7 +109,7 @@ QVector3D QTransform::rotationCenter() const
     return QVector3D();
 }
 
-QList<AbstractTransform *> QTransform::transforms() const
+QList<QAbstractTransform *> QTransform::transforms() const
 {
     Q_D(const QTransform);
     return d->m_transforms;
@@ -123,7 +123,7 @@ void QTransform::setRotationCenter(const QVector3D &rc)
     Q_UNUSED(rc);
 }
 
-void QTransform::appendTransform(AbstractTransform *transform)
+void QTransform::appendTransform(QAbstractTransform *transform)
 {
     Q_D(QTransform);
     d->m_transforms.append(transform);
@@ -131,7 +131,7 @@ void QTransform::appendTransform(AbstractTransform *transform)
     setTransformsDirty();
 }
 
-void QTransform::removeTransform(AbstractTransform *transform)
+void QTransform::removeTransform(QAbstractTransform *transform)
 {
     Q_D(QTransform);
     d->m_transforms.removeOne(transform);
@@ -143,12 +143,12 @@ QMatrix4x4 QTransform::applyTransforms() const
 {
     Q_D(const QTransform);
     QMatrix4x4 m;
-    Q_FOREACH (const AbstractTransform *t, d->m_transforms)
+    Q_FOREACH (const QAbstractTransform *t, d->m_transforms)
         m = t->matrix() * m;
     return m;
 }
 
-QList<AbstractTransform *> QTransform::transformList() const
+QList<QAbstractTransform *> QTransform::transformList() const
 {
     Q_D(const QTransform);
     return d->m_transforms;
diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h
index 93a376e63..2403bcdb4 100644
--- a/src/core/transforms/qtransform.h
+++ b/src/core/transforms/qtransform.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class AbstractTransform;
+class QAbstractTransform;
 class QTransformPrivate;
 
 class QT3DCORESHARED_EXPORT QTransform : public QComponent
@@ -67,27 +67,27 @@ public:
     QVector3D rotationCenter() const;
     void setRotationCenter(const QVector3D &rc);
 
-    QList<AbstractTransform*> transforms() const;
+    QList<QAbstractTransform*> transforms() const;
 
     template <class T>
     T *findFirstTransform() const
     {
         T *transform = Q_NULLPTR;
-        Q_FOREACH (AbstractTransform *trans, transformList())
+        Q_FOREACH (QAbstractTransform *trans, transformList())
             if ((transform = qobject_cast<T*>(trans)) != Q_NULLPTR)
                 break;
         return transform;
     }
 
-    void appendTransform(AbstractTransform *xform);
-    void removeTransform(AbstractTransform *xform);
+    void appendTransform(QAbstractTransform *xform);
+    void removeTransform(QAbstractTransform *xform);
 
 private Q_SLOTS:
     void setTransformsDirty();
 
 protected:
     QMatrix4x4 applyTransforms() const;
-    QList<AbstractTransform *> transformList() const;
+    QList<QAbstractTransform *> transformList() const;
 
     Q_DECLARE_PRIVATE(QTransform)
     QTransform(QTransformPrivate &dd, QNode *parent = 0);
diff --git a/src/core/transforms/qtransform_p.h b/src/core/transforms/qtransform_p.h
index 80eb1a019..ebd490fe0 100644
--- a/src/core/transforms/qtransform_p.h
+++ b/src/core/transforms/qtransform_p.h
@@ -59,7 +59,7 @@ public:
     Q_DECLARE_PUBLIC(QTransform)
 
     mutable QAtomicInt m_transformsDirty;
-    QList<AbstractTransform*> m_transforms;
+    QList<QAbstractTransform*> m_transforms;
 
     mutable QMatrix4x4 m_matrix;
     QMatrix4x4 m_sceneMatrix;
diff --git a/src/core/transforms/translatetransform.cpp b/src/core/transforms/qtranslatetransform.cpp
index a4a398674..bae849668 100644
--- a/src/core/transforms/translatetransform.cpp
+++ b/src/core/transforms/qtranslatetransform.cpp
@@ -39,45 +39,45 @@
 **
 ****************************************************************************/
 
-#include "translatetransform.h"
+#include "qtranslatetransform.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-TranslateTransform::TranslateTransform(QNode *parent)
-    : AbstractTransform(parent)
+QTranslateTransform::QTranslateTransform(QNode *parent)
+    : QAbstractTransform(parent)
 {
 }
 
-float TranslateTransform::dx() const
+float QTranslateTransform::dx() const
 {
     return m_translation.x();
 }
 
-float TranslateTransform::dy() const
+float QTranslateTransform::dy() const
 {
     return m_translation.y();
 }
 
-float TranslateTransform::dz() const
+float QTranslateTransform::dz() const
 {
     return m_translation.z();
 }
 
-QVector3D TranslateTransform::translation() const
+QVector3D QTranslateTransform::translation() const
 {
     return m_translation;
 }
 
-QMatrix4x4 TranslateTransform::matrix() const
+QMatrix4x4 QTranslateTransform::matrix() const
 {
     QMatrix4x4 r;
     r.translate(m_translation);
     return r;
 }
 
-void TranslateTransform::setDx(float arg)
+void QTranslateTransform::setDx(float arg)
 {
     if (arg != m_translation.x()) {
         m_translation.setX(arg);
@@ -86,7 +86,7 @@ void TranslateTransform::setDx(float arg)
     }
 }
 
-void TranslateTransform::setDy(float arg)
+void QTranslateTransform::setDy(float arg)
 {
     if (arg != m_translation.y()) {
         m_translation.setY(arg);
@@ -95,7 +95,7 @@ void TranslateTransform::setDy(float arg)
     }
 }
 
-void TranslateTransform::setDz(float arg)
+void QTranslateTransform::setDz(float arg)
 {
     if (arg != m_translation.z()) {
         m_translation.setZ(arg);
@@ -104,7 +104,7 @@ void TranslateTransform::setDz(float arg)
     }
 }
 
-void TranslateTransform::setTranslation(QVector3D arg)
+void QTranslateTransform::setTranslation(QVector3D arg)
 {
     if (m_translation != arg) {
         m_translation = arg;
diff --git a/src/core/transforms/translatetransform.h b/src/core/transforms/qtranslatetransform.h
index 08c027118..4e1479c80 100644
--- a/src/core/transforms/translatetransform.h
+++ b/src/core/transforms/qtranslatetransform.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_TRANSLATETRANSFORM_H
-#define QT3D_TRANSLATETRANSFORM_H
+#ifndef QT3D_QTRANSLATETRANSFORM_H
+#define QT3D_QTRANSLATETRANSFORM_H
 
-#include <Qt3DCore/abstracttransform.h>
+#include <Qt3DCore/qabstracttransform.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 #include <QVector3D>
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT TranslateTransform : public AbstractTransform
+class QT3DCORESHARED_EXPORT QTranslateTransform : public QAbstractTransform
 {
     Q_OBJECT
 
@@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT TranslateTransform : public AbstractTransform
     Q_PROPERTY(QVector3D t READ translation WRITE setTranslation NOTIFY translateChanged)
 
 public:
-    explicit TranslateTransform(QNode *parent = 0);
+    explicit QTranslateTransform(QNode *parent = 0);
 
     float dx() const;
     float dy() const;
@@ -89,4 +89,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_TRANSLATETRANSFORM_H
+#endif // QT3D_QTRANSLATETRANSFORM_H
diff --git a/src/core/transforms/transforms.pri b/src/core/transforms/transforms.pri
index 9528aba0c..30a57bd1c 100644
--- a/src/core/transforms/transforms.pri
+++ b/src/core/transforms/transforms.pri
@@ -1,21 +1,22 @@
 
 SOURCES += \
-        $$PWD/abstracttransform.cpp \
-        $$PWD/lookattransform.cpp \
-        $$PWD/matrixtransform.cpp \
-        $$PWD/rotatetransform.cpp \
-        $$PWD/translatetransform.cpp \
-        $$PWD/scaletransform.cpp \
+        $$PWD/qabstracttransform.cpp \
+        $$PWD/qlookattransform.cpp \
+        $$PWD/qmatrixtransform.cpp \
+        $$PWD/qrotatetransform.cpp \
+        $$PWD/qtranslatetransform.cpp \
+        $$PWD/qscaletransform.cpp \
         $$PWD/qtransform.cpp
 
 HEADERS += \
-        $$PWD/abstracttransform.h \
-        $$PWD/lookattransform.h \
-        $$PWD/matrixtransform.h \
-        $$PWD/rotatetransform.h \
-        $$PWD/translatetransform.h \
-        $$PWD/scaletransform.h \
+        $$PWD/qabstracttransform.h \
+        $$PWD/qlookattransform.h \
+        $$PWD/qmatrixtransform.h \
+        $$PWD/qrotatetransform.h \
+        $$PWD/qtranslatetransform.h \
+        $$PWD/qscaletransform.h \
         $$PWD/qtransform.h \
-        $$PWD/qtransform_p.h
+        $$PWD/qtransform_p.h \
+        $$PWD/qabstracttransform_p.h
 
 INCLUDEPATH += $$PWD