diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-04 10:31:08 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-07-05 22:13:16 +0200 |
| commit | 520c17f8ee68eb525f0cd780353e8c6dc7ea6f7f (patch) | |
| tree | 36f80149dfbfb53c32dbdac2c8b82c9279ee767c /src/core/transforms | |
| parent | 9f23d87fb4dc295f21e8aa8774a11a7909d34483 (diff) | |
Renamed Component to QComponent
Change-Id: Ifd585f5883e446d0569c38219d26ba581455e857
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/transforms')
| -rw-r--r-- | src/core/transforms/transform.cpp | 6 | ||||
| -rw-r--r-- | src/core/transforms/transform.h | 4 | ||||
| -rw-r--r-- | src/core/transforms/transform_p.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/transforms/transform.cpp b/src/core/transforms/transform.cpp index 17ab5839b..b244e9198 100644 --- a/src/core/transforms/transform.cpp +++ b/src/core/transforms/transform.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { TransformPrivate::TransformPrivate(Transform *qq) - : ComponentPrivate(qq) + : QComponentPrivate(qq) , m_transforms() , m_matrix() , m_sceneMatrix() @@ -58,14 +58,14 @@ TransformPrivate::TransformPrivate(Transform *qq) } Transform::Transform(QNode *parent) - : Qt3D::Component(*new TransformPrivate(this), parent) + : Qt3D::QComponent(*new TransformPrivate(this), parent) { Q_D(Transform); d->m_transformsDirty.fetchAndStoreOrdered(0); } Transform::Transform(TransformPrivate &dd, QNode *parent) - : Component(dd, parent) + : QComponent(dd, parent) { } diff --git a/src/core/transforms/transform.h b/src/core/transforms/transform.h index ad83b8f6c..d113903fa 100644 --- a/src/core/transforms/transform.h +++ b/src/core/transforms/transform.h @@ -42,7 +42,7 @@ #ifndef QT3D_TRANSFORM_H #define QT3D_TRANSFORM_H -#include <Qt3DCore/component.h> +#include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qt3dcore_global.h> #include <QAtomicInt> #include <QMatrix4x4> @@ -54,7 +54,7 @@ namespace Qt3D { class AbstractTransform; class TransformPrivate; -class QT3DCORESHARED_EXPORT Transform : public Component +class QT3DCORESHARED_EXPORT Transform : public QComponent { Q_OBJECT diff --git a/src/core/transforms/transform_p.h b/src/core/transforms/transform_p.h index ca236177e..4b156076d 100644 --- a/src/core/transforms/transform_p.h +++ b/src/core/transforms/transform_p.h @@ -43,7 +43,7 @@ #define QT3D_TRANSFORM_P_H #include <Qt3DCore/qt3dcore_global.h> -#include <private/component_p.h> +#include <private/qcomponent_p.h> QT_BEGIN_NAMESPACE @@ -51,7 +51,7 @@ namespace Qt3D { class Transform; -class TransformPrivate : public ComponentPrivate +class TransformPrivate : public QComponentPrivate { public: TransformPrivate(Transform *qq); |