diff options
Diffstat (limited to 'src/core')
156 files changed, 728 insertions, 728 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 02d8cb16f..806886ad5 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -50,10 +50,10 @@ static QByteArray className(const QMetaObject &obj) return QByteArray::fromRawData(obj.className(), int(strlen(obj.className()))); } -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractAspectPrivate + \class Qt3DCore::QAbstractAspectPrivate \internal */ QAbstractAspectPrivate::QAbstractAspectPrivate() @@ -71,7 +71,7 @@ QAbstractAspectPrivate *QAbstractAspectPrivate::get(QAbstractAspect *aspect) } /*! - \class Qt3D::QAbstractAspect + \class Qt3DCore::QAbstractAspect \inmodule Qt3DCore \brief QAbstractAspect is the base class for aspects that provide a vertical slice of behavior. */ @@ -203,6 +203,6 @@ void QAbstractAspect::onShutdown() { } -} // of namespace Qt3D +} // of namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index 12d5044a1..cd162dfd2 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTASPECT_H -#define QT3D_QABSTRACTASPECT_H +#ifndef QT3DCORE_QABSTRACTASPECT_H +#define QT3DCORE_QABSTRACTASPECT_H #include <QObject> #include <QSharedPointer> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectManager; class QNode; @@ -118,8 +118,8 @@ void QAbstractAspect::registerBackendType(const QBackendNodeFunctorPtr &functor) registerBackendType(Frontend::staticMetaObject, functor); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_ABSTRACTASPECT_H +#endif // QT3DCORE_ABSTRACTASPECT_H diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h index 77f9d2f02..5676cc8ce 100644 --- a/src/core/aspects/qabstractaspect_p.h +++ b/src/core/aspects/qabstractaspect_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTASPECT_P_H -#define QT3D_QABSTRACTASPECT_P_H +#ifndef QT3DCORE_QABSTRACTASPECT_P_H +#define QT3DCORE_QABSTRACTASPECT_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspect; class QEntity; @@ -84,4 +84,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTASPECT_P_H +#endif // QT3DCORE_QABSTRACTASPECT_P_H diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 9871f558d..6a0836294 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -55,10 +55,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAspectEnginePrivate + \class Qt3DCore::QAspectEnginePrivate \internal */ QAspectEnginePrivate::QAspectEnginePrivate() @@ -66,11 +66,11 @@ QAspectEnginePrivate::QAspectEnginePrivate() , m_postman(Q_NULLPTR) , m_scene(Q_NULLPTR) { - qRegisterMetaType<Qt3D::QAbstractAspect *>(); - qRegisterMetaType<Qt3D::QObserverInterface *>(); - qRegisterMetaType<Qt3D::QEntity *>(); - qRegisterMetaType<Qt3D::QScene *>(); - qRegisterMetaType<Qt3D::QAbstractPostman *>(); + qRegisterMetaType<Qt3DCore::QAbstractAspect *>(); + qRegisterMetaType<Qt3DCore::QObserverInterface *>(); + qRegisterMetaType<Qt3DCore::QEntity *>(); + qRegisterMetaType<Qt3DCore::QScene *>(); + qRegisterMetaType<Qt3DCore::QAbstractPostman *>(); } /*! @@ -146,10 +146,10 @@ void QAspectEngine::initialize() QChangeArbiter::createUnmanagedThreadLocalChangeQueue(arbiter); QMetaObject::invokeMethod(arbiter, "setPostman", - Q_ARG(Qt3D::QAbstractPostman*, d->m_postman)); + Q_ARG(Qt3DCore::QAbstractPostman*, d->m_postman)); QMetaObject::invokeMethod(arbiter, "setScene", - Q_ARG(Qt3D::QScene*, d->m_scene)); + Q_ARG(Qt3DCore::QScene*, d->m_scene)); } void QAspectEngine::shutdown() @@ -202,7 +202,7 @@ void QAspectEngine::registerAspect(QAbstractAspect *aspect) QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(), "registerAspect", Qt::BlockingQueuedConnection, - Q_ARG(Qt3D::QAbstractAspect *, aspect)); + Q_ARG(Qt3DCore::QAbstractAspect *, aspect)); } /*! @@ -256,7 +256,7 @@ void QAspectEngine::setRootEntity(QEntity *root) QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(), "setRootEntity", Qt::BlockingQueuedConnection, - Q_ARG(Qt3D::QEntity *, root)); + Q_ARG(Qt3DCore::QEntity *, root)); qCDebug(Aspects) << "Done setting scene root on aspect manager"; } @@ -278,6 +278,6 @@ void QAspectEngine::setAspectFactory(const QAspectFactory &factory) d->m_factory = factory; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h index cdbb01a30..e9e768add 100644 --- a/src/core/aspects/qaspectengine.h +++ b/src/core/aspects/qaspectengine.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTENGINE_H -#define QT3D_QASPECTENGINE_H +#ifndef QT3DCORE_QASPECTENGINE_H +#define QT3DCORE_QASPECTENGINE_H #include <QObject> #include <Qt3DCore/QAspectFactory> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspect; class QAspectThread; @@ -81,9 +81,9 @@ private: void initNodeTree(QNode *node); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTENGINE_H +#endif // QT3DCORE_QASPECTENGINE_H diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h index a8409f2c0..0439058d1 100644 --- a/src/core/aspects/qaspectengine_p.h +++ b/src/core/aspects/qaspectengine_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTENGINE_P_H -#define QT3D_QASPECTENGINE_P_H +#ifndef QT3DCORE_QASPECTENGINE_P_H +#define QT3DCORE_QASPECTENGINE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; class QNode; @@ -85,4 +85,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QASPECTENGINE_P_H +#endif // QT3DCORE_QASPECTENGINE_P_H diff --git a/src/core/aspects/qaspectfactory.cpp b/src/core/aspects/qaspectfactory.cpp index 04e902acf..673ff5bdd 100644 --- a/src/core/aspects/qaspectfactory.cpp +++ b/src/core/aspects/qaspectfactory.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { typedef QHash<QString, QAspectFactory::CreateFunction> defaultFactories_t; Q_GLOBAL_STATIC(defaultFactories_t, defaultFactories) @@ -55,7 +55,7 @@ QT3DCORESHARED_EXPORT void qt3d_QAspectFactoryPrivate_addDefaultFactory(const QS } /*! - \class Qt3D::QAspectFactoryPrivate + \class Qt3DCore::QAspectFactoryPrivate \internal */ QAspectFactoryPrivate::QAspectFactoryPrivate() @@ -103,6 +103,6 @@ QAbstractAspect *QAspectFactory::createAspect(const QString &aspect, QObject *pa } } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qaspectfactory.h b/src/core/aspects/qaspectfactory.h index 938e8a967..9280c5340 100644 --- a/src/core/aspects/qaspectfactory.h +++ b/src/core/aspects/qaspectfactory.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTFACTORY_H -#define QT3D_QASPECTFACTORY_H +#ifndef QT3DCORE_QASPECTFACTORY_H +#define QT3DCORE_QASPECTFACTORY_H #include <QSharedDataPointer> #include <QStringList> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QObject; -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspect; class QAspectFactoryPrivate; @@ -85,20 +85,20 @@ private: QSharedDataPointer<QAspectFactoryPrivate> d; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE #define QT3D_REGISTER_NAMESPACED_ASPECT(name, AspectNamespace, AspectType) \ QT_BEGIN_NAMESPACE \ - namespace Qt3D { \ + namespace Qt3DCore { \ QT3DCORESHARED_EXPORT void qt3d_QAspectFactoryPrivate_addDefaultFactory(const QString &, QAspectFactory::CreateFunction); \ } \ QT_END_NAMESPACE \ namespace { \ void qt3d_ ## AspectType ## _registerFunction() \ { \ - using namespace QT_PREPEND_NAMESPACE(Qt3D); \ + using namespace QT_PREPEND_NAMESPACE(Qt3DCore); \ qt3d_QAspectFactoryPrivate_addDefaultFactory(QStringLiteral(name), &QAspectFactory::functionHelper<AspectNamespace::AspectType>); \ } \ \ @@ -108,4 +108,4 @@ QT_END_NAMESPACE #define QT3D_REGISTER_ASPECT(name, AspectType) \ QT3D_REGISTER_NAMESPACED_ASPECT(name, , AspectType) -#endif // QT3D_QASPECTFACTORY_H +#endif // QT3DCORE_QASPECTFACTORY_H diff --git a/src/core/aspects/qaspectfactory_p.h b/src/core/aspects/qaspectfactory_p.h index 7e105fe09..dfe7ccd9e 100644 --- a/src/core/aspects/qaspectfactory_p.h +++ b/src/core/aspects/qaspectfactory_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTFACTORY_P_H -#define QT3D_QASPECTFACTORY_P_H +#ifndef QT3DCORE_QASPECTFACTORY_P_H +#define QT3DCORE_QASPECTFACTORY_P_H // // W A R N I N G @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectFactory; @@ -72,4 +72,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QASPECTFACTORY_P_H +#endif // QT3DCORE_QASPECTFACTORY_P_H diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index e6752f19c..0c5940ce5 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QAspectManager::QAspectManager(QObject *parent) : QObject(parent) @@ -106,7 +106,7 @@ void QAspectManager::shutdown() // Aspects must be deleted in the Thread they were created in } -void QAspectManager::setRootEntity(Qt3D::QEntity *root) +void QAspectManager::setRootEntity(Qt3DCore::QEntity *root) { qCDebug(Aspects) << Q_FUNC_INFO; @@ -261,7 +261,7 @@ QServiceLocator *QAspectManager::serviceLocator() const return m_serviceLocator.data(); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h index bdf8b9233..8c1e372af 100644 --- a/src/core/aspects/qaspectmanager_p.h +++ b/src/core/aspects/qaspectmanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTMANAGER_P_H -#define QT3D_QASPECTMANAGER_P_H +#ifndef QT3DCORE_QASPECTMANAGER_P_H +#define QT3DCORE_QASPECTMANAGER_P_H // // W A R N I N G @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QSurface; -namespace Qt3D { +namespace Qt3DCore { class QNode; class QEntity; @@ -83,9 +83,9 @@ public Q_SLOTS: void initialize(); void shutdown(); - void setRootEntity(Qt3D::QEntity *root); + void setRootEntity(Qt3DCore::QEntity *root); void setData(const QVariantMap &data); - void registerAspect(Qt3D::QAbstractAspect *aspect); + void registerAspect(Qt3DCore::QAbstractAspect *aspect); QVariantMap data() const; void exec(); @@ -109,8 +109,8 @@ private: QSemaphore m_waitForEndOfExecLoop; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTMANAGER_P_H +#endif // QT3DCORE_QASPECTMANAGER_P_H diff --git a/src/core/aspects/qaspectthread.cpp b/src/core/aspects/qaspectthread.cpp index 0b1a969d3..67ce4cf20 100644 --- a/src/core/aspects/qaspectthread.cpp +++ b/src/core/aspects/qaspectthread.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QAspectThread::QAspectThread(QObject *parent) : QThread(parent), @@ -87,6 +87,6 @@ void QAspectThread::run() qCDebug(Aspects) << "Exiting void QAspectThread::run()"; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qaspectthread.h b/src/core/aspects/qaspectthread.h index 8d32e28bd..7bb48771e 100644 --- a/src/core/aspects/qaspectthread.h +++ b/src/core/aspects/qaspectthread.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTTHREAD_H -#define QT3D_QASPECTTHREAD_H +#ifndef QT3DCORE_QASPECTTHREAD_H +#define QT3DCORE_QASPECTTHREAD_H #include <QThread> #include <Qt3DCore/qt3dcore_global.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectManager; @@ -66,8 +66,8 @@ private: QSemaphore m_semaphore; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTTHREAD_H +#endif // QT3DCORE_QASPECTTHREAD_H diff --git a/src/core/bounds/qaxisalignedboundingbox.cpp b/src/core/bounds/qaxisalignedboundingbox.cpp index 21bb55bb4..afd21348c 100644 --- a/src/core/bounds/qaxisalignedboundingbox.cpp +++ b/src/core/bounds/qaxisalignedboundingbox.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { void QAxisAlignedBoundingBox::update(const QVector<QVector3D> &points) { @@ -89,6 +89,6 @@ QDebug operator<<(QDebug dbg, const QAxisAlignedBoundingBox &c) return dbg; } -} //namespace Qt3D +} //namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/bounds/qaxisalignedboundingbox.h b/src/core/bounds/qaxisalignedboundingbox.h index c05917cf2..bf25fada3 100644 --- a/src/core/bounds/qaxisalignedboundingbox.h +++ b/src/core/bounds/qaxisalignedboundingbox.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QAXISALIGNEDBOUNDINGBOX_H -#define QT3D_QAXISALIGNEDBOUNDINGBOX_H +#ifndef QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H +#define QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H #include <Qt3DCore/qt3dcore_global.h> @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QDebug; -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QAxisAlignedBoundingBox { @@ -148,8 +148,8 @@ inline bool intersects(const QAxisAlignedBoundingBox &a, return true; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QAXISALIGNEDBOUNDINGBOX_H +#endif // QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H diff --git a/src/core/core-components/qcamera.cpp b/src/core/core-components/qcamera.cpp index 9450ccf5b..5f7b2ef9a 100644 --- a/src/core/core-components/qcamera.cpp +++ b/src/core/core-components/qcamera.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QCameraPrivate + \class Qt3DCore::QCameraPrivate \internal */ QCameraPrivate::QCameraPrivate() @@ -55,7 +55,7 @@ QCameraPrivate::QCameraPrivate() /*! \qmltype Camera - \instantiates Qt3D::QCamera + \instantiates Qt3DCore::QCamera \inherits Entity \inqmlmodule Qt3D \since 5.5 @@ -256,7 +256,7 @@ void QCamera::setProjectionType(QCameraLens::ProjectionType type) } /*! - \qmlproperty enumeration Qt3D::Camera::projectionType + \qmlproperty enumeration Qt3DCore::Camera::projectionType Holds the type of the camera projection (orthogonal or perspective). @@ -277,7 +277,7 @@ void QCamera::setNearPlane(float nearPlane) } /*! - \qmlproperty float Qt3D::Camera::nearPlane + \qmlproperty float Qt3DCore::Camera::nearPlane */ float QCamera::nearPlane() const @@ -293,7 +293,7 @@ void QCamera::setFarPlane(float farPlane) } /*! - \qmlproperty float Qt3D::Camera::farPlane + \qmlproperty float Qt3DCore::Camera::farPlane */ float QCamera::farPlane() const @@ -309,7 +309,7 @@ void QCamera::setFieldOfView(float fieldOfView) } /*! - \qmlproperty float Qt3D::Camera::fieldOfView + \qmlproperty float Qt3DCore::Camera::fieldOfView */ float QCamera::fieldOfView() const @@ -325,7 +325,7 @@ void QCamera::setAspectRatio(float aspectRatio) } /*! - \qmlproperty float Qt3D::Camera::aspectRatio + \qmlproperty float Qt3DCore::Camera::aspectRatio */ float QCamera::aspectRatio() const @@ -341,7 +341,7 @@ void QCamera::setLeft(float left) } /*! - \qmlproperty float Qt3D::Camera::left + \qmlproperty float Qt3DCore::Camera::left */ float QCamera::left() const @@ -357,7 +357,7 @@ void QCamera::setRight(float right) } /*! - \qmlproperty float Qt3D::Camera::right + \qmlproperty float Qt3DCore::Camera::right */ float QCamera::right() const @@ -373,7 +373,7 @@ void QCamera::setBottom(float bottom) } /*! - \qmlproperty float Qt3D::Camera::bottom + \qmlproperty float Qt3DCore::Camera::bottom */ float QCamera::bottom() const @@ -389,7 +389,7 @@ void QCamera::setTop(float top) } /*! - \qmlproperty float Qt3D::Camera::top + \qmlproperty float Qt3DCore::Camera::top */ float QCamera::top() const @@ -399,7 +399,7 @@ float QCamera::top() const } /*! - \qmlproperty matrix4x4 Qt3D::Camera::projectionMatrix + \qmlproperty matrix4x4 Qt3DCore::Camera::projectionMatrix \readonly */ @@ -416,7 +416,7 @@ void QCamera::setPosition(const QVector3D &position) } /*! - \qmlproperty vector3d Qt3D::Camera::position + \qmlproperty vector3d Qt3DCore::Camera::position */ QVector3D QCamera::position() const @@ -433,7 +433,7 @@ void QCamera::setUpVector(const QVector3D &upVector) } /*! - \qmlproperty vector3d Qt3D::Camera::upVector + \qmlproperty vector3d Qt3DCore::Camera::upVector */ QVector3D QCamera::upVector() const @@ -449,7 +449,7 @@ void QCamera::setViewCenter(const QVector3D &viewCenter) } /*! - \qmlproperty vector3d Qt3D::Camera::viewCenter + \qmlproperty vector3d Qt3DCore::Camera::viewCenter */ QVector3D QCamera::viewCenter() const @@ -459,7 +459,7 @@ QVector3D QCamera::viewCenter() const } /*! - \qmlproperty matrix4x4 Qt3D::Camera::matrix + \qmlproperty matrix4x4 Qt3DCore::Camera::matrix */ QMatrix4x4 QCamera::matrix() const { diff --git a/src/core/core-components/qcamera.h b/src/core/core-components/qcamera.h index e3d6b2e31..9832aa5f9 100644 --- a/src/core/core-components/qcamera.h +++ b/src/core/core-components/qcamera.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERA_H -#define QT3D_CAMERA_H +#ifndef QT3DCORE_CAMERA_H +#define QT3DCORE_CAMERA_H #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcameralens.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QLookAtTransform; class QTransform; @@ -55,7 +55,7 @@ class QT3DCORESHARED_EXPORT QCamera : public QEntity { Q_OBJECT // CameraLens - Q_PROPERTY(Qt3D::QCameraLens::ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged) + Q_PROPERTY(Qt3DCore::QCameraLens::ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged) Q_PROPERTY(float nearPlane READ nearPlane WRITE setNearPlane NOTIFY nearPlaneChanged) Q_PROPERTY(float farPlane READ farPlane WRITE setFarPlane NOTIFY farPlaneChanged) Q_PROPERTY(float fieldOfView READ fieldOfView WRITE setFieldOfView NOTIFY fieldOfViewChanged) @@ -167,8 +167,8 @@ protected: QCamera(QCameraPrivate &dd, QNode *parent = 0); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERA_H +#endif // QT3DCORE_CAMERA_H diff --git a/src/core/core-components/qcamera_p.h b/src/core/core-components/qcamera_p.h index d16ba647f..12eef5b35 100644 --- a/src/core/core-components/qcamera_p.h +++ b/src/core/core-components/qcamera_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERA_P_H -#define QT3D_CAMERA_P_H +#ifndef QT3DCORE_CAMERA_P_H +#define QT3DCORE_CAMERA_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QCameraPrivate : public QEntityPrivate { @@ -69,8 +69,8 @@ public: QLookAtTransform *m_lookAt; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERA_P_H +#endif // QT3DCORE_CAMERA_P_H diff --git a/src/core/core-components/qcameralens.cpp b/src/core/core-components/qcameralens.cpp index 239fe2904..206745c28 100644 --- a/src/core/core-components/qcameralens.cpp +++ b/src/core/core-components/qcameralens.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QCameraLensPrivate + \class Qt3DCore::QCameraLensPrivate \internal */ QCameraLensPrivate::QCameraLensPrivate() @@ -87,10 +87,10 @@ void QCameraLens::copy(const QNode *ref) d_func()->m_projectionMatrix = lens->d_func()->m_projectionMatrix; } -/*! \class Qt3D::QCameraLens +/*! \class Qt3DCore::QCameraLens * \inmodule Qt3DCore * - * \brief Qt3D::QCameraLens specifies the projection matrix that will be used to + * \brief Qt3DCore::QCameraLens specifies the projection matrix that will be used to * define a Camera for a 3D scene. * * \since 5.5 @@ -105,8 +105,8 @@ QCameraLens::QCameraLens(QCameraLensPrivate &dd, QNode *parent) /*! * Sets the lens' projection type \a projectionType. * - * \note Qt3D::QCameraLens::Frustum and - * Qt3D::QCameraLens::PerspectiveProjection are two different ways of + * \note Qt3DCore::QCameraLens::Frustum and + * Qt3DCore::QCameraLens::PerspectiveProjection are two different ways of * specifying the same projection. */ void QCameraLens::setProjectionType(QCameraLens::ProjectionType projectionType) @@ -239,7 +239,7 @@ float QCameraLens::farPlane() const * a projection matrix update. * * \note this has no effect if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setFieldOfView(float fieldOfView) { @@ -255,7 +255,7 @@ void QCameraLens::setFieldOfView(float fieldOfView) * Returns the projection's field of view in degrees. * * \note: The return value may be undefined if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::fieldOfView() const { @@ -268,7 +268,7 @@ float QCameraLens::fieldOfView() const * matrix update. * * \note this has no effect if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setAspectRatio(float aspectRatio) { @@ -284,7 +284,7 @@ void QCameraLens::setAspectRatio(float aspectRatio) * Returns the projection's aspect ratio. * * \note: The return value may be undefined if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::aspectRatio() const { @@ -297,7 +297,7 @@ float QCameraLens::aspectRatio() const * triggers a projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setLeft(float left) { @@ -313,7 +313,7 @@ void QCameraLens::setLeft(float left) * Returns the lower left window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::left() const { @@ -326,7 +326,7 @@ float QCameraLens::left() const * a projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setRight(float right) { @@ -342,7 +342,7 @@ void QCameraLens::setRight(float right) * Returns the upper right window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::right() const { @@ -355,7 +355,7 @@ float QCameraLens::right() const * projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setBottom(float bottom) { @@ -371,7 +371,7 @@ void QCameraLens::setBottom(float bottom) * Returns the bottom window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::bottom() const { @@ -384,7 +384,7 @@ float QCameraLens::bottom() const * projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setTop(float top) { @@ -400,7 +400,7 @@ void QCameraLens::setTop(float top) * Returns the bottom window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::top() const { @@ -421,14 +421,14 @@ QMatrix4x4 QCameraLens::projectionMatrix() const /*! \qmltype CameraLens - \instantiates Qt3D::QCameraLens + \instantiates Qt3DCore::QCameraLens \inqmlmodule Qt3D \inherits Component3D \since 5.5 */ /*! - \qmlproperty enumeration Qt3D::CameraLens::projectionType + \qmlproperty enumeration Qt3DCore::CameraLens::projectionType Holds the type of the camera projection (orthogonal or perspective). @@ -437,39 +437,39 @@ QMatrix4x4 QCameraLens::projectionMatrix() const */ /*! - \qmlproperty float Qt3D::CameraLens::nearPlane + \qmlproperty float Qt3DCore::CameraLens::nearPlane */ /*! - \qmlproperty float Qt3D::CameraLens::farPlane + \qmlproperty float Qt3DCore::CameraLens::farPlane */ /*! - \qmlproperty float Qt3D::CameraLens::fieldOfView + \qmlproperty float Qt3DCore::CameraLens::fieldOfView */ /*! - \qmlproperty float Qt3D::CameraLens::aspectRatio + \qmlproperty float Qt3DCore::CameraLens::aspectRatio */ /*! - \qmlproperty float Qt3D::CameraLens::left + \qmlproperty float Qt3DCore::CameraLens::left */ /*! - \qmlproperty float Qt3D::CameraLens::right + \qmlproperty float Qt3DCore::CameraLens::right */ /*! - \qmlproperty float Qt3D::CameraLens::bottom + \qmlproperty float Qt3DCore::CameraLens::bottom */ /*! - \qmlproperty float Qt3D::CameraLens::top + \qmlproperty float Qt3DCore::CameraLens::top */ /*! - \qmlproperty matrix4x4 Qt3D::CameraLens::projectionMatrix + \qmlproperty matrix4x4 Qt3DCore::CameraLens::projectionMatrix \readonly */ diff --git a/src/core/core-components/qcameralens.h b/src/core/core-components/qcameralens.h index 7ec77adf7..7877b3a13 100644 --- a/src/core/core-components/qcameralens.h +++ b/src/core/core-components/qcameralens.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERALENS_H -#define QT3D_CAMERALENS_H +#ifndef QT3DCORE_CAMERALENS_H +#define QT3DCORE_CAMERALENS_H #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qt3dcore_global.h> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCameraLensPrivate; diff --git a/src/core/core-components/qcameralens_p.h b/src/core/core-components/qcameralens_p.h index 94d08c45a..b7ed7e9a8 100644 --- a/src/core/core-components/qcameralens_p.h +++ b/src/core/core-components/qcameralens_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERALENS_P_H -#define QT3D_CAMERALENS_P_H +#ifndef QT3DCORE_CAMERALENS_P_H +#define QT3DCORE_CAMERALENS_P_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QCameraLensPrivate : public QComponentPrivate { @@ -122,8 +122,8 @@ private: } }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERALENS_P_H +#endif // QT3DCORE_CAMERALENS_P_H diff --git a/src/core/corelogging.cpp b/src/core/corelogging.cpp index fe9de5dcc..a9917d90c 100644 --- a/src/core/corelogging.cpp +++ b/src/core/corelogging.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { Q_LOGGING_CATEGORY(Nodes, "Qt3D.Core.Nodes") Q_LOGGING_CATEGORY(Aspects, "Qt3D.Core.Aspects") diff --git a/src/core/corelogging_p.h b/src/core/corelogging_p.h index adca1cee6..7b944bb50 100644 --- a/src/core/corelogging_p.h +++ b/src/core/corelogging_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CORELOGGING_P_H -#define QT3D_CORELOGGING_P_H +#ifndef QT3DCORE_CORELOGGING_P_H +#define QT3DCORE_CORELOGGING_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { Q_DECLARE_LOGGING_CATEGORY(Resources) Q_DECLARE_LOGGING_CATEGORY(Nodes) @@ -64,4 +64,4 @@ Q_DECLARE_LOGGING_CATEGORY(ChangeArbiter) QT_END_NAMESPACE -#endif // QT3D_CORELOGGING_P_H +#endif // QT3DCORE_CORELOGGING_P_H diff --git a/src/core/io/qabstractattribute.cpp b/src/core/io/qabstractattribute.cpp index 728a31a49..56563e01e 100644 --- a/src/core/io/qabstractattribute.cpp +++ b/src/core/io/qabstractattribute.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractAttributePrivate + \class Qt3DCore::QAbstractAttributePrivate \internal */ QAbstractAttributePrivate::QAbstractAttributePrivate() @@ -69,7 +69,7 @@ QAbstractAttribute::QAbstractAttribute(QNode *parent) QAbstractAttribute::~QAbstractAttribute() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractAttribute subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QAbstractAttribute subclass didn't call QNode::cleanup in its destructor"); } QAbstractAttribute::QAbstractAttribute(QAbstractBuffer *buf, DataType type, uint dataSize, uint count, uint offset, uint stride, QNode *parent) diff --git a/src/core/io/qabstractattribute.h b/src/core/io/qabstractattribute.h index f1f157b57..cf23812d1 100644 --- a/src/core/io/qabstractattribute.h +++ b/src/core/io/qabstractattribute.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTATTRIBUTE_H -#define QT3D_QABSTRACTATTRIBUTE_H +#ifndef QT3DCORE_QABSTRACTATTRIBUTE_H +#define QT3DCORE_QABSTRACTATTRIBUTE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/QNode> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractBuffer; class QAbstractAttributePrivate; @@ -53,7 +53,7 @@ typedef QSharedPointer<QAbstractBuffer> QAbstractBufferPtr; class QT3DCORESHARED_EXPORT QAbstractAttribute : public QNode { Q_OBJECT - Q_PROPERTY(Qt3D::QAbstractBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged) + Q_PROPERTY(Qt3DCore::QAbstractBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(DataType dataType READ dataType WRITE setDataType NOTIFY dataTypeChanged) Q_PROPERTY(uint dataSize READ dataSize WRITE setDataSize NOTIFY dataSizeChanged) @@ -138,4 +138,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTATTRIBUTE_H +#endif // QT3DCORE_QABSTRACTATTRIBUTE_H diff --git a/src/core/io/qabstractattribute_p.h b/src/core/io/qabstractattribute_p.h index b825aebbe..88cc945e1 100644 --- a/src/core/io/qabstractattribute_p.h +++ b/src/core/io/qabstractattribute_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTATTRIBUTE_P_H -#define QT3D_QABSTRACTATTRIBUTE_P_H +#ifndef QT3DCORE_QABSTRACTATTRIBUTE_P_H +#define QT3DCORE_QABSTRACTATTRIBUTE_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAttribute; @@ -81,4 +81,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTATTRIBUTE_P_H +#endif // QT3DCORE_QABSTRACTATTRIBUTE_P_H diff --git a/src/core/io/qabstractbuffer.cpp b/src/core/io/qabstractbuffer.cpp index 7089b5a91..c53904747 100644 --- a/src/core/io/qabstractbuffer.cpp +++ b/src/core/io/qabstractbuffer.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractBufferPrivate + \class Qt3DCore::QAbstractBufferPrivate \internal */ @@ -58,7 +58,7 @@ QAbstractBuffer::QAbstractBuffer(QNode *parent) QAbstractBuffer::~QAbstractBuffer() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractBuffer subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QAbstractBuffer subclass didn't call QNode::cleanup in its destructor"); } /*! \internal */ diff --git a/src/core/io/qabstractbuffer.h b/src/core/io/qabstractbuffer.h index 8b68b0e04..2a2120ec4 100644 --- a/src/core/io/qabstractbuffer.h +++ b/src/core/io/qabstractbuffer.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTBUFFER_H -#define QT3D_QABSTRACTBUFFER_H +#ifndef QT3DCORE_QABSTRACTBUFFER_H +#define QT3DCORE_QABSTRACTBUFFER_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/QNode> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractBufferPrivate; @@ -76,4 +76,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTBUFFER_H +#endif // QT3DCORE_QABSTRACTBUFFER_H diff --git a/src/core/io/qabstractbuffer_p.h b/src/core/io/qabstractbuffer_p.h index d48b31c95..375d96d54 100644 --- a/src/core/io/qabstractbuffer_p.h +++ b/src/core/io/qabstractbuffer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTBUFFER_P_H -#define QT3D_QABSTRACTBUFFER_P_H +#ifndef QT3DCORE_QABSTRACTBUFFER_P_H +#define QT3DCORE_QABSTRACTBUFFER_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractBuffer; @@ -72,4 +72,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTBUFFER_P_H +#endif // QT3DCORE_QABSTRACTBUFFER_P_H diff --git a/src/core/io/qurlhelper.cpp b/src/core/io/qurlhelper.cpp index c930f2059..fab671b94 100644 --- a/src/core/io/qurlhelper.cpp +++ b/src/core/io/qurlhelper.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QString QUrlHelper::urlToLocalFileOrQrc(const QUrl &url) { diff --git a/src/core/io/qurlhelper_p.h b/src/core/io/qurlhelper_p.h index 27c8a674c..9bc6b5dfe 100644 --- a/src/core/io/qurlhelper_p.h +++ b/src/core/io/qurlhelper_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QURLHELPER_P_H -#define QT3D_QURLHELPER_P_H +#ifndef QT3DCORE_QURLHELPER_P_H +#define QT3DCORE_QURLHELPER_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QUrlHelper { @@ -65,4 +65,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QURLHELPER_P_H +#endif // QT3DCORE_QURLHELPER_P_H diff --git a/src/core/jobs/dependencyhandler.cpp b/src/core/jobs/dependencyhandler.cpp index a805638fe..d39b04ba4 100644 --- a/src/core/jobs/dependencyhandler.cpp +++ b/src/core/jobs/dependencyhandler.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { namespace { template <template <typename T> class Op> @@ -148,6 +148,6 @@ QVector<RunnableInterface *> DependencyHandler::freeDependencies(const RunnableI return freedList; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/dependencyhandler_p.h b/src/core/jobs/dependencyhandler_p.h index 1887cc1ea..8c0c6734e 100644 --- a/src/core/jobs/dependencyhandler_p.h +++ b/src/core/jobs/dependencyhandler_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_DEPENDENCYHANDLER_P_H -#define QT3D_DEPENDENCYHANDLER_P_H +#ifndef QT3DCORE_DEPENDENCYHANDLER_P_H +#define QT3DCORE_DEPENDENCYHANDLER_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { struct Dependency { @@ -68,12 +68,12 @@ struct Dependency RunnableInterface *dependee; }; -} // namespace Qt3D +} // namespace Qt3DCore template <> -class QTypeInfo<Qt3D::Dependency> : public QTypeInfoMerger<Qt3D::Dependency, Qt3D::RunnableInterface *> {}; +class QTypeInfo<Qt3DCore::Dependency> : public QTypeInfoMerger<Qt3DCore::Dependency, Qt3DCore::RunnableInterface *> {}; -namespace Qt3D { +namespace Qt3DCore { inline bool operator==(const Dependency &left, const Dependency &right) { @@ -102,9 +102,9 @@ private: QMutex *m_mutex; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_DEPENDENCYHANDLER_P_H +#endif // QT3DCORE_DEPENDENCYHANDLER_P_H diff --git a/src/core/jobs/qabstractaspectjobmanager.cpp b/src/core/jobs/qabstractaspectjobmanager.cpp index a3b768ae4..15d5b92d0 100644 --- a/src/core/jobs/qabstractaspectjobmanager.cpp +++ b/src/core/jobs/qabstractaspectjobmanager.cpp @@ -38,10 +38,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractAspectJobManager + \class Qt3DCore::QAbstractAspectJobManager \internal */ QAbstractAspectJobManager::QAbstractAspectJobManager(QObject *parent) diff --git a/src/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h index a153471fb..4397c746e 100644 --- a/src/core/jobs/qabstractaspectjobmanager_p.h +++ b/src/core/jobs/qabstractaspectjobmanager_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspectJobManager : public QObject { @@ -71,7 +71,7 @@ public: virtual void waitForPerThreadFunction(JobFunction func, void *arg) = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp index 9f12adb9c..fdd237954 100644 --- a/src/core/jobs/qaspectjob.cpp +++ b/src/core/jobs/qaspectjob.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAspectJobPrivate + \class Qt3DCore::QAspectJobPrivate \internal */ QAspectJobPrivate::QAspectJobPrivate() @@ -77,6 +77,6 @@ QVector<QWeakPointer<QAspectJob> > QAspectJob::dependencies() const return d->m_dependencies; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qaspectjob.h b/src/core/jobs/qaspectjob.h index 8db1c9780..042baa46a 100644 --- a/src/core/jobs/qaspectjob.h +++ b/src/core/jobs/qaspectjob.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTJOB_H -#define QT3D_QASPECTJOB_H +#ifndef QT3DCORE_QASPECTJOB_H +#define QT3DCORE_QASPECTJOB_H #include <Qt3DCore/qt3dcore_global.h> #include <QSharedPointer> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectJobPrivate; @@ -68,8 +68,8 @@ private: typedef QSharedPointer<QAspectJob> QAspectJobPtr; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTJOB_H +#endif // QT3DCORE_QASPECTJOB_H diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h index 76bf1fcfd..312479e99 100644 --- a/src/core/jobs/qaspectjob_p.h +++ b/src/core/jobs/qaspectjob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTJOB_P_H -#define QT3D_QASPECTJOB_P_H +#ifndef QT3DCORE_QASPECTJOB_P_H +#define QT3DCORE_QASPECTJOB_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectJob; @@ -69,4 +69,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QASPECTJOB_P_H +#endif // QT3DCORE_QASPECTJOB_P_H diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp index 974dec5db..47793e740 100644 --- a/src/core/jobs/qaspectjobmanager.cpp +++ b/src/core/jobs/qaspectjobmanager.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { #ifdef THREAD_WEAVER namespace { @@ -102,7 +102,7 @@ void SynchronizedJob::run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *t #endif /*! - \class Qt3D::QAspectJobManager + \class Qt3DCore::QAspectJobManager \internal */ QAspectJobManager::QAspectJobManager(QObject *parent) @@ -234,6 +234,6 @@ void QAspectJobManager::waitForPerThreadFunction(JobFunction func, void *arg) #endif } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qaspectjobmanager_p.h b/src/core/jobs/qaspectjobmanager_p.h index 772874547..deaa21d55 100644 --- a/src/core/jobs/qaspectjobmanager_p.h +++ b/src/core/jobs/qaspectjobmanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTJOBMANAGER_P_H -#define QT3D_QASPECTJOBMANAGER_P_H +#ifndef QT3DCORE_QASPECTJOBMANAGER_P_H +#define QT3DCORE_QASPECTJOBMANAGER_P_H // // W A R N I N G @@ -63,7 +63,7 @@ class Queue; QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QThreadPooler; class DependencyHandler; @@ -93,8 +93,8 @@ private: QScopedPointer<DependencyHandler> m_dependencyHandler; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTJOBMANAGER_P_H +#endif // QT3DCORE_QASPECTJOBMANAGER_P_H diff --git a/src/core/jobs/qaspectjobproviderinterface.h b/src/core/jobs/qaspectjobproviderinterface.h index ad05980ae..a8d59d5f3 100644 --- a/src/core/jobs/qaspectjobproviderinterface.h +++ b/src/core/jobs/qaspectjobproviderinterface.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTJOBPROVIDERINTERFACE_H -#define QT3D_QASPECTJOBPROVIDERINTERFACE_H +#ifndef QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H +#define QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qaspectjob.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectJobProviderInterface { @@ -57,4 +57,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QASPECTJOBPROVIDERINTERFACE_H +#endif // QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index aea393cab..f38422652 100644 --- a/src/core/jobs/qthreadpooler.cpp +++ b/src/core/jobs/qthreadpooler.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QThreadPoolerPrivate + \class Qt3DCore::QThreadPoolerPrivate \internal */ QThreadPooler::QThreadPooler(QObject *parent) @@ -169,6 +169,6 @@ int QThreadPooler::maxThreadCount() const return QThreadPool::globalInstance()->maxThreadCount(); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h index a7a0a8966..7a4253b60 100644 --- a/src/core/jobs/qthreadpooler_p.h +++ b/src/core/jobs/qthreadpooler_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTHREADPOOLER_H -#define QT3D_QTHREADPOOLER_H +#ifndef QT3DCORE_QTHREADPOOLER_H +#define QT3DCORE_QTHREADPOOLER_H // // W A R N I N G @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QThreadPooler : public QObject { @@ -89,8 +89,8 @@ private: QAtomicInt m_taskCount; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QTHREADPOOLER_H +#endif // QT3DCORE_QTHREADPOOLER_H diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp index 8cfc365fa..731a93f9a 100644 --- a/src/core/jobs/task.cpp +++ b/src/core/jobs/task.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { RunnableInterface::~RunnableInterface() { @@ -123,6 +123,6 @@ DependencyHandler *SyncTaskRunnable::dependencyHandler() return Q_NULLPTR; } -} // namespace Qt3D { +} // namespace Qt3DCore { QT_END_NAMESPACE diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h index 7d6ec744c..37368c2c1 100644 --- a/src/core/jobs/task_p.h +++ b/src/core/jobs/task_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_TASK_P_H -#define QT3D_TASK_P_H +#ifndef QT3DCORE_TASK_P_H +#define QT3DCORE_TASK_P_H // // W A R N I N G @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class JobRunner; class DependencyHandler; @@ -144,9 +144,9 @@ private: int m_id; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_TASK_P_H +#endif // QT3DCORE_TASK_P_H diff --git a/src/core/jobs/weaverjob.cpp b/src/core/jobs/weaverjob.cpp index 4bc6f4585..f006bf438 100644 --- a/src/core/jobs/weaverjob.cpp +++ b/src/core/jobs/weaverjob.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { WeaverJob::WeaverJob() { @@ -52,6 +52,6 @@ void WeaverJob::run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) m_job->run(); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/weaverjob_p.h b/src/core/jobs/weaverjob_p.h index 4bebd235a..6cc5702c4 100644 --- a/src/core/jobs/weaverjob_p.h +++ b/src/core/jobs/weaverjob_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_WEAVERJOB_H -#define QT3D_WEAVERJOB_H +#ifndef QT3DCORE_WEAVERJOB_H +#define QT3DCORE_WEAVERJOB_H #include <job.h> #include <Qt3DCore/qaspectjob.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class WeaverJob : public ThreadWeaver::Job { @@ -54,8 +54,8 @@ public: QAspectJobPtr m_job; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_WEAVERJOB_H +#endif // QT3DCORE_WEAVERJOB_H diff --git a/src/core/nodes/propertychangehandler_p.h b/src/core/nodes/propertychangehandler_p.h index 7cb4058c0..543fa62fe 100644 --- a/src/core/nodes/propertychangehandler_p.h +++ b/src/core/nodes/propertychangehandler_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /** * The property change handler is similar to QSignalSpy, but geared towards the usecase of Qt3D. diff --git a/src/core/nodes/qabstractnodefactory.cpp b/src/core/nodes/qabstractnodefactory.cpp index 6df2b1174..d64efca5a 100644 --- a/src/core/nodes/qabstractnodefactory.cpp +++ b/src/core/nodes/qabstractnodefactory.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QAbstractNodeFactory::~QAbstractNodeFactory() { @@ -56,6 +56,6 @@ QList<QAbstractNodeFactory *> QAbstractNodeFactory::nodeFactories() return node_factories; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/nodes/qabstractnodefactory.h b/src/core/nodes/qabstractnodefactory.h index 8d8583fc9..cc8d92254 100644 --- a/src/core/nodes/qabstractnodefactory.h +++ b/src/core/nodes/qabstractnodefactory.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QAbstractNodeFactory { @@ -65,7 +65,7 @@ public: } }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp index a897f6f04..84ed3cf33 100644 --- a/src/core/nodes/qbackendnode.cpp +++ b/src/core/nodes/qbackendnode.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QBackendNodePrivate + \class Qt3DCore::QBackendNodePrivate \internal */ QBackendNodePrivate::QBackendNodePrivate(QBackendNode::Mode mode) diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h index d37a902bb..6ca9e5a26 100644 --- a/src/core/nodes/qbackendnode.h +++ b/src/core/nodes/qbackendnode.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QBACKENDNODE_H -#define QT3D_QBACKENDNODE_H +#ifndef QT3DCORE_QBACKENDNODE_H +#define QT3DCORE_QBACKENDNODE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qscenechange.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QBackendNodeFactory; class QBackendNodePrivate; @@ -98,4 +98,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QBACKENDNODE_H +#endif // QT3DCORE_QBACKENDNODE_H diff --git a/src/core/nodes/qbackendnode_p.h b/src/core/nodes/qbackendnode_p.h index dbd9cd49a..7b1e4b597 100644 --- a/src/core/nodes/qbackendnode_p.h +++ b/src/core/nodes/qbackendnode_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QBACKENDNODE_P_H -#define QT3D_QBACKENDNODE_P_H +#ifndef QT3DCORE_QBACKENDNODE_P_H +#define QT3DCORE_QBACKENDNODE_P_H // // W A R N I N G @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QBackendNodeFactory; @@ -89,4 +89,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QBACKENDNODE_P_H +#endif // QT3DCORE_QBACKENDNODE_P_H diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index b68c845e5..1e81f9204 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -43,10 +43,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QComponentPrivate + \class Qt3DCore::QComponentPrivate \internal */ QComponentPrivate::QComponentPrivate() @@ -94,23 +94,23 @@ void QComponentPrivate::removeEntity(QEntity *entity) } /*! - \class Qt3D::QComponent + \class Qt3DCore::QComponent \inmodule Qt3DCore - \inherits Qt3D::QNode + \inherits Qt3DCore::QNode \since 5.5 - \brief The base class of scene nodes that can be aggregated by Qt3D::QEntity + \brief The base class of scene nodes that can be aggregated by Qt3DCore::QEntity instances as a component. - A Qt3D::QComponent provides a vertical slice of behavior that can be assigned to and - sometimes shared across Qt3D::QEntity instances. + A Qt3DCore::QComponent provides a vertical slice of behavior that can be assigned to and + sometimes shared across Qt3DCore::QEntity instances. - Qt3D::QComponent subclasses are often aggregated in groups that impart useful + Qt3DCore::QComponent subclasses are often aggregated in groups that impart useful behavior to the aggregating entity. For example, to have an Entity that gets drawn by the Qt3D renderer aspect, an entity would most likely aggregate - Qt3D::QTransform, Qt3DRender::QMesh, and Qt3DRender::QMaterial components. + Qt3DCore::QTransform, Qt3DRender::QMesh, and Qt3DRender::QMaterial components. - \sa Qt3D::QEntity + \sa Qt3DCore::QEntity */ /*! @@ -125,7 +125,7 @@ QComponent::QComponent(QNode *parent) QComponent::~QComponent() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QComponent subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QComponent subclass didn't call QNode::cleanup in its destructor"); Q_FOREACH (QEntity *entity, entities()) { QEntityPrivate *entityPimpl = static_cast<QEntityPrivate *>(QEntityPrivate::get(entity)); @@ -154,7 +154,7 @@ bool QComponent::isEnabled() const /*! Set the QComponent to enabled if \a enabled is true. - By default a Qt3D::QComponent is always enabled. + By default a Qt3DCore::QComponent is always enabled. \note the interpretation of what enabled means is aspect-dependent. Even if enabled is set to false, some aspects may still consider the component in @@ -204,22 +204,22 @@ QComponent::QComponent(QComponentPrivate &dd, QNode *parent) { } -} // namespace Qt3D +} // namespace Qt3DCore /*! \qmltype Component3D - \instantiates Qt3D::QComponent + \instantiates Qt3DCore::QComponent \inqmlmodule Qt3D \inherits Node \since 5.5 */ /*! - \qmlproperty bool Qt3D::Component3D::shareable + \qmlproperty bool Qt3DCore::Component3D::shareable */ /*! - \qmlproperty bool Qt3D::Component3D::enabled + \qmlproperty bool Qt3DCore::Component3D::enabled */ QT_END_NAMESPACE diff --git a/src/core/nodes/qcomponent.h b/src/core/nodes/qcomponent.h index 70e74c3c0..2eee89bb4 100644 --- a/src/core/nodes/qcomponent.h +++ b/src/core/nodes/qcomponent.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_COMPONENT_H -#define QT3D_COMPONENT_H +#ifndef QT3DCORE_COMPONENT_H +#define QT3DCORE_COMPONENT_H #include <Qt3DCore/qnode.h> #include <Qt3DCore/qt3dcore_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QComponentPrivate; @@ -76,8 +76,8 @@ private: Q_DECLARE_PRIVATE(QComponent) }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_COMPONENT_H +#endif // QT3DCORE_COMPONENT_H diff --git a/src/core/nodes/qcomponent_p.h b/src/core/nodes/qcomponent_p.h index 1761b0875..56c807a61 100644 --- a/src/core/nodes/qcomponent_p.h +++ b/src/core/nodes/qcomponent_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCOMPONENT_P_H -#define QT3D_QCOMPONENT_P_H +#ifndef QT3DCORE_QCOMPONENT_P_H +#define QT3DCORE_QCOMPONENT_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QComponentPrivate : public QNodePrivate { @@ -73,4 +73,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QCOMPONENT_P_H +#endif // QT3DCORE_QCOMPONENT_P_H diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp index 9c21f8dff..7e0a66c82 100644 --- a/src/core/nodes/qentity.cpp +++ b/src/core/nodes/qentity.cpp @@ -49,10 +49,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QEntityPrivate + \class Qt3DCore::QEntityPrivate \internal */ QEntityPrivate::QEntityPrivate() @@ -62,26 +62,26 @@ QEntityPrivate::QEntityPrivate() {} /*! - \class Qt3D::QEntity + \class Qt3DCore::QEntity \inmodule Qt3DCore - \inherits Qt3D::QNode + \inherits Qt3DCore::QNode \since 5.5 - \brief Qt3D::QEntity is a Qt3D::QNode subclass that can aggregate several - Qt3D::QComponent instances that will specify its behavior. + \brief Qt3DCore::QEntity is a Qt3DCore::QNode subclass that can aggregate several + Qt3DCore::QComponent instances that will specify its behavior. - By itself a Qt3D::QEntity is an empty shell. The behavior of a Qt3D::QEntity - object is defined by the Qt3D::QComponent objects it references. Each Qt3D + By itself a Qt3DCore::QEntity is an empty shell. The behavior of a Qt3DCore::QEntity + object is defined by the Qt3DCore::QComponent objects it references. Each Qt3D backend aspect will be able to interpret and process an Entity by recognizing which components it is made up of. One aspect may decide to only - process entities composed of a single Qt3D::QTransform component whilst - another may focus on Qt3D::QMouseInput. + process entities composed of a single Qt3DCore::QTransform component whilst + another may focus on Qt3DCore::QMouseInput. - \sa Qt3D::QComponent, Qt3D::QTransform + \sa Qt3DCore::QComponent, Qt3DCore::QTransform */ /*! - Constructs a new Qt3D::QEntity instance with \a parent as parent. + Constructs a new Qt3DCore::QEntity instance with \a parent as parent. */ QEntity::QEntity(QNode *parent) : QNode(*new QEntityPrivate, parent) @@ -106,7 +106,7 @@ QEntity::QEntity(QEntityPrivate &dd, QNode *parent) } /*! - Copies all the properties and components of the Qt3D::QEntity \a ref to the + Copies all the properties and components of the Qt3DCore::QEntity \a ref to the current instance. */ void QEntity::copy(const QNode *ref) @@ -124,7 +124,7 @@ void QEntity::copy(const QNode *ref) } /*! - Returns the list of Qt3D::QComponent instances the entity is referencing. + Returns the list of Qt3DCore::QComponent instances the entity is referencing. */ QList<QComponent *> QEntity::components() const { @@ -135,7 +135,7 @@ QList<QComponent *> QEntity::components() const /*! Adds a new reference to the component \a comp. - \note If the Qt3D::QComponent has no parent, the Qt3D::QEntity will set + \note If the Qt3DCore::QComponent has no parent, the Qt3DCore::QEntity will set itself as its parent thereby taking ownership of the component. */ void QEntity::addComponent(QComponent *comp) @@ -201,10 +201,10 @@ void QEntity::removeAllComponents() } /*! - Returns the parent Qt3D::QEntity instance of this entity. If the - immediate parent isn't a Qt3D::QEntity, this function traverses up the - scene hierarchy until a parent Qt3D::QEntity is found. If no - Qt3D::QEntity parent can be found, returns null. + Returns the parent Qt3DCore::QEntity instance of this entity. If the + immediate parent isn't a Qt3DCore::QEntity, this function traverses up the + scene hierarchy until a parent Qt3DCore::QEntity is found. If no + Qt3DCore::QEntity parent can be found, returns null. */ QEntity *QEntity::parentEntity() const { @@ -227,9 +227,9 @@ QEntity *QEntity::parentEntity() const } /*! - Returns the Qt3D::QNodeId id of the parent Qt3D::QEntity instance of the - current Qt3D::QEntity object. The QNodeId isNull method will return true if - there is no Qt3D::QEntity parent of the current Qt3D::QEntity in the scene + Returns the Qt3DCore::QNodeId id of the parent Qt3DCore::QEntity instance of the + current Qt3DCore::QEntity object. The QNodeId isNull method will return true if + there is no Qt3DCore::QEntity parent of the current Qt3DCore::QEntity in the scene hierarchy. */ QNodeId QEntity::parentEntityId() const @@ -240,6 +240,6 @@ QNodeId QEntity::parentEntityId() const return d->m_parentEntityId; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h index 786fde05f..2b87f0c39 100644 --- a/src/core/nodes/qentity.h +++ b/src/core/nodes/qentity.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QENTITY_H -#define QT3D_QENTITY_H +#ifndef QT3DCORE_QENTITY_H +#define QT3DCORE_QENTITY_H #include <Qt3DCore/qnode.h> #include <Qt3DCore/qt3dcore_global.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QComponent; class QEntityPrivate; @@ -77,8 +77,8 @@ private: QT3D_CLONEABLE(QEntity) }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QENTITY_H +#endif // QT3DCORE_QENTITY_H diff --git a/src/core/nodes/qentity_p.h b/src/core/nodes/qentity_p.h index 5c683bdfc..03812dfae 100644 --- a/src/core/nodes/qentity_p.h +++ b/src/core/nodes/qentity_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QENTITY_P_H -#define QT3D_QENTITY_P_H +#ifndef QT3DCORE_QENTITY_P_H +#define QT3DCORE_QENTITY_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QEntityPrivate : public QNodePrivate { @@ -76,4 +76,4 @@ public : QT_END_NAMESPACE -#endif // QT3D_QENTITY_P_H +#endif // QT3DCORE_QENTITY_P_H diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index 3338b6cae..9ba2fe3c0 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QHash<QNodeId, QNode *> QNodePrivate::m_clonesLookupTable = QHash<QNodeId, QNode *>(); /*! - \class Qt3D::QNodePrivate + \class Qt3DCore::QNodePrivate \internal */ QNodePrivate::QNodePrivate() @@ -274,7 +274,7 @@ void QNodePrivate::setArbiter(QLockableObserverInterface *arbiter) /*! Called when one or more backend aspects sends a notification \a change to the - current Qt3D::QNode instance. + current Qt3DCore::QNode instance. \note This method should be reimplemented in your subclasses to properly handle the \a change. @@ -384,46 +384,46 @@ void QNodePrivate::nodePtrDeleter(QNode *q) /*! - \class Qt3D::QNode + \class Qt3DCore::QNode \inherits QObject \inmodule Qt3DCore \since 5.5 - \brief Qt3D::QNode is the base class of all Qt3D node classes used to build a + \brief Qt3DCore::QNode is the base class of all Qt3D node classes used to build a Qt3D scene. - The owernship of Qt3D::QNode is determined by the QObject parent/child - relationship between nodes. By itself a Qt3D::QNode has no visual appearance + The owernship of Qt3DCore::QNode is determined by the QObject parent/child + relationship between nodes. By itself a Qt3DCore::QNode has no visual appearance and no particular meaning, it is there as a way of building a node based tree structure. - The parent of a Qt3D::QNode instance can only be another Qt3D::QNode + The parent of a Qt3DCore::QNode instance can only be another Qt3DCore::QNode instance. - Each Qt3D::QNode instance has a unique id that allows it to be recognizable + Each Qt3DCore::QNode instance has a unique id that allows it to be recognizable from other instances. - When properties are defined on a Qt3D::QNode subclass, their NOTIFY signal + When properties are defined on a Qt3DCore::QNode subclass, their NOTIFY signal will automatically generate notifications that the Qt3D backend aspects will receive. - When subclassing Qt3D::QNode make sure to call QNode::cleanup() from your + When subclassing Qt3DCore::QNode make sure to call QNode::cleanup() from your subclass's destructor to ensure proper notification to backend aspects. - Faiure to do so will result in crashes when one of your Qt3D::QNode + Faiure to do so will result in crashes when one of your Qt3DCore::QNode subclass instance is eventually destroyed. - \sa Qt3D::QEntity, Qt3D::QComponent + \sa Qt3DCore::QEntity, Qt3DCore::QComponent */ /*! - Creates a new Qt3D::QNode instance with parent \a parent. + Creates a new Qt3DCore::QNode instance with parent \a parent. - \note The backend aspects will be notified that a Qt3D::QNode instance is + \note The backend aspects will be notified that a Qt3DCore::QNode instance is part of the scene only if it has a parent; unless this is the root node of the Qt3D scene. - \sa setParent(Qt3D::QNode *) + \sa setParent(Qt3DCore::QNode *) */ QNode::QNode(QNode *parent) : QObject(*new QNodePrivate, parent) @@ -451,11 +451,11 @@ QNode::QNode(QNodePrivate &dd, QNode *parent) } /*! - Copies all the attributes from \a ref to the current Qt3D::QNode instance. + Copies all the attributes from \a ref to the current Qt3DCore::QNode instance. - \note When subclassing Qt3D::QNode you should reimplement this method and + \note When subclassing Qt3DCore::QNode you should reimplement this method and always call the copy method on the base class. This will ensure that when cloned, - the Qt3D::QNode is properly initialized. + the Qt3DCore::QNode is properly initialized. */ void QNode::copy(const QNode *ref) { @@ -467,11 +467,11 @@ void QNode::copy(const QNode *ref) QNode::~QNode() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QNode subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QNode subclass didn't call QNode::cleanup in its destructor"); } /*! - Returns the id that uniquely identifies the Qt3D::QNode instance. + Returns the id that uniquely identifies the Qt3DCore::QNode instance. */ const QNodeId QNode::id() const { @@ -480,7 +480,7 @@ const QNodeId QNode::id() const } /*! - Returns the immediate Qt3D::QNode parent, null if the node has no parent. + Returns the immediate Qt3DCore::QNode parent, null if the node has no parent. */ QNode *QNode::parentNode() const { @@ -519,12 +519,12 @@ bool QNode::blockNotifications(bool block) } /*! - * Sets the parent node of the current Qt3D::QNode instance to \a parent. - * Setting the parent will notify the backend aspects about current Qt3D::QNode + * Sets the parent node of the current Qt3DCore::QNode instance to \a parent. + * Setting the parent will notify the backend aspects about current Qt3DCore::QNode * instance's parent change. * * \note if \a parent happens to be null, this will actually notify that the - * current Qt3D::QNode instance was removed from the scene. + * current Qt3DCore::QNode instance was removed from the scene. */ void QNode::setParent(QNode *parent) { @@ -537,8 +537,8 @@ void QNode::setParent(QNode *parent) } /*! - * Returns a list filled with the Qt3D::QNode children of the current - * Qt3D::QNode instance. + * Returns a list filled with the Qt3DCore::QNode children of the current + * Qt3DCore::QNode instance. */ QNodeList QNode::childrenNodes() const { @@ -596,10 +596,10 @@ QNode *QNode::clone(QNode *node) /*! * This methods can only be called once and takes care of notyfing the backend - * aspects that the current Qt3D::QNode instance is about to be destroyed. + * aspects that the current Qt3DCore::QNode instance is about to be destroyed. * * \note It must be called by the destructor of every class subclassing - * Qt3D::QNode that is clonable (using the QT3D_CLONEABLE macro). + * Qt3DCore::QNode that is clonable (using the QT3D_CLONEABLE macro). */ void QNode::cleanup() { @@ -614,7 +614,7 @@ void QNode::cleanup() } } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index f65a89515..1c0266ec2 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QNODE_H -#define QT3D_QNODE_H +#ifndef QT3DCORE_QNODE_H +#define QT3DCORE_QNODE_H #include <QObject> #include <Qt3DCore/qt3dcore_global.h> @@ -43,11 +43,11 @@ #include <Qt3DCore/qscenechange.h> #include <Qt3DCore/qabstractnodefactory.h> -#define Q_NODE_NULLPTR static_cast<Qt3D::QNode *>(Q_NULLPTR) +#define Q_NODE_NULLPTR static_cast<Qt3DCore::QNode *>(Q_NULLPTR) QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QNode; class QNodePrivate; @@ -57,11 +57,11 @@ class QAspectEngine; typedef QList<QNode *> QNodeList; typedef QSharedPointer<QNode> QNodePtr; -#define QT3D_QUOTE(str) #str +#define QT3DCORE_QUOTE(str) #str #define QT3D_CLONEABLE(Class) \ - friend class Qt3D::QAbstractNodeFactory; \ + friend class Qt3DCore::QAbstractNodeFactory; \ QNode *doClone() const Q_DECL_OVERRIDE { \ - Class *clone_ = Qt3D::QAbstractNodeFactory::createNode<Class>(QT3D_QUOTE(Class)); \ + Class *clone_ = Qt3DCore::QAbstractNodeFactory::createNode<Class>(QT3DCORE_QUOTE(Class)); \ clone_->copy(this); \ return clone_; \ } @@ -73,7 +73,7 @@ typedef QSharedPointer<QNode> QNodePtr; class QT3DCORESHARED_EXPORT QNode : public QObject { Q_OBJECT - Q_PROPERTY(Qt3D::QNode *parent READ parentNode WRITE setParent NOTIFY parentChanged) + Q_PROPERTY(Qt3DCore::QNode *parent READ parentNode WRITE setParent NOTIFY parentChanged) public: explicit QNode(QNode *parent = 0); virtual ~QNode(); @@ -116,7 +116,7 @@ Q_SIGNALS: void parentChanged(); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h index 556006d41..b51dff472 100644 --- a/src/core/nodes/qnode_p.h +++ b/src/core/nodes/qnode_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QNODE_P_H -#define QT3D_QNODE_P_H +#ifndef QT3DCORE_QNODE_P_H +#define QT3DCORE_QNODE_P_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QNode; class QAspectEngine; @@ -108,8 +108,8 @@ private: static QHash<QNodeId, QNode *> m_clonesLookupTable; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_NODE_P_H +#endif // QT3DCORE_NODE_P_H diff --git a/src/core/nodes/qnodeid.cpp b/src/core/nodes/qnodeid.cpp index a057d978f..ac8055e9d 100644 --- a/src/core/nodes/qnodeid.cpp +++ b/src/core/nodes/qnodeid.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QNodeId QNodeId::createId() { diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h index ec1e6ce07..76fdd2745 100644 --- a/src/core/nodes/qnodeid.h +++ b/src/core/nodes/qnodeid.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QNODEID_H -#define QT3D_QNODEID_H +#ifndef QT3DCORE_QNODEID_H +#define QT3DCORE_QNODEID_H #include <Qt3DCore/qt3dcore_global.h> #include <QDebug> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QNodeId { @@ -100,11 +100,11 @@ inline uint qHash(const QNodeId &id, uint seed = 0) Q_DECL_NOTHROW } // Qt3D -Q_DECLARE_TYPEINFO(Qt3D::QNodeId, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(Qt3DCore::QNodeId, Q_MOVABLE_TYPE); QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QNodeId) +Q_DECLARE_METATYPE(Qt3DCore::QNodeId) -#endif // QT3D_QNODEID_H +#endif // QT3DCORE_QNODEID_H diff --git a/src/core/nodes/qnodevisitor.cpp b/src/core/nodes/qnodevisitor.cpp index ec10cbb73..d07809101 100644 --- a/src/core/nodes/qnodevisitor.cpp +++ b/src/core/nodes/qnodevisitor.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QNodeVisitor::QNodeVisitor() { @@ -63,6 +63,6 @@ QNodeList QNodeVisitor::path() const return m_path; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/nodes/qnodevisitor.h b/src/core/nodes/qnodevisitor.h index 3a8bc4c17..3664e99f9 100644 --- a/src/core/nodes/qnodevisitor.h +++ b/src/core/nodes/qnodevisitor.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QNODEVISITOR_H -#define QT3D_QNODEVISITOR_H +#ifndef QT3DCORE_QNODEVISITOR_H +#define QT3DCORE_QNODEVISITOR_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qnode.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QNodeVisitor @@ -248,8 +248,8 @@ private: } }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QNODEVISITOR_H +#endif // QT3DCORE_QNODEVISITOR_H diff --git a/src/core/qabstractfunctor.cpp b/src/core/qabstractfunctor.cpp index 30bb573ee..f3f157b50 100644 --- a/src/core/qabstractfunctor.cpp +++ b/src/core/qabstractfunctor.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QAbstractFunctor::~QAbstractFunctor() { diff --git a/src/core/qabstractfunctor.h b/src/core/qabstractfunctor.h index 47edc62f1..fa89e392d 100644 --- a/src/core/qabstractfunctor.h +++ b/src/core/qabstractfunctor.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTFUNCTOR_H -#define QT3D_QABSTRACTFUNCTOR_H +#ifndef QT3DCORE_QABSTRACTFUNCTOR_H +#define QT3DCORE_QABSTRACTFUNCTOR_H #include <Qt3DCore/qt3dcore_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { // This will generate a unique id() function per type // <=> 1 unique function address per type @@ -66,7 +66,7 @@ qintptr functorTypeId() #define QT3D_FUNCTOR(Class) \ qintptr id() const Q_DECL_OVERRIDE { \ - return Qt3D::functorTypeId<Class>(); \ + return Qt3DCore::functorTypeId<Class>(); \ } @@ -89,4 +89,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTFUNCTOR_H +#endif // QT3DCORE_QABSTRACTFUNCTOR_H diff --git a/src/core/qbackendnodefactory.cpp b/src/core/qbackendnodefactory.cpp index a5d5bce71..31d2f19ac 100644 --- a/src/core/qbackendnodefactory.cpp +++ b/src/core/qbackendnodefactory.cpp @@ -38,12 +38,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QBackendNodeFactory::~QBackendNodeFactory() { } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qbackendnodefactory.h b/src/core/qbackendnodefactory.h index 5fc1d18bb..ac935328c 100644 --- a/src/core/qbackendnodefactory.h +++ b/src/core/qbackendnodefactory.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QBACKENDNODEFACTORY_H -#define QT3D_QBACKENDNODEFACTORY_H +#ifndef QT3DCORE_QBACKENDNODEFACTORY_H +#define QT3DCORE_QBACKENDNODEFACTORY_H #include <Qt3DCore/qt3dcore_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QBackendNode; class QNode; @@ -53,8 +53,8 @@ public: virtual QBackendNode *createBackendNode(QNode *frontend) const = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QBACKENDNODEFACTORY_H +#endif // QT3DCORE_QBACKENDNODEFACTORY_H diff --git a/src/core/qbackendscenepropertychange.cpp b/src/core/qbackendscenepropertychange.cpp index cc4142dd1..a68edda39 100644 --- a/src/core/qbackendscenepropertychange.cpp +++ b/src/core/qbackendscenepropertychange.cpp @@ -41,15 +41,15 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QBackendScenePropertyChange + \class Qt3DCore::QBackendScenePropertyChange \inmodule Qt3DCore */ /*! - \class Qt3D::QBackendScenePropertyChangePrivate + \class Qt3DCore::QBackendScenePropertyChangePrivate \internal */ QBackendScenePropertyChangePrivate::QBackendScenePropertyChangePrivate() diff --git a/src/core/qbackendscenepropertychange.h b/src/core/qbackendscenepropertychange.h index 382418500..8c06d19af 100644 --- a/src/core/qbackendscenepropertychange.h +++ b/src/core/qbackendscenepropertychange.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QBACKENDSCENEPROPERTYCHANGE_H -#define QT3D_QBACKENDSCENEPROPERTYCHANGE_H +#ifndef QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H +#define QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QBackendScenePropertyChangePrivate; class QBackendNode; @@ -70,4 +70,4 @@ typedef QSharedPointer<QBackendScenePropertyChange> QBackendScenePropertyChangeP QT_END_NAMESPACE -#endif // QT3D_QBACKENDSCENEPROPERTYCHANGE_H +#endif // QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H diff --git a/src/core/qbackendscenepropertychange_p.h b/src/core/qbackendscenepropertychange_p.h index 40174f316..99080b8b2 100644 --- a/src/core/qbackendscenepropertychange_p.h +++ b/src/core/qbackendscenepropertychange_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QBACKENDSCENEPROPERTYCHANGE_P_H -#define QT3D_QBACKENDSCENEPROPERTYCHANGE_P_H +#ifndef QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H +#define QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QBackendScenePropertyChange; @@ -72,4 +72,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QBACKENDSCENEPROPERTYCHANGE_P_H +#endif // QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H diff --git a/src/core/qboundingsphere.cpp b/src/core/qboundingsphere.cpp index 80af217c2..c6f9980e3 100644 --- a/src/core/qboundingsphere.cpp +++ b/src/core/qboundingsphere.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QBoundingSphere::QBoundingSphere() { @@ -48,6 +48,6 @@ QBoundingSphere::~QBoundingSphere() { } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qboundingsphere.h b/src/core/qboundingsphere.h index 05f4b530c..4fd3a5f0a 100644 --- a/src/core/qboundingsphere.h +++ b/src/core/qboundingsphere.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QBOUDINGSPHERE_H -#define QT3D_QBOUDINGSPHERE_H +#ifndef QT3DCORE_QBOUDINGSPHERE_H +#define QT3DCORE_QBOUDINGSPHERE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qboundingvolume.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QBoundingSphere : public QBoundingVolume { @@ -54,8 +54,8 @@ public: virtual float radius() const = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QBOUDINGSPHERE_H +#endif // QT3DCORE_QBOUDINGSPHERE_H diff --git a/src/core/qboundingvolume.cpp b/src/core/qboundingvolume.cpp index caba96c79..e0ae704e4 100644 --- a/src/core/qboundingvolume.cpp +++ b/src/core/qboundingvolume.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QBoundingVolume::QBoundingVolume() { @@ -48,6 +48,6 @@ QBoundingVolume::~QBoundingVolume() { } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qboundingvolume.h b/src/core/qboundingvolume.h index f983b3ac9..21006cfc1 100644 --- a/src/core/qboundingvolume.h +++ b/src/core/qboundingvolume.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QBOUDINGVOLUME_P_H -#define QT3D_QBOUDINGVOLUME_P_H +#ifndef QT3DCORE_QBOUDINGVOLUME_P_H +#define QT3DCORE_QBOUDINGVOLUME_P_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QRay3D; @@ -62,10 +62,10 @@ public: virtual Type type() const = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QBoundingVolume*) +Q_DECLARE_METATYPE(Qt3DCore::QBoundingVolume*) -#endif // QT3D_QBOUDINGVOLUME_P_H +#endif // QT3DCORE_QBOUDINGVOLUME_P_H diff --git a/src/core/qboundingvolumeprovider.cpp b/src/core/qboundingvolumeprovider.cpp index 69091cacc..4d3e0647d 100644 --- a/src/core/qboundingvolumeprovider.cpp +++ b/src/core/qboundingvolumeprovider.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QBoundingVolumeProvider::~QBoundingVolumeProvider() { diff --git a/src/core/qboundingvolumeprovider.h b/src/core/qboundingvolumeprovider.h index 3d8496d27..f61f02b23 100644 --- a/src/core/qboundingvolumeprovider.h +++ b/src/core/qboundingvolumeprovider.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QBOUNDINGVOLUMEPROVIDER_H -#define QT3D_QBOUNDINGVOLUMEPROVIDER_H +#ifndef QT3DCORE_QBOUNDINGVOLUMEPROVIDER_H +#define QT3DCORE_QBOUNDINGVOLUMEPROVIDER_H #include <Qt3DCore/qt3dcore_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QBoundingVolume; @@ -52,8 +52,8 @@ public: virtual QVector<QBoundingVolume *> boundingVolumes() const = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QBOUNDINGVOLUMEPROVIDER_H +#endif // QT3DCORE_QBOUNDINGVOLUMEPROVIDER_H diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index 465e6f2b4..09bda2b6d 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -49,10 +49,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QChangeArbiter + \class Qt3DCore::QChangeArbiter \inmodule Qt3DCore \since 5.5 @@ -331,6 +331,6 @@ void QChangeArbiter::destroyThreadLocalChangeQueue(void *changeArbiter) } } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index 62ec64c27..1fc914b11 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCHANGEARBITER_P_H -#define QT3D_QCHANGEARBITER_P_H +#ifndef QT3DCORE_QCHANGEARBITER_P_H +#define QT3DCORE_QCHANGEARBITER_P_H // // W A R N I N G @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QNode; class QObservableInterface; @@ -88,7 +88,7 @@ public: explicit QChangeArbiter(QObject *parent = 0); ~QChangeArbiter(); - void initialize(Qt3D::QAbstractAspectJobManager *jobManager); + void initialize(Qt3DCore::QAbstractAspectJobManager *jobManager); void syncChanges(); @@ -105,8 +105,8 @@ public: void sceneChangeEventWithLock(const QSceneChangePtr &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl void sceneChangeEventWithLock(const QSceneChangeList &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl - Q_INVOKABLE void setPostman(Qt3D::QAbstractPostman *postman); - Q_INVOKABLE void setScene(Qt3D::QScene *scene); + Q_INVOKABLE void setPostman(Qt3DCore::QAbstractPostman *postman); + Q_INVOKABLE void setScene(Qt3DCore::QScene *scene); QAbstractPostman *postman() const Q_DECL_FINAL; QScene *scene() const; @@ -156,8 +156,8 @@ private: QScene *m_scene; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QCHANGEARBITER_P_H +#endif // QT3DCORE_QCHANGEARBITER_P_H diff --git a/src/core/qlockableobserverinterface.cpp b/src/core/qlockableobserverinterface.cpp index 32df72039..63390153d 100644 --- a/src/core/qlockableobserverinterface.cpp +++ b/src/core/qlockableobserverinterface.cpp @@ -38,12 +38,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QLockableObserverInterface::~QLockableObserverInterface() { } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qlockableobserverinterface_p.h b/src/core/qlockableobserverinterface_p.h index c46860924..fcf260b30 100644 --- a/src/core/qlockableobserverinterface_p.h +++ b/src/core/qlockableobserverinterface_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QLOCKABLEOBSERVERINTERFACE_P_H -#define QT3D_QLOCKABLEOBSERVERINTERFACE_P_H +#ifndef QT3DCORE_QLOCKABLEOBSERVERINTERFACE_P_H +#define QT3DCORE_QLOCKABLEOBSERVERINTERFACE_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { typedef std::vector<QSceneChangePtr> QSceneChangeList; @@ -64,10 +64,10 @@ public: virtual void sceneChangeEventWithLock(const QSceneChangeList &e) = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QLockableObserverInterface *) +Q_DECLARE_METATYPE(Qt3DCore::QLockableObserverInterface *) -#endif // QT3D_QLOCKABLEOBSERVERINTERFACE_P_H +#endif // QT3DCORE_QLOCKABLEOBSERVERINTERFACE_P_H diff --git a/src/core/qobservableinterface.cpp b/src/core/qobservableinterface.cpp index ba8660212..c296ac4c7 100644 --- a/src/core/qobservableinterface.cpp +++ b/src/core/qobservableinterface.cpp @@ -38,12 +38,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QObservableInterface::~QObservableInterface() { } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qobservableinterface_p.h b/src/core/qobservableinterface_p.h index 0fcec1639..f4aca757a 100644 --- a/src/core/qobservableinterface_p.h +++ b/src/core/qobservableinterface_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QOBSERVABLEINTERFACE_P_H -#define QT3D_QOBSERVABLEINTERFACE_P_H +#ifndef QT3DCORE_QOBSERVABLEINTERFACE_P_H +#define QT3DCORE_QOBSERVABLEINTERFACE_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QLockableObserverInterface; @@ -67,8 +67,8 @@ protected: virtual void notifyObservers(const QSceneChangePtr &e) = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QOBSERVABLEINTERFACE_P_H +#endif // QT3DCORE_QOBSERVABLEINTERFACE_P_H diff --git a/src/core/qobserverinterface.cpp b/src/core/qobserverinterface.cpp index 266f573e1..731d96267 100644 --- a/src/core/qobserverinterface.cpp +++ b/src/core/qobserverinterface.cpp @@ -38,12 +38,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QObserverInterface::~QObserverInterface() { } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qobserverinterface_p.h b/src/core/qobserverinterface_p.h index 907794d51..f3107cb1c 100644 --- a/src/core/qobserverinterface_p.h +++ b/src/core/qobserverinterface_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QOBSERVERINTERFACE_P_H -#define QT3D_QOBSERVERINTERFACE_P_H +#ifndef QT3DCORE_QOBSERVERINTERFACE_P_H +#define QT3DCORE_QOBSERVERINTERFACE_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QObserverInterface { @@ -61,10 +61,10 @@ public: virtual void sceneChangeEvent(const QSceneChangePtr &e) = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QObserverInterface *) +Q_DECLARE_METATYPE(Qt3DCore::QObserverInterface *) -#endif // QT3D_QOBSERVERINTERFACE_P_H +#endif // QT3DCORE_QOBSERVERINTERFACE_P_H diff --git a/src/core/qpostman.cpp b/src/core/qpostman.cpp index b7e7904d7..9584ff753 100644 --- a/src/core/qpostman.cpp +++ b/src/core/qpostman.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QPostmanPrivate : public QObjectPrivate { diff --git a/src/core/qpostman_p.h b/src/core/qpostman_p.h index 469f37117..c98ce6700 100644 --- a/src/core/qpostman_p.h +++ b/src/core/qpostman_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QPOSTMAN_P_H -#define QT3D_QPOSTMAN_P_H +#ifndef QT3DCORE_QPOSTMAN_P_H +#define QT3DCORE_QPOSTMAN_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QScene; class QPostmanPrivate; @@ -90,6 +90,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QAbstractPostman*) +Q_DECLARE_METATYPE(Qt3DCore::QAbstractPostman*) -#endif // QT3D_QPOSTMAN_P_H +#endif // QT3DCORE_QPOSTMAN_P_H diff --git a/src/core/qray3d.cpp b/src/core/qray3d.cpp index 109fbc41b..f73bbada7 100644 --- a/src/core/qray3d.cpp +++ b/src/core/qray3d.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! \class QRay3D @@ -354,6 +354,6 @@ QDataStream &operator>>(QDataStream &stream, QRay3D &ray) #endif // QT_NO_DATASTREAM -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qray3d.h b/src/core/qray3d.h index f60b18666..ef79fb8ca 100644 --- a/src/core/qray3d.h +++ b/src/core/qray3d.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRAY3D_H -#define QT3D_QRAY3D_H +#ifndef QT3DCORE_QRAY3D_H +#define QT3DCORE_QRAY3D_H #include <Qt3DCore/qt3dcore_global.h> #include <QtGui/qvector3d.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QRay3D { @@ -81,24 +81,24 @@ private: }; #ifndef QT_NO_DEBUG_STREAM -QT3DCORESHARED_EXPORT QDebug operator<<(QDebug dbg, const Qt3D::QRay3D &ray); +QT3DCORESHARED_EXPORT QDebug operator<<(QDebug dbg, const Qt3DCore::QRay3D &ray); #endif #ifndef QT_NO_DATASTREAM -QT3DCORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const Qt3D::QRay3D &ray); -QT3DCORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, Qt3D::QRay3D &ray); +QT3DCORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const Qt3DCore::QRay3D &ray); +QT3DCORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, Qt3DCore::QRay3D &ray); #endif -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -inline bool qFuzzyCompare(const Qt3D::QRay3D &ray1, const Qt3D::QRay3D &ray2) +inline bool qFuzzyCompare(const Qt3DCore::QRay3D &ray1, const Qt3DCore::QRay3D &ray2) { return qFuzzyCompare(ray1.origin(), ray2.origin()) && qFuzzyCompare(ray1.direction(), ray2.direction()); } -Q_DECLARE_METATYPE(Qt3D::QRay3D) +Q_DECLARE_METATYPE(Qt3DCore::QRay3D) -#endif // QT3D_QRAY3D_H +#endif // QT3DCORE_QRAY3D_H diff --git a/src/core/qscene.cpp b/src/core/qscene.cpp index cfc4a65de..920d46d66 100644 --- a/src/core/qscene.cpp +++ b/src/core/qscene.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QScenePrivate { diff --git a/src/core/qscene_p.h b/src/core/qscene_p.h index a76f0eed4..e89a6f171 100644 --- a/src/core/qscene_p.h +++ b/src/core/qscene_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCENE_P_H -#define QT3D_QSCENE_P_H +#ifndef QT3DCORE_QSCENE_P_H +#define QT3DCORE_QSCENE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QNode; class QScenePrivate; @@ -80,8 +80,8 @@ public: QVector<QNode *> lookupNodes(const QVector<QNodeId> &ids) const; QNodeId nodeIdFromObservable(QObservableInterface *observable) const; - void setArbiter(Qt3D::QLockableObserverInterface *arbiter); - Qt3D::QLockableObserverInterface *arbiter() const; + void setArbiter(Qt3DCore::QLockableObserverInterface *arbiter); + Qt3DCore::QLockableObserverInterface *arbiter() const; // Component -> Entities QList<QNodeId> entitiesForComponent(const QNodeId &id) const; @@ -98,6 +98,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QScene*) +Q_DECLARE_METATYPE(Qt3DCore::QScene*) -#endif // QT3D_QSCENE_P_H +#endif // QT3DCORE_QSCENE_P_H diff --git a/src/core/qscenechange.cpp b/src/core/qscenechange.cpp index 9c278d8b5..4438eb353 100644 --- a/src/core/qscenechange.cpp +++ b/src/core/qscenechange.cpp @@ -40,10 +40,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \enum Qt3D::ChangeFlag + \enum Qt3DCore::ChangeFlag The types of change that can be sent and received by Qt3D's change notification system. @@ -59,7 +59,7 @@ namespace Qt3D { */ /*! - \class Qt3D::QSceneChangePrivate + \class Qt3DCore::QSceneChangePrivate \internal */ QSceneChangePrivate::QSceneChangePrivate() diff --git a/src/core/qscenechange.h b/src/core/qscenechange.h index 3c22638d3..9efa4e010 100644 --- a/src/core/qscenechange.h +++ b/src/core/qscenechange.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCENECHANGE_H -#define QT3D_QSCENECHANGE_H +#ifndef QT3DCORE_QSCENECHANGE_H +#define QT3DCORE_QSCENECHANGE_H #include <Qt3DCore/qt3dcore_global.h> #include <QSharedPointer> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { enum ChangeFlag { NodeCreated = 1 << 0, @@ -99,8 +99,8 @@ protected: typedef QSharedPointer<QSceneChange> QSceneChangePtr; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QSCENECHANGE_H +#endif // QT3DCORE_QSCENECHANGE_H diff --git a/src/core/qscenechange_p.h b/src/core/qscenechange_p.h index 05eca9bcb..b739fb770 100644 --- a/src/core/qscenechange_p.h +++ b/src/core/qscenechange_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCENECHANGE_P_H -#define QT3D_QSCENECHANGE_P_H +#ifndef QT3DCORE_QSCENECHANGE_P_H +#define QT3DCORE_QSCENECHANGE_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QSceneChange; class QNodeId; @@ -78,4 +78,4 @@ public : QT_END_NAMESPACE -#endif // QT3D_QSCENECHANGE_P_H +#endif // QT3DCORE_QSCENECHANGE_P_H diff --git a/src/core/qsceneobserverinterface.cpp b/src/core/qsceneobserverinterface.cpp index e116b39f4..e4333115d 100644 --- a/src/core/qsceneobserverinterface.cpp +++ b/src/core/qsceneobserverinterface.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QSceneObserverInterface::~QSceneObserverInterface() { diff --git a/src/core/qsceneobserverinterface.h b/src/core/qsceneobserverinterface.h index 5fccc385f..3929910cf 100644 --- a/src/core/qsceneobserverinterface.h +++ b/src/core/qsceneobserverinterface.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCENEOBSERVERINTERFACE_H -#define QT3D_QSCENEOBSERVERINTERFACE_H +#ifndef QT3DCORE_QSCENEOBSERVERINTERFACE_H +#define QT3DCORE_QSCENEOBSERVERINTERFACE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qscenechange.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QSceneObserverInterface { @@ -56,6 +56,6 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QSceneObserverInterface *) +Q_DECLARE_METATYPE(Qt3DCore::QSceneObserverInterface *) -#endif // QT3D_QSCENEOBSERVERINTERFACE_H +#endif // QT3DCORE_QSCENEOBSERVERINTERFACE_H diff --git a/src/core/qscenepropertychange.cpp b/src/core/qscenepropertychange.cpp index 7ae5b6eef..08e9f73e5 100644 --- a/src/core/qscenepropertychange.cpp +++ b/src/core/qscenepropertychange.cpp @@ -40,10 +40,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QScenePropertyChange + \class Qt3DCore::QScenePropertyChange \inmodule Qt3dCore */ @@ -51,7 +51,7 @@ QFrameAllocator *QScenePropertyChangePrivate::m_allocator = new QFrameAllocator( QMutex QScenePropertyChangePrivate::m_mutex; /*! - \class Qt3D::QScenePropertyChangePrivate + \class Qt3DCore::QScenePropertyChangePrivate \internal */ QScenePropertyChangePrivate::QScenePropertyChangePrivate() diff --git a/src/core/qscenepropertychange.h b/src/core/qscenepropertychange.h index dcedf20a5..992e1e6ae 100644 --- a/src/core/qscenepropertychange.h +++ b/src/core/qscenepropertychange.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCENEPROPERTYCHANGE_H -#define QT3D_QSCENEPROPERTYCHANGE_H +#ifndef QT3DCORE_QSCENEPROPERTYCHANGE_H +#define QT3DCORE_QSCENEPROPERTYCHANGE_H #include <Qt3DCore/qscenechange.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QScenePropertyChangePrivate; @@ -68,8 +68,8 @@ protected: typedef QSharedPointer<QScenePropertyChange> QScenePropertyChangePtr; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QSCENEPROPERTYCHANGE_H +#endif // QT3DCORE_QSCENEPROPERTYCHANGE_H diff --git a/src/core/qscenepropertychange_p.h b/src/core/qscenepropertychange_p.h index a06d7b30b..3c2150952 100644 --- a/src/core/qscenepropertychange_p.h +++ b/src/core/qscenepropertychange_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCENEPROPERTYCHANGE_P_H -#define QT3D_QSCENEPROPERTYCHANGE_P_H +#ifndef QT3DCORE_QSCENEPROPERTYCHANGE_P_H +#define QT3DCORE_QSCENEPROPERTYCHANGE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QScenePropertyChange; class QFrameAllocator; @@ -83,4 +83,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QSCENEPROPERTYCHANGE_P_H +#endif // QT3DCORE_QSCENEPROPERTYCHANGE_P_H diff --git a/src/core/qscheduler.cpp b/src/core/qscheduler.cpp index 70e38479f..f73ec69f5 100644 --- a/src/core/qscheduler.cpp +++ b/src/core/qscheduler.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QScheduler::QScheduler(QObject *parent) : QObject(parent) @@ -87,6 +87,6 @@ void QScheduler::update(qint64 time) m_aspectManager->jobManager()->waitForAllJobs(); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qscheduler_p.h b/src/core/qscheduler_p.h index 5b8270d50..fb61dec24 100644 --- a/src/core/qscheduler_p.h +++ b/src/core/qscheduler_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCHEDULER_P_H -#define QT3D_QSCHEDULER_P_H +#ifndef QT3DCORE_QSCHEDULER_P_H +#define QT3DCORE_QSCHEDULER_P_H #include <QObject> #include <Qt3DCore/qt3dcore_global.h> @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectManager; @@ -72,8 +72,8 @@ private: QAspectManager *m_aspectManager; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QSCHEDULER_P_H +#endif // QT3DCORE_QSCHEDULER_P_H diff --git a/src/core/qtickclock.cpp b/src/core/qtickclock.cpp index 67ece3c14..ad9063b3e 100644 --- a/src/core/qtickclock.cpp +++ b/src/core/qtickclock.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QTickClock::QTickClock() : m_tickInterval(1000000000 / 60) // Nanoseconds @@ -86,7 +86,7 @@ qint64 QTickClock::waitForNextTick() //qCDebug(ChangeArbiter) << "sleeping for" << sleepTimeMicroSeconds << "us"; QThread::usleep(sleepTimeMicroSeconds); -#if defined(QT3D_DEBUG_TICKCLOCK) +#if defined(QT3DCORE_DEBUG_TICKCLOCK) qint64 expectedWakeTime = t + sleepTimeMicroSeconds * 1000; qint64 wakeTime = m_timer.nsecsElapsed(); qCDebug(ChangeArbiter) << "t =" << t / 1000000 << "timeToSleep =" << timeToSleep / 1000000 @@ -99,6 +99,6 @@ qint64 QTickClock::waitForNextTick() return m_time; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/qtickclock_p.h b/src/core/qtickclock_p.h index f04056826..bda4ef250 100644 --- a/src/core/qtickclock_p.h +++ b/src/core/qtickclock_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTICKCLOCK_P_H -#define QT3D_QTICKCLOCK_P_H +#ifndef QT3DCORE_QTICKCLOCK_P_H +#define QT3DCORE_QTICKCLOCK_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTickClock { @@ -74,8 +74,8 @@ private: qint64 m_time; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QTICKCLOCK_P_H +#endif // QT3DCORE_QTICKCLOCK_P_H diff --git a/src/core/resources/qboundedcircularbuffer_p.h b/src/core/resources/qboundedcircularbuffer_p.h index 96143d662..cf05df44d 100644 --- a/src/core/resources/qboundedcircularbuffer_p.h +++ b/src/core/resources/qboundedcircularbuffer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QBOUNDEDCIRCULARBUFFER_P_H -#define QT3D_QBOUNDEDCIRCULARBUFFER_P_H +#ifndef QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H +#define QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { template <class T> class QBoundedCircularBuffer @@ -143,4 +143,4 @@ protected: QT_END_NAMESPACE -#endif // QT3D_QBOUNDEDCIRCULARBUFFER_P_H +#endif // QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H diff --git a/src/core/resources/qcircularbuffer_p.h b/src/core/resources/qcircularbuffer_p.h index be3b8496b..5cb2f24cb 100644 --- a/src/core/resources/qcircularbuffer_p.h +++ b/src/core/resources/qcircularbuffer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCIRCULARBUFFER_H -#define QT3D_QCIRCULARBUFFER_H +#ifndef QT3DCORE_QCIRCULARBUFFER_H +#define QT3DCORE_QCIRCULARBUFFER_H // // W A R N I N G @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class CircularBufferData : public QSharedData { @@ -1322,4 +1322,4 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(CircularBuffer) QT_END_NAMESPACE -#endif // QT3D_QCIRCULARBUFFER_H +#endif // QT3DCORE_QCIRCULARBUFFER_H diff --git a/src/core/resources/qframeallocator.cpp b/src/core/resources/qframeallocator.cpp index 28025f192..70dbad2cd 100644 --- a/src/core/resources/qframeallocator.cpp +++ b/src/core/resources/qframeallocator.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ /*! - \class Qt3D::QFrameAllocator + \class Qt3DCore::QFrameAllocator \inmodule Qt3DCore \brief Provides a pool of memory chunks to be used to allocate objects on a per frame basis. @@ -51,10 +51,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QFrameAllocatorPrivate + \class Qt3DCore::QFrameAllocatorPrivate \internal */ QFrameAllocatorPrivate::QFrameAllocatorPrivate() diff --git a/src/core/resources/qframeallocator.h b/src/core/resources/qframeallocator.h index 4fab92e91..97ef3f9c6 100644 --- a/src/core/resources/qframeallocator.h +++ b/src/core/resources/qframeallocator.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEALLOCATOR_H -#define QT3D_QFRAMEALLOCATOR_H +#ifndef QT3DCORE_QFRAMEALLOCATOR_H +#define QT3DCORE_QFRAMEALLOCATOR_H #ifdef QFRAMEALLOCATOR_DEBUG @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QFrameAllocatorPrivate; diff --git a/src/core/resources/qframeallocator_p.h b/src/core/resources/qframeallocator_p.h index da3781b4d..dc1033ea3 100644 --- a/src/core/resources/qframeallocator_p.h +++ b/src/core/resources/qframeallocator_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEALLOCATOR_P_H -#define QT3D_QFRAMEALLOCATOR_P_H +#ifndef QT3DCORE_QFRAMEALLOCATOR_P_H +#define QT3DCORE_QFRAMEALLOCATOR_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QFrameAllocator; @@ -129,4 +129,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QFRAMEALLOCATOR_P_H +#endif // QT3DCORE_QFRAMEALLOCATOR_P_H diff --git a/src/core/resources/qhandle.h b/src/core/resources/qhandle.h index 64957f145..4ac751641 100644 --- a/src/core/resources/qhandle.h +++ b/src/core/resources/qhandle.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QHANDLE_H -#define QT3D_QHANDLE_H +#ifndef QT3DCORE_QHANDLE_H +#define QT3DCORE_QHANDLE_H #include <Qt3DCore/qt3dcore_global.h> #include <QtCore/QDebug> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { template <typename T, uint INDEXBITS> class QHandleManager; @@ -117,4 +117,4 @@ QDebug operator<<(QDebug dbg, const QHandle<T, INDEXBITS> &h) QT_END_NAMESPACE -#endif // QT3D_QRHANDLE_H +#endif // QT3DCORE_QRHANDLE_H diff --git a/src/core/resources/qhandlemanager.h b/src/core/resources/qhandlemanager.h index 4c99ea2fd..0ff41c899 100644 --- a/src/core/resources/qhandlemanager.h +++ b/src/core/resources/qhandlemanager.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QHANDLEMANAGER_H -#define QT3D_QHANDLEMANAGER_H +#ifndef QT3DCORE_QHANDLEMANAGER_H +#define QT3DCORE_QHANDLEMANAGER_H #include <QtGlobal> #include <Qt3DCore/qt3dcore_global.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { template <typename T, uint INDEXBITS = 16> class QHandleManager @@ -201,4 +201,4 @@ const T *QHandleManager<T, INDEXBITS>::constData(const QHandle<T, INDEXBITS> &ha QT_END_NAMESPACE -#endif // QT3D_QHANDLEMANAGER_H +#endif // QT3DCORE_QHANDLEMANAGER_H diff --git a/src/core/resources/qresourcemanager.cpp b/src/core/resources/qresourcemanager.cpp index 36c1e8727..5ece6a03f 100644 --- a/src/core/resources/qresourcemanager.cpp +++ b/src/core/resources/qresourcemanager.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ /*! - \class Qt3D::QResourceManager + \class Qt3DCore::QResourceManager \inmodule Qt3DCore \since 5.5 @@ -55,7 +55,7 @@ */ /*! - \class Qt3D::ArrayAllocatingPolicy + \class Qt3DCore::ArrayAllocatingPolicy \inmodule Qt3DCore \since 5.5 @@ -69,7 +69,7 @@ */ /*! - \class Qt3D::ListAllocatingPolicy + \class Qt3DCore::ListAllocatingPolicy \inmodule Qt3DCore \since 5.5 @@ -86,7 +86,7 @@ */ /*! - \class Qt3D::ObjectLevelLockingPolicy + \class Qt3DCore::ObjectLevelLockingPolicy \inmodule Qt3DCore \since 5.5 diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index c6e632bba..4af596c33 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTRESOURCESMANAGER_H -#define QT3D_QABSTRACTRESOURCESMANAGER_H +#ifndef QT3DCORE_QABSTRACTRESOURCESMANAGER_H +#define QT3DCORE_QABSTRACTRESOURCESMANAGER_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { template <class Host> struct NonLockingPolicy @@ -127,7 +127,7 @@ enum }; #define Q_DECLARE_RESOURCE_INFO(TYPE, FLAGS) \ - namespace Qt3D { \ + namespace Qt3DCore { \ template<> \ struct QResourceInfo<TYPE > \ { \ @@ -136,7 +136,7 @@ enum needsCleanup = ((FLAGS & Q_REQUIRES_CLEANUP) == 0) \ }; \ }; \ -} // namespace Qt3D +} // namespace Qt3DCore template <int v> struct Int2Type @@ -457,4 +457,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTRESOURCESMANAGER_H +#endif // QT3DCORE_QABSTRACTRESOURCESMANAGER_H diff --git a/src/core/services/nullservices_p.h b/src/core/services/nullservices_p.h index 707aec54d..31f8da3b5 100644 --- a/src/core/services/nullservices_p.h +++ b/src/core/services/nullservices_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_NULLSERVICES_P_H -#define QT3D_NULLSERVICES_P_H +#ifndef QT3DCORE_NULLSERVICES_P_H +#define QT3DCORE_NULLSERVICES_P_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class NullSystemInformationService : public QSystemInformationService { @@ -113,9 +113,9 @@ public: } }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_NULLSERVICES_P_H +#endif // QT3DCORE_NULLSERVICES_P_H diff --git a/src/core/services/qabstractcollisionqueryservice.cpp b/src/core/services/qabstractcollisionqueryservice.cpp index f2731cac5..a841abc18 100644 --- a/src/core/services/qabstractcollisionqueryservice.cpp +++ b/src/core/services/qabstractcollisionqueryservice.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QAbstractCollisionQueryService::QAbstractCollisionQueryService(const QString &description) : QAbstractServiceProvider(*new QAbstractCollisionQueryServicePrivate(description)) diff --git a/src/core/services/qabstractcollisionqueryservice.h b/src/core/services/qabstractcollisionqueryservice.h index 69afd6d85..04d92c687 100644 --- a/src/core/services/qabstractcollisionqueryservice.h +++ b/src/core/services/qabstractcollisionqueryservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H -#define QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H +#ifndef QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H +#define QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H #include <QVector> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QRay3D; class QAbstractCollisionQueryServicePrivate; @@ -79,6 +79,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QAbstractCollisionQueryService::QueryMode) +Q_DECLARE_METATYPE(Qt3DCore::QAbstractCollisionQueryService::QueryMode) -#endif // QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H +#endif // QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H diff --git a/src/core/services/qabstractcollisionqueryservice_p.h b/src/core/services/qabstractcollisionqueryservice_p.h index 08a76cb36..2f2abdc5a 100644 --- a/src/core/services/qabstractcollisionqueryservice_p.h +++ b/src/core/services/qabstractcollisionqueryservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTCOLLISIONQUERYSERVICE_P_H -#define QT3D_QABSTRACTCOLLISIONQUERYSERVICE_P_H +#ifndef QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_P_H +#define QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractCollisionQueryServicePrivate : public QAbstractServiceProviderPrivate { @@ -68,4 +68,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QAbstractCOLLISIONQUERYSERVICE_P_H +#endif // QT3DCORE_QAbstractCOLLISIONQUERYSERVICE_P_H diff --git a/src/core/services/qabstractframeadvanceservice.cpp b/src/core/services/qabstractframeadvanceservice.cpp index 04197527f..c163cdf7f 100644 --- a/src/core/services/qabstractframeadvanceservice.cpp +++ b/src/core/services/qabstractframeadvanceservice.cpp @@ -39,15 +39,15 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractFrameAdvanceServicePrivate + \class Qt3DCore::QAbstractFrameAdvanceServicePrivate \internal */ /*! - \class Qt3D::QAbstractFrameAdvanceService + \class Qt3DCore::QAbstractFrameAdvanceService \inmodule Qt3DCore \brief Interface for a Qt3D frame advance service @@ -72,19 +72,19 @@ QAbstractFrameAdvanceService::QAbstractFrameAdvanceService(QAbstractFrameAdvance } /*! - \fn qint64 Qt3D::QAbstractFrameAdvanceService::waitForNextTick() + \fn qint64 Qt3DCore::QAbstractFrameAdvanceService::waitForNextTick() Returns the current time, the call may be blocking if waiting for a tick. */ /*! - \fn void Qt3D::QAbstractFrameAdvanceService::start() + \fn void Qt3DCore::QAbstractFrameAdvanceService::start() Starts the service. */ /*! - \fn void Qt3D::QAbstractFrameAdvanceService::stop() + \fn void Qt3DCore::QAbstractFrameAdvanceService::stop() Stops the service, performing any cleanup deemed necessary. */ diff --git a/src/core/services/qabstractframeadvanceservice.h b/src/core/services/qabstractframeadvanceservice.h index c69676096..f72672fd3 100644 --- a/src/core/services/qabstractframeadvanceservice.h +++ b/src/core/services/qabstractframeadvanceservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTFRAMEADVANCESERVICE -#define QT3D_QABSTRACTFRAMEADVANCESERVICE +#ifndef QT3DCORE_QABSTRACTFRAMEADVANCESERVICE +#define QT3DCORE_QABSTRACTFRAMEADVANCESERVICE #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qservicelocator.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractFrameAdvanceServicePrivate; @@ -63,5 +63,5 @@ protected: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTFRAMEADVANCESERVICE +#endif // QT3DCORE_QABSTRACTFRAMEADVANCESERVICE diff --git a/src/core/services/qabstractframeadvanceservice_p.h b/src/core/services/qabstractframeadvanceservice_p.h index ce0bbad70..8e60658ef 100644 --- a/src/core/services/qabstractframeadvanceservice_p.h +++ b/src/core/services/qabstractframeadvanceservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H -#define QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H +#ifndef QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H +#define QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractFrameAdvanceServicePrivate : public QAbstractServiceProviderPrivate { @@ -68,5 +68,5 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H +#endif // QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H diff --git a/src/core/services/qabstractserviceprovider_p.h b/src/core/services/qabstractserviceprovider_p.h index 4046b5815..a75a42598 100644 --- a/src/core/services/qabstractserviceprovider_p.h +++ b/src/core/services/qabstractserviceprovider_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTSERVICEPROVIDER_P_H -#define QT3D_QABSTRACTSERVICEPROVIDER_P_H +#ifndef QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H +#define QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractServiceProviderPrivate { @@ -70,8 +70,8 @@ public: QString m_description; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QABSTRACTSERVICEPROVIDER_P_H +#endif // QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H diff --git a/src/core/services/qcollisionqueryresult.cpp b/src/core/services/qcollisionqueryresult.cpp index eac2e92ce..baa3ee4a0 100644 --- a/src/core/services/qcollisionqueryresult.cpp +++ b/src/core/services/qcollisionqueryresult.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QCollisionQueryResultPrivate::QCollisionQueryResultPrivate(QCollisionQueryResult *qq) : q_ptr(qq) diff --git a/src/core/services/qcollisionqueryresult.h b/src/core/services/qcollisionqueryresult.h index e74a74411..265869cab 100644 --- a/src/core/services/qcollisionqueryresult.h +++ b/src/core/services/qcollisionqueryresult.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCOLLISIONQUERYRESULT_H -#define QT3D_QCOLLISIONQUERYRESULT_H +#ifndef QT3DCORE_QCOLLISIONQUERYRESULT_H +#define QT3DCORE_QCOLLISIONQUERYRESULT_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qnodeid.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { typedef int QQueryHandle; @@ -67,5 +67,5 @@ private: QT_END_NAMESPACE -#endif // QT3D_QCOLLISIONQUERYRESULT_H +#endif // QT3DCORE_QCOLLISIONQUERYRESULT_H diff --git a/src/core/services/qcollisionqueryresult_p.h b/src/core/services/qcollisionqueryresult_p.h index a6a2f5e25..85daad64b 100644 --- a/src/core/services/qcollisionqueryresult_p.h +++ b/src/core/services/qcollisionqueryresult_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCOLLISIONQUERYRESULT_P_H -#define QT3D_QCOLLISIONQUERYRESULT_P_H +#ifndef QT3DCORE_QCOLLISIONQUERYRESULT_P_H +#define QT3DCORE_QCOLLISIONQUERYRESULT_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCollisionQueryResultPrivate { @@ -74,4 +74,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QCOLLISIONQUERYRESULT_P_H +#endif // QT3DCORE_QCOLLISIONQUERYRESULT_P_H diff --git a/src/core/services/qopenglinformationservice.cpp b/src/core/services/qopenglinformationservice.cpp index e651d9fbe..c54f3cf30 100644 --- a/src/core/services/qopenglinformationservice.cpp +++ b/src/core/services/qopenglinformationservice.cpp @@ -39,15 +39,15 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QOpenGLInformationServicePrivate + \class Qt3DCore::QOpenGLInformationServicePrivate \internal */ /*! - \class Qt3D::QOpenGLInformationService + \class Qt3DCore::QOpenGLInformationService \inmodule Qt3DCore \brief Interface for a Qt3D OpenGL information service @@ -76,12 +76,12 @@ QOpenGLInformationService::QOpenGLInformationService(QOpenGLInformationServicePr } /*! - \fn QSurfaceFormat Qt3D::QOpenGLInformationService::format() const + \fn QSurfaceFormat Qt3DCore::QOpenGLInformationService::format() const Subclasses should override this function to return the QSurfaceFormat of the OpenGL context in use. */ -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/services/qopenglinformationservice.h b/src/core/services/qopenglinformationservice.h index ed378ba8a..2bd2ffbab 100644 --- a/src/core/services/qopenglinformationservice.h +++ b/src/core/services/qopenglinformationservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QOPENGLINFORMATIONSERVICE_H -#define QT3D_QOPENGLINFORMATIONSERVICE_H +#ifndef QT3DCORE_QOPENGLINFORMATIONSERVICE_H +#define QT3DCORE_QOPENGLINFORMATIONSERVICE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qservicelocator.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QOpenGLInformationServicePrivate; @@ -58,8 +58,8 @@ protected: QOpenGLInformationService(QOpenGLInformationServicePrivate &dd); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QOPENGLINFORMATIONSERVICE_H +#endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_H diff --git a/src/core/services/qopenglinformationservice_p.h b/src/core/services/qopenglinformationservice_p.h index d98313364..c16a34d5c 100644 --- a/src/core/services/qopenglinformationservice_p.h +++ b/src/core/services/qopenglinformationservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QOPENGLINFORMATIONSERVICE_P_H -#define QT3D_QOPENGLINFORMATIONSERVICE_P_H +#ifndef QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H +#define QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QOpenGLInformationServicePrivate : public QAbstractServiceProviderPrivate { @@ -68,5 +68,5 @@ public: QT_END_NAMESPACE -#endif // QT3D_QOPENGLINFORMATIONSERVICE_P_H +#endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp index f68f0e8fd..da9f32a98 100644 --- a/src/core/services/qservicelocator.cpp +++ b/src/core/services/qservicelocator.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractServiceProvider + \class Qt3DCore::QAbstractServiceProvider \inmodule Qt3DCore */ @@ -96,23 +96,23 @@ public: /*! - \class Qt3D::QServiceLocator + \class Qt3DCore::QServiceLocator \inmodule Qt3DCore \brief Service locator used by aspects to retrieve pointers to concrete service objects - The Qt3D::QServiceLocator class can be used by aspects to obtain pointers to concrete - providers of abstract service interfaces. A subclass of Qt3D::QAbstractServiceProvider + The Qt3DCore::QServiceLocator class can be used by aspects to obtain pointers to concrete + providers of abstract service interfaces. A subclass of Qt3DCore::QAbstractServiceProvider encapsulates a service that can be provided by an aspect for other parts of the system. For example, an aspect may wish to know the current frame number, or how many CPU cores are available in the Qt3D tasking threadpool. - Aspects or the Qt3D::QAspectEngine are able to register objects as providers of services. - The service locator itself can be accessed via the Qt3D::QAbstractAspect::services() + Aspects or the Qt3DCore::QAspectEngine are able to register objects as providers of services. + The service locator itself can be accessed via the Qt3DCore::QAbstractAspect::services() function. As a convenience, the service locator provides methods to access services provided by - built in Qt3D aspects. Currently these are Qt3D::QSystemInformationService and - Qt3D::QOpenGLInformationService. For such services, the service provider will never + built in Qt3D aspects. Currently these are Qt3DCore::QSystemInformationService and + Qt3DCore::QOpenGLInformationService. For such services, the service provider will never return a null pointer. The default implementations of these services are simple null or do nothing implementations. */ @@ -170,7 +170,7 @@ int QServiceLocator::serviceCount() const } /*! - \fn T *Qt3D::QServiceLocator::service(int serviceType) + \fn T *Qt3DCore::QServiceLocator::service(int serviceType) Returns a pointer to the service provider for \a serviceType. If no provider has been explicitly registered, this returns a null pointer for non-Qt3D provided diff --git a/src/core/services/qservicelocator.h b/src/core/services/qservicelocator.h index 144154d97..cd19c34be 100644 --- a/src/core/services/qservicelocator.h +++ b/src/core/services/qservicelocator.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QSERVICELOCATOR_H -#define QT3D_QSERVICELOCATOR_H +#ifndef QT3DCORE_QSERVICELOCATOR_H +#define QT3DCORE_QSERVICELOCATOR_H #include <Qt3DCore/qt3dcore_global.h> #include <QScopedPointer> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractServiceProviderPrivate; @@ -115,4 +115,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QSERVICELOCATOR_H +#endif // QT3DCORE_QSERVICELOCATOR_H diff --git a/src/core/services/qsysteminformationservice.cpp b/src/core/services/qsysteminformationservice.cpp index df2869986..c5a7269d1 100644 --- a/src/core/services/qsysteminformationservice.cpp +++ b/src/core/services/qsysteminformationservice.cpp @@ -39,20 +39,20 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractServiceProviderPrivate + \class Qt3DCore::QAbstractServiceProviderPrivate \internal */ /*! - \class Qt3D::QSystemInformationServicePrivate + \class Qt3DCore::QSystemInformationServicePrivate \internal */ /*! - \class Qt3D::QSystemInformationService + \class Qt3DCore::QSystemInformationService \inmodule Qt3DCore \brief Interface for a Qt3D system information service @@ -79,7 +79,7 @@ QSystemInformationService::QSystemInformationService(QSystemInformationServicePr } /*! - \fn QStringList Qt3D::QSystemInformationService::aspectNames() + \fn QStringList Qt3DCore::QSystemInformationService::aspectNames() Subclasses should override this function and return a string list containing the names of all registered aspects. diff --git a/src/core/services/qsysteminformationservice.h b/src/core/services/qsysteminformationservice.h index eb42f0012..19b515e2e 100644 --- a/src/core/services/qsysteminformationservice.h +++ b/src/core/services/qsysteminformationservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSYSTEMINFORMATIONSERVICE_H -#define QT3D_QSYSTEMINFORMATIONSERVICE_H +#ifndef QT3DCORE_QSYSTEMINFORMATIONSERVICE_H +#define QT3DCORE_QSYSTEMINFORMATIONSERVICE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qservicelocator.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QSystemInformationServicePrivate; @@ -58,8 +58,8 @@ protected: QSystemInformationService(QSystemInformationServicePrivate &dd); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QSYSTEMINFORMATIONSERVICE_H +#endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_H diff --git a/src/core/services/qsysteminformationservice_p.h b/src/core/services/qsysteminformationservice_p.h index 43a3d0404..d2aecf1c8 100644 --- a/src/core/services/qsysteminformationservice_p.h +++ b/src/core/services/qsysteminformationservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSYSTEMINFORMATIONSERVICE_P_H -#define QT3D_QSYSTEMINFORMATIONSERVICE_P_H +#ifndef QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H +#define QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QSystemInformationServicePrivate : public QAbstractServiceProviderPrivate { @@ -68,5 +68,5 @@ public: QT_END_NAMESPACE -#endif // QT3D_QSYSTEMINFORMATIONSERVICE_P_H +#endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp index 85e25bd1d..aebea9745 100644 --- a/src/core/services/qtickclockservice.cpp +++ b/src/core/services/qtickclockservice.cpp @@ -40,9 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QTickClockServicePrivate + \class Qt3DCore::QTickClockServicePrivate \internal */ @@ -60,11 +60,11 @@ public: }; /*! - \class Qt3D::QTickClockService + \class Qt3DCore::QTickClockService \inmodule Qt3DCore - \brief Default Qt3D::QAbstractFrameAdvanceService implementation. + \brief Default Qt3DCore::QAbstractFrameAdvanceService implementation. - This default Qt3D::QAbstractFrameAdvanceService implementation has a frequency of 60 Hz. + This default Qt3DCore::QAbstractFrameAdvanceService implementation has a frequency of 60 Hz. */ QTickClockService::QTickClockService() : QAbstractFrameAdvanceService(*new QTickClockServicePrivate()) diff --git a/src/core/services/qtickclockservice_p.h b/src/core/services/qtickclockservice_p.h index a8fafdcc1..6c1b07722 100644 --- a/src/core/services/qtickclockservice_p.h +++ b/src/core/services/qtickclockservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTICKCLOCKSERVICE_P_H -#define QT3D_QTICKCLOCKSERVICE_P_H +#ifndef QT3DCORE_QTICKCLOCKSERVICE_P_H +#define QT3DCORE_QTICKCLOCKSERVICE_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTickClockServicePrivate; @@ -73,4 +73,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QTICKCLOCKSERVICE_P_H +#endif // QT3DCORE_QTICKCLOCKSERVICE_P_H 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 |