diff options
Diffstat (limited to 'src/core/transforms')
21 files changed, 88 insertions, 88 deletions
diff --git a/src/core/transforms/qabstracttransform.cpp b/src/core/transforms/qabstracttransform.cpp index 2a4d97ff4..3e70b0c5b 100644 --- a/src/core/transforms/qabstracttransform.cpp +++ b/src/core/transforms/qabstracttransform.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractTransformPrivate + \class Qt3DCore::QAbstractTransformPrivate \internal */ QAbstractTransformPrivate::QAbstractTransformPrivate() @@ -61,6 +61,6 @@ QAbstractTransform::QAbstractTransform(QAbstractTransformPrivate &dd, QObject *p { } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/transforms/qabstracttransform.h b/src/core/transforms/qabstracttransform.h index 091ab2bf4..fae453bce 100644 --- a/src/core/transforms/qabstracttransform.h +++ b/src/core/transforms/qabstracttransform.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACT_TRANSFORM_H -#define QT3D_QABSTRACT_TRANSFORM_H +#ifndef QT3DCORE_QABSTRACT_TRANSFORM_H +#define QT3DCORE_QABSTRACT_TRANSFORM_H #include <QtCore/qobject.h> #include <Qt3DCore/qt3dcore_global.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractTransformPrivate; class QT3DCORESHARED_EXPORT QAbstractTransform : public QObject @@ -67,8 +67,8 @@ private: Q_DISABLE_COPY(QAbstractTransform) }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // of QT3D_QABSTRACT_TRANSFORM_H +#endif // of QT3DCORE_QABSTRACT_TRANSFORM_H diff --git a/src/core/transforms/qabstracttransform_p.h b/src/core/transforms/qabstracttransform_p.h index 4318e8a08..44498d7b0 100644 --- a/src/core/transforms/qabstracttransform_p.h +++ b/src/core/transforms/qabstracttransform_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTTRANSFORM_P_H -#define QT3D_QABSTRACTTRANSFORM_P_H +#ifndef QT3DCORE_QABSTRACTTRANSFORM_P_H +#define QT3DCORE_QABSTRACTTRANSFORM_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractTransformPrivate : public QObjectPrivate { @@ -67,4 +67,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTTRANSFORM_P_H +#endif // QT3DCORE_QABSTRACTTRANSFORM_P_H diff --git a/src/core/transforms/qlookattransform.cpp b/src/core/transforms/qlookattransform.cpp index cea39ac81..3ff83b547 100644 --- a/src/core/transforms/qlookattransform.cpp +++ b/src/core/transforms/qlookattransform.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QLookAtTransformPrivate + \class Qt3DCore::QLookAtTransformPrivate \internal */ QLookAtTransformPrivate::QLookAtTransformPrivate() @@ -149,6 +149,6 @@ QVector3D QLookAtTransform::viewVector() const return d->m_viewVector; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/transforms/qlookattransform.h b/src/core/transforms/qlookattransform.h index df1f8790c..4febdc16a 100644 --- a/src/core/transforms/qlookattransform.h +++ b/src/core/transforms/qlookattransform.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QLOOKATTRANSFORM_H -#define QT3D_QLOOKATTRANSFORM_H +#ifndef QT3DCORE_QLOOKATTRANSFORM_H +#define QT3DCORE_QLOOKATTRANSFORM_H #include <Qt3DCore/qabstracttransform.h> @@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QLookAtTransformPrivate; -class QT3DCORESHARED_EXPORT QLookAtTransform : public Qt3D::QAbstractTransform +class QT3DCORESHARED_EXPORT QLookAtTransform : public Qt3DCore::QAbstractTransform { Q_OBJECT Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged) @@ -86,8 +86,8 @@ private: Q_DISABLE_COPY(QLookAtTransform) }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QLOOKATTRANSFORM_H +#endif // QT3DCORE_QLOOKATTRANSFORM_H diff --git a/src/core/transforms/qlookattransform_p.h b/src/core/transforms/qlookattransform_p.h index 6a7abdfda..791905507 100644 --- a/src/core/transforms/qlookattransform_p.h +++ b/src/core/transforms/qlookattransform_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QLOOKATTRANSFORM_P_H -#define QT3D_QLOOKATTRANSFORM_P_H +#ifndef QT3DCORE_QLOOKATTRANSFORM_P_H +#define QT3DCORE_QLOOKATTRANSFORM_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QLookAtTransform; class QLookAtTransformPrivate : public QAbstractTransformPrivate @@ -74,4 +74,4 @@ public : QT_END_NAMESPACE -#endif // QT3D_QLOOKATTRANSFORM_P_H +#endif // QT3DCORE_QLOOKATTRANSFORM_P_H diff --git a/src/core/transforms/qmatrixtransform.cpp b/src/core/transforms/qmatrixtransform.cpp index 298b85c1a..74122122d 100644 --- a/src/core/transforms/qmatrixtransform.cpp +++ b/src/core/transforms/qmatrixtransform.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QMatrixTransformPrivate + \class Qt3DCore::QMatrixTransformPrivate \internal */ QMatrixTransformPrivate::QMatrixTransformPrivate() @@ -89,17 +89,17 @@ QMatrix4x4 QMatrixTransform::transformMatrix() const return matrix(); } -} // namespace Qt3D +} // namespace Qt3DCore /*! \qmltype MatrixTransform \inqmlmodule Qt3D \since 5.5 - \instantiates Qt3D::QMatrixTransform + \instantiates Qt3DCore::QMatrixTransform */ /*! - \qmlproperty matrix4x4 Qt3D::MatrixTransform::matrix + \qmlproperty matrix4x4 Qt3DCore::MatrixTransform::matrix */ QT_END_NAMESPACE diff --git a/src/core/transforms/qmatrixtransform.h b/src/core/transforms/qmatrixtransform.h index 4ab92c417..ef1c6acb7 100644 --- a/src/core/transforms/qmatrixtransform.h +++ b/src/core/transforms/qmatrixtransform.h @@ -34,18 +34,18 @@ ** ****************************************************************************/ -#ifndef QT3D_QMATRIXTRANSFORM_H -#define QT3D_QMATRIXTRANSFORM_H +#ifndef QT3DCORE_QMATRIXTRANSFORM_H +#define QT3DCORE_QMATRIXTRANSFORM_H #include <Qt3DCore/qabstracttransform.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QMatrixTransformPrivate; -class QT3DCORESHARED_EXPORT QMatrixTransform : public Qt3D::QAbstractTransform +class QT3DCORESHARED_EXPORT QMatrixTransform : public Qt3DCore::QAbstractTransform { Q_OBJECT Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged) @@ -69,8 +69,8 @@ private: Q_DISABLE_COPY(QMatrixTransform) }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QMATRIXTRANSFORM_H +#endif // QT3DCORE_QMATRIXTRANSFORM_H diff --git a/src/core/transforms/qmatrixtransform_p.h b/src/core/transforms/qmatrixtransform_p.h index ec561dd08..378fbd85b 100644 --- a/src/core/transforms/qmatrixtransform_p.h +++ b/src/core/transforms/qmatrixtransform_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QMATRIXTRANSFORM_P_H -#define QT3D_QMATRIXTRANSFORM_P_H +#ifndef QT3DCORE_QMATRIXTRANSFORM_P_H +#define QT3DCORE_QMATRIXTRANSFORM_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QMatrixTransform; @@ -69,4 +69,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QMATRIXTRANSFORM_P_H +#endif // QT3DCORE_QMATRIXTRANSFORM_P_H diff --git a/src/core/transforms/qrotatetransform.cpp b/src/core/transforms/qrotatetransform.cpp index 01b53fcee..9f74a288a 100644 --- a/src/core/transforms/qrotatetransform.cpp +++ b/src/core/transforms/qrotatetransform.cpp @@ -46,10 +46,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QRotateTransformPrivate + \class Qt3DCore::QRotateTransformPrivate \internal */ QRotateTransformPrivate::QRotateTransformPrivate() @@ -85,7 +85,7 @@ float QRotateTransform::angleDeg() const return d->m_angleDeg; } -float Qt3D::QRotateTransform::angleRad() const +float Qt3DCore::QRotateTransform::angleRad() const { Q_D(const QRotateTransform); return qDegreesToRadians(d->m_angleDeg); @@ -130,6 +130,6 @@ void QRotateTransform::setAxis(const QVector3D& arg) } } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/transforms/qrotatetransform.h b/src/core/transforms/qrotatetransform.h index 649da06c2..bf5e09be1 100644 --- a/src/core/transforms/qrotatetransform.h +++ b/src/core/transforms/qrotatetransform.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QROTATETRANSFORM_H -#define QT3D_QROTATETRANSFORM_H +#ifndef QT3DCORE_QROTATETRANSFORM_H +#define QT3DCORE_QROTATETRANSFORM_H #include <Qt3DCore/qabstracttransform.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QRotateTransformPrivate; @@ -79,8 +79,8 @@ private: Q_DISABLE_COPY(QRotateTransform) }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QROTATETRANSFORM_H +#endif // QT3DCORE_QROTATETRANSFORM_H diff --git a/src/core/transforms/qrotatetransform_p.h b/src/core/transforms/qrotatetransform_p.h index fc878bc40..1f0ae06af 100644 --- a/src/core/transforms/qrotatetransform_p.h +++ b/src/core/transforms/qrotatetransform_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QROTATETRANSFORM_P_H -#define QT3D_QROTATETRANSFORM_P_H +#ifndef QT3DCORE_QROTATETRANSFORM_P_H +#define QT3DCORE_QROTATETRANSFORM_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QRotateTransform; @@ -75,4 +75,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QROTATETRANSFORM_P_H +#endif // QT3DCORE_QROTATETRANSFORM_P_H diff --git a/src/core/transforms/qscaletransform.cpp b/src/core/transforms/qscaletransform.cpp index f102fe373..b150b145f 100644 --- a/src/core/transforms/qscaletransform.cpp +++ b/src/core/transforms/qscaletransform.cpp @@ -39,11 +39,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D +namespace Qt3DCore { /*! - \class Qt3D::QScaleTransformPrivate + \class Qt3DCore::QScaleTransformPrivate \internal */ QScaleTransformPrivate::QScaleTransformPrivate() diff --git a/src/core/transforms/qscaletransform.h b/src/core/transforms/qscaletransform.h index 42518f5a8..7db2676dd 100644 --- a/src/core/transforms/qscaletransform.h +++ b/src/core/transforms/qscaletransform.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_SCALETRANSFORM_H -#define QT3D_SCALETRANSFORM_H +#ifndef QT3DCORE_SCALETRANSFORM_H +#define QT3DCORE_SCALETRANSFORM_H #include <Qt3DCore/qabstracttransform.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QScaleTransformPrivate; @@ -78,4 +78,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_SCALETRANSFORM_H +#endif // QT3DCORE_SCALETRANSFORM_H diff --git a/src/core/transforms/qscaletransform_p.h b/src/core/transforms/qscaletransform_p.h index 5da15489f..a544f9c6b 100644 --- a/src/core/transforms/qscaletransform_p.h +++ b/src/core/transforms/qscaletransform_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCALETRANSFORM_P_H -#define QT3D_QSCALETRANSFORM_P_H +#ifndef QT3DCORE_QSCALETRANSFORM_P_H +#define QT3DCORE_QSCALETRANSFORM_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QScaleTransform; class QScaleTransformPrivate : public QAbstractTransformPrivate @@ -68,4 +68,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QSCALETRANSFORM_P_H +#endif // QT3DCORE_QSCALETRANSFORM_P_H diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp index 48bee2094..5f3711eb2 100644 --- a/src/core/transforms/qtransform.cpp +++ b/src/core/transforms/qtransform.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QTransformPrivate + \class Qt3DCore::QTransformPrivate \internal */ QTransformPrivate::QTransformPrivate() @@ -159,7 +159,7 @@ QMatrix4x4 QTransform::matrix() const return d->m_matrix; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h index 722dcf688..cc52a297e 100644 --- a/src/core/transforms/qtransform.h +++ b/src/core/transforms/qtransform.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTRANSFORM_H -#define QT3D_QTRANSFORM_H +#ifndef QT3DCORE_QTRANSFORM_H +#define QT3DCORE_QTRANSFORM_H #include <Qt3DCore/qcomponent.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractTransform; @@ -80,8 +80,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_update()) }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QTRANSFORM_H +#endif // QT3DCORE_QTRANSFORM_H diff --git a/src/core/transforms/qtransform_p.h b/src/core/transforms/qtransform_p.h index 2f51b4d5a..7b6e0d49f 100644 --- a/src/core/transforms/qtransform_p.h +++ b/src/core/transforms/qtransform_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTRANSFORM_P_H -#define QT3D_QTRANSFORM_P_H +#ifndef QT3DCORE_QTRANSFORM_P_H +#define QT3DCORE_QTRANSFORM_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTransform; class QTransformPrivate : public QComponentPrivate @@ -72,8 +72,8 @@ public: mutable QMatrix4x4 m_matrix; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QTRANSFORM_P_H +#endif // QT3DCORE_QTRANSFORM_P_H diff --git a/src/core/transforms/qtranslatetransform.cpp b/src/core/transforms/qtranslatetransform.cpp index 6c7dc0896..bb24d8de6 100644 --- a/src/core/transforms/qtranslatetransform.cpp +++ b/src/core/transforms/qtranslatetransform.cpp @@ -39,11 +39,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QTranslateTransformPrivate + \class Qt3DCore::QTranslateTransformPrivate \internal */ QTranslateTransformPrivate::QTranslateTransformPrivate() @@ -135,6 +135,6 @@ void QTranslateTransform::setTranslation(const QVector3D &arg) } } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/transforms/qtranslatetransform.h b/src/core/transforms/qtranslatetransform.h index 4bf3b4c61..ce763cde9 100644 --- a/src/core/transforms/qtranslatetransform.h +++ b/src/core/transforms/qtranslatetransform.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTRANSLATETRANSFORM_H -#define QT3D_QTRANSLATETRANSFORM_H +#ifndef QT3DCORE_QTRANSLATETRANSFORM_H +#define QT3DCORE_QTRANSLATETRANSFORM_H #include <Qt3DCore/qabstracttransform.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTranslateTransformPrivate; @@ -85,8 +85,8 @@ private: Q_DISABLE_COPY(QTranslateTransform) }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QTRANSLATETRANSFORM_H +#endif // QT3DCORE_QTRANSLATETRANSFORM_H diff --git a/src/core/transforms/qtranslatetransform_p.h b/src/core/transforms/qtranslatetransform_p.h index 773f7fc64..8f1f34f6a 100644 --- a/src/core/transforms/qtranslatetransform_p.h +++ b/src/core/transforms/qtranslatetransform_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTRANSLATETRANSFORM_P_H -#define QT3D_QTRANSLATETRANSFORM_P_H +#ifndef QT3DCORE_QTRANSLATETRANSFORM_P_H +#define QT3DCORE_QTRANSLATETRANSFORM_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTranslateTransform; class QTranslateTransformPrivate : public QAbstractTransformPrivate @@ -68,4 +68,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QTRANSLATETRANSFORM_P_H +#endif // QT3DCORE_QTRANSLATETRANSFORM_P_H |