diff options
Diffstat (limited to 'src/quick3d/quick3d')
23 files changed, 111 insertions, 143 deletions
diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.cpp b/src/quick3d/quick3d/items/quick3dconfiguration.cpp index 5efb7d0aa..433e5e0d2 100644 --- a/src/quick3d/quick3d/items/quick3dconfiguration.cpp +++ b/src/quick3d/quick3d/items/quick3dconfiguration.cpp @@ -46,8 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! @@ -71,7 +70,7 @@ void Quick3DConfiguration::setControlledCamera(QCamera *camera) } /*! - \qmlproperty Camera Qt3D::Configuration::controlledCamera + \qmlproperty Camera Qt3DCore::Configuration::controlledCamera */ QCamera *Quick3DConfiguration::controlledCamera() const { @@ -96,8 +95,7 @@ void Quick3DConfiguration::applyControlledCameraChange() } } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.h b/src/quick3d/quick3d/items/quick3dconfiguration.h index f65076ab0..99606698b 100644 --- a/src/quick3d/quick3d/items/quick3dconfiguration.h +++ b/src/quick3d/quick3d/items/quick3dconfiguration.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCamera; @@ -51,7 +51,7 @@ namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DConfiguration : public QObject { Q_OBJECT - Q_PROPERTY(Qt3D::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged) + Q_PROPERTY(Qt3DCore::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged) public: explicit Quick3DConfiguration(QObject *parent = 0); @@ -68,9 +68,8 @@ private: QCamera *m_camera; }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp index c00eb0899..8b3b9ba4b 100644 --- a/src/quick3d/quick3d/items/quick3dentity.cpp +++ b/src/quick3d/quick3d/items/quick3dentity.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! @@ -56,12 +55,12 @@ Quick3DEntity::Quick3DEntity(QObject *parent) } /*! - \qmlproperty list<Component3D> Qt3D::Entity::components + \qmlproperty list<Component3D> Qt3DCore::Entity::components \readonly */ QQmlListProperty<QComponent> Quick3DEntity::componentList() { - return QQmlListProperty<Qt3D::QComponent>(this, 0, + return QQmlListProperty<Qt3DCore::QComponent>(this, 0, Quick3DEntity::qmlAppendComponent, Quick3DEntity::qmlComponentsCount, Quick3DEntity::qmlComponentAt, @@ -97,8 +96,7 @@ void Quick3DEntity::qmlClearComponents(QQmlListProperty<QComponent> *list) } } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentity.h b/src/quick3d/quick3d/items/quick3dentity.h index 1db358037..3a9adca06 100644 --- a/src/quick3d/quick3d/items/quick3dentity.h +++ b/src/quick3d/quick3d/items/quick3dentity.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; class QComponent; @@ -54,25 +54,24 @@ namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DEntity : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QComponent> components READ componentList) + Q_PROPERTY(QQmlListProperty<Qt3DCore::QComponent> components READ componentList) public: explicit Quick3DEntity(QObject *parent = 0); - QQmlListProperty<Qt3D::QComponent> componentList(); + QQmlListProperty<Qt3DCore::QComponent> componentList(); inline QEntity *parentEntity() const { return qobject_cast<QEntity*>(parent()); } private: - static void qmlAppendComponent(QQmlListProperty<Qt3D::QComponent> *list, Qt3D::QComponent *comp); - static QComponent *qmlComponentAt(QQmlListProperty<Qt3D::QComponent> *list, int index); - static int qmlComponentsCount(QQmlListProperty<Qt3D::QComponent> *list); - static void qmlClearComponents(QQmlListProperty<Qt3D::QComponent> *list); + static void qmlAppendComponent(QQmlListProperty<Qt3DCore::QComponent> *list, Qt3DCore::QComponent *comp); + static QComponent *qmlComponentAt(QQmlListProperty<Qt3DCore::QComponent> *list, int index); + static int qmlComponentsCount(QQmlListProperty<Qt3DCore::QComponent> *list); + static void qmlClearComponents(QQmlListProperty<Qt3DCore::QComponent> *list); }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp index 1fe8945e1..0b4d3d9a1 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader.cpp +++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp @@ -45,8 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class Quick3DEntityLoaderIncubator : public QQmlIncubator @@ -105,7 +104,7 @@ Quick3DEntityLoader::~Quick3DEntityLoader() } /*! - \qmlproperty QtQml::QtObject Qt3D::EntityLoader::entity + \qmlproperty QtQml::QtObject Qt3DCore::EntityLoader::entity \readonly */ QObject *Quick3DEntityLoader::entity() const @@ -115,7 +114,7 @@ QObject *Quick3DEntityLoader::entity() const } /*! - \qmlproperty url Qt3D::EntityLoader::source + \qmlproperty url Qt3DCore::EntityLoader::source */ QUrl Quick3DEntityLoader::source() const { @@ -146,7 +145,7 @@ void Quick3DEntityLoader::copy(const QNode *ref) } /*! - \class Qt3D::Quick::Quick3DEntityLoaderPrivate + \class Qt3DCore::Quick::Quick3DEntityLoaderPrivate \internal */ Quick3DEntityLoaderPrivate::Quick3DEntityLoaderPrivate() @@ -236,9 +235,8 @@ void Quick3DEntityLoaderPrivate::_q_componentStatusChanged(QQmlComponent::Status m_component->create(*m_incubator, m_context); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentityloader.h b/src/quick3d/quick3d/items/quick3dentityloader.h index 0280ca3aa..49d689e02 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader.h +++ b/src/quick3d/quick3d/items/quick3dentityloader.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; @@ -82,9 +82,8 @@ private: QT3D_CLONEABLE(Quick3DEntityLoader) }; -} // Quick; - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h index 2cd0ffda4..21ec9ed55 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader_p.h +++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QQmlIncubator; class QQmlContext; -namespace Qt3D { +namespace Qt3DCore { class QEntity; @@ -89,9 +89,8 @@ public: QEntity *m_entity; }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp index c230df447..2c4128bed 100644 --- a/src/quick3d/quick3d/items/quick3dnode.cpp +++ b/src/quick3d/quick3d/items/quick3dnode.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! @@ -58,7 +57,7 @@ Quick3DNode::Quick3DNode(QObject *parent) } /*! - \qmlproperty list<QtQml::QtObject> Qt3D::Node::data + \qmlproperty list<QtQml::QtObject> Qt3DCore::Node::data \default */ @@ -72,7 +71,7 @@ QQmlListProperty<QObject> Quick3DNode::data() } /*! - \qmlproperty list<Node> Qt3D::Node::childNodes + \qmlproperty list<Node> Qt3DCore::Node::childNodes \readonly */ @@ -113,7 +112,7 @@ void Quick3DNode::clearData(QQmlListProperty<QObject> *list) self->childRemoved(0, child); } -void Quick3DNode::appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *obj) +void Quick3DNode::appendChild(QQmlListProperty<Qt3DCore::QNode> *list, Qt3DCore::QNode *obj) { if (!obj) return; @@ -124,19 +123,19 @@ void Quick3DNode::appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode * self->childAppended(0, obj); } -Qt3D::QNode *Quick3DNode::childAt(QQmlListProperty<Qt3D::QNode> *list, int index) +Qt3DCore::QNode *Quick3DNode::childAt(QQmlListProperty<Qt3DCore::QNode> *list, int index) { Quick3DNode *self = static_cast<Quick3DNode *>(list->object); return qobject_cast<QNode *>(self->parentNode()->children().at(index)); } -int Quick3DNode::childCount(QQmlListProperty<Qt3D::QNode> *list) +int Quick3DNode::childCount(QQmlListProperty<Qt3DCore::QNode> *list) { Quick3DNode *self = static_cast<Quick3DNode *>(list->object); return self->parentNode()->children().count(); } -void Quick3DNode::clearChildren(QQmlListProperty<Qt3D::QNode> *list) +void Quick3DNode::clearChildren(QQmlListProperty<Qt3DCore::QNode> *list) { Quick3DNode *self = static_cast<Quick3DNode *>(list->object); Q_FOREACH (QObject *const child, self->parentNode()->children()) @@ -163,8 +162,7 @@ void Quick3DNode::childRemoved(int, QObject *obj) obj->setParent(Q_NULLPTR); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnode.h b/src/quick3d/quick3d/items/quick3dnode.h index 008583ecc..96fcd78e4 100644 --- a/src/quick3d/quick3d/items/quick3dnode.h +++ b/src/quick3d/quick3d/items/quick3dnode.h @@ -43,21 +43,20 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DNode : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<QObject> data READ data) - Q_PROPERTY(QQmlListProperty<Qt3D::QNode> childNodes READ childNodes) + Q_PROPERTY(QQmlListProperty<Qt3DCore::QNode> childNodes READ childNodes) Q_CLASSINFO("DefaultProperty", "data") public: explicit Quick3DNode(QObject *parent = 0); QQmlListProperty<QObject> data(); - QQmlListProperty<Qt3D::QNode> childNodes(); + QQmlListProperty<Qt3DCore::QNode> childNodes(); inline QNode *parentNode() const { return qobject_cast<QNode*>(parent()); } @@ -67,19 +66,18 @@ private: static int dataCount(QQmlListProperty<QObject> *list); static void clearData(QQmlListProperty<QObject> *list); - static void appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *obj); - static QNode *childAt(QQmlListProperty<Qt3D::QNode> *list, int index); - static int childCount(QQmlListProperty<Qt3D::QNode> *list); - static void clearChildren(QQmlListProperty<Qt3D::QNode> *list); + static void appendChild(QQmlListProperty<Qt3DCore::QNode> *list, Qt3DCore::QNode *obj); + static QNode *childAt(QQmlListProperty<Qt3DCore::QNode> *list, int index); + static int childCount(QQmlListProperty<Qt3DCore::QNode> *list); + static void clearChildren(QQmlListProperty<Qt3DCore::QNode> *list); private Q_SLOTS: void childAppended(int idx, QObject *child); void childRemoved(int idx, QObject *child); }; -} // Quick; - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp index c6257ec58..fb49eef89 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp @@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { namespace Quick { /*! - \class Qt3D::Quick::Quick3DNodeInstantiatorPrivate + \class Qt3DCore::Quick::Quick3DNodeInstantiatorPrivate \internal */ Quick3DNodeInstantiatorPrivate::Quick3DNodeInstantiatorPrivate() @@ -222,7 +222,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator() } /*! - \qmlsignal Qt3D::NodeInstantiator::objectAdded(int index, QtObject node) + \qmlsignal Qt3DCore::NodeInstantiator::objectAdded(int index, QtObject node) This signal is emitted when a node is added to the NodeInstantiator. The \a index parameter holds the index which the node has been given, and the \a node @@ -232,7 +232,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator() */ /*! - \qmlsignal Qt3D::NodeInstantiator::objectRemoved(int index, QtObject object) + \qmlsignal Qt3DCore::NodeInstantiator::objectRemoved(int index, QtObject object) This signal is emitted when an object is removed from the Instantiator. The \a index parameter holds the index which the object had been given, and the \a object @@ -244,7 +244,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator() The corresponding handler is \c onObjectRemoved. */ /*! - \qmlproperty bool Qt3D::NodeInstantiator::active + \qmlproperty bool Qt3DCore::NodeInstantiator::active When active is \c true, and the delegate component is ready, the Instantiator will create objects according to the model. When active is \c false, no objects @@ -269,7 +269,7 @@ void Quick3DNodeInstantiator::setActive(bool newVal) } /*! - \qmlproperty bool Qt3D::NodeInstantiator::asynchronous + \qmlproperty bool Qt3DCore::NodeInstantiator::asynchronous When asynchronous is true the Instantiator will attempt to create objects asynchronously. This means that objects may not be available immediately, @@ -296,7 +296,7 @@ void Quick3DNodeInstantiator::setAsync(bool newVal) /*! - \qmlproperty int Qt3D::NodeInstantiator::count + \qmlproperty int Qt3DCore::NodeInstantiator::count \readonly The number of objects the Instantiator is currently managing. @@ -309,7 +309,7 @@ int Quick3DNodeInstantiator::count() const } /*! - \qmlproperty QtQml::Component Qt3D::NodeInstantiator::delegate + \qmlproperty QtQml::Component Qt3DCore::NodeInstantiator::delegate \default The component used to create all objects. @@ -346,7 +346,7 @@ void Quick3DNodeInstantiator::setDelegate(QQmlComponent *c) } /*! - \qmlproperty variant Qt3D::NodeInstantiator::model + \qmlproperty variant Qt3DCore::NodeInstantiator::model This property can be set to any of the supported \l {qml-data-models}{data models}: @@ -421,7 +421,7 @@ void Quick3DNodeInstantiator::setModel(const QVariant &v) } /*! - \qmlproperty QtQml::QtObject Qt3D::NodeInstantiator::object + \qmlproperty QtQml::QtObject Qt3DCore::NodeInstantiator::object \readonly This is a reference to the first created object, intended as a convenience @@ -436,7 +436,7 @@ QObject *Quick3DNodeInstantiator::object() const } /*! - \qmlmethod QtQml::QtObject Qt3D::NodeInstantiator::objectAt(int index) + \qmlmethod QtQml::QtObject Qt3DCore::NodeInstantiator::objectAt(int index) Returns a reference to the object with the given \a index. */ @@ -492,7 +492,7 @@ void Quick3DNodeInstantiator::copy(const QNode *ref) } } // namespace Quick -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h index a3f9b3dda..38a4d5a6f 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { namespace Quick { class Quick3DNodeInstantiatorPrivate; @@ -122,7 +122,7 @@ private: }; } // namespace Quick -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h index 68a16b192..71bc44668 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QQmlComponent; -namespace Qt3D { +namespace Qt3DCore { namespace Quick { class Quick3DNodeInstantiatorPrivate : public QNodePrivate @@ -86,7 +86,7 @@ public: }; } // namespace Quick -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dtransform.cpp b/src/quick3d/quick3d/items/quick3dtransform.cpp index 3386a2c8a..3f313850a 100644 --- a/src/quick3d/quick3d/items/quick3dtransform.cpp +++ b/src/quick3d/quick3d/items/quick3dtransform.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! @@ -51,16 +50,16 @@ namespace Quick { Quick3DTransform::Quick3DTransform(QObject *parent) : QObject(parent) { - Q_ASSERT(qobject_cast<Qt3D::QTransform *>(parent) != Q_NULLPTR); + Q_ASSERT(qobject_cast<Qt3DCore::QTransform *>(parent) != Q_NULLPTR); } /*! - \qmlproperty matrix4x4 Qt3D::Transform::matrix + \qmlproperty matrix4x4 Qt3DCore::Transform::matrix \readonly */ /*! - \qmlproperty list<QAbstractTransform> Qt3D::Transform::transforms + \qmlproperty list<QAbstractTransform> Qt3DCore::Transform::transforms \default */ QQmlListProperty<QAbstractTransform> Quick3DTransform::transformList() @@ -100,8 +99,7 @@ void Quick3DTransform::qmlClearTransforms(QQmlListProperty<QAbstractTransform> * self->parentTransform()->removeTransform(trans); } -} //Quick - -} //Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dtransform.h b/src/quick3d/quick3d/items/quick3dtransform.h index 2d7f9aa10..504b0fe61 100644 --- a/src/quick3d/quick3d/items/quick3dtransform.h +++ b/src/quick3d/quick3d/items/quick3dtransform.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTransform; @@ -53,24 +53,23 @@ namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DTransform : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractTransform> transforms READ transformList) + Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractTransform> transforms READ transformList) Q_CLASSINFO("DefaultProperty", "transforms") public: explicit Quick3DTransform(QObject *parent = 0); - QQmlListProperty<Qt3D::QAbstractTransform> transformList(); + QQmlListProperty<Qt3DCore::QAbstractTransform> transformList(); - inline QTransform *parentTransform() const { return qobject_cast<Qt3D::QTransform *>(parent()); } + inline QTransform *parentTransform() const { return qobject_cast<Qt3DCore::QTransform *>(parent()); } private: - static void qmlAppendTransform(QQmlListProperty<Qt3D::QAbstractTransform> *list, Qt3D::QAbstractTransform *bar); - static QAbstractTransform* transformAt(QQmlListProperty<Qt3D::QAbstractTransform> *list, int index); - static int transformCount(QQmlListProperty<Qt3D::QAbstractTransform> *list); - static void qmlClearTransforms(QQmlListProperty<Qt3D::QAbstractTransform> *list); + static void qmlAppendTransform(QQmlListProperty<Qt3DCore::QAbstractTransform> *list, Qt3DCore::QAbstractTransform *bar); + static QAbstractTransform* transformAt(QQmlListProperty<Qt3DCore::QAbstractTransform> *list, int index); + static int transformCount(QQmlListProperty<Qt3DCore::QAbstractTransform> *list); + static void qmlClearTransforms(QQmlListProperty<Qt3DCore::QAbstractTransform> *list); }; -} //Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp index a05143f23..8cdee8674 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.cpp +++ b/src/quick3d/quick3d/qqmlaspectengine.cpp @@ -43,12 +43,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! - \class Qt3D::Quick::QQmlAspectEnginePrivate + \class Qt3DCore::Quick::QQmlAspectEnginePrivate \internal */ QQmlAspectEnginePrivate::QQmlAspectEnginePrivate() @@ -140,9 +139,8 @@ void QQmlAspectEnginePrivate::_q_continueExecute() emit q->statusChanged(q->status()); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h index 025908a97..7f742e83f 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.h +++ b/src/quick3d/quick3d/qqmlaspectengine.h @@ -43,8 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class QQmlAspectEnginePrivate; @@ -71,9 +70,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_continueExecute()) }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qqmlaspectengine_p.h b/src/quick3d/quick3d/qqmlaspectengine_p.h index f864aadef..c53082a4a 100644 --- a/src/quick3d/quick3d/qqmlaspectengine_p.h +++ b/src/quick3d/quick3d/qqmlaspectengine_p.h @@ -55,8 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class QQmlAspectEnginePrivate : public QObjectPrivate @@ -74,9 +73,8 @@ private: void _q_continueExecute(); }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp index afd0a2a0a..ce40df540 100644 --- a/src/quick3d/quick3d/qt3dquick_global.cpp +++ b/src/quick3d/quick3d/qt3dquick_global.cpp @@ -44,8 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class Quick3DColorProvider : public QQmlColorProvider @@ -665,7 +664,7 @@ static Quick3DColorProvider *getColorProvider() void Quick3D_initialize() { - Qt3D::Quick::Quick3DValueTypes::registerValueTypes(); + Qt3DCore::Quick::Quick3DValueTypes::registerValueTypes(); QQml_addValueTypeProvider(getValueTypeProvider()); QQml_setColorProvider(getColorProvider()); QAbstractNodeFactory::registerNodeFactory(QuickNodeFactory::instance()); @@ -676,8 +675,7 @@ void Quick3D_registerType(const char *className, const char *quickName, int majo QuickNodeFactory::instance()->registerType(className, quickName, major, minor); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquick_global_p.h b/src/quick3d/quick3d/qt3dquick_global_p.h index addb2d6cf..d15381dd6 100644 --- a/src/quick3d/quick3d/qt3dquick_global_p.h +++ b/src/quick3d/quick3d/qt3dquick_global_p.h @@ -55,8 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_initialize(); @@ -69,9 +68,8 @@ template<class T, class E> void registerExtendedType(const char *className, cons Quick3D_registerType(className, quickName, major, minor); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp index 062e97bb7..4da5e9b25 100644 --- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp +++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { Q_GLOBAL_STATIC(QuickNodeFactory, quick_node_factory) @@ -68,6 +68,6 @@ QNode *QuickNodeFactory::createNode(const char *type) return typeInfo.t ? qobject_cast<QNode *>(typeInfo.t->create()) : Q_NULLPTR; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h index 8d475dc95..fda891ed8 100644 --- a/src/quick3d/quick3d/qt3dquicknodefactory_p.h +++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQmlType; -namespace Qt3D { +namespace Qt3DCore { class QuickNodeFactory : public QAbstractNodeFactory { @@ -79,7 +79,7 @@ private: QHash<QByteArray, Type> m_types; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp index 1d3052fdb..2c19c67cc 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp +++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { namespace Quick3DValueTypes { @@ -534,8 +533,7 @@ QString Quick3DMatrix4x4ValueType::toString() const .arg(v(3, 0)).arg(v(3, 1)).arg(v(3, 2)).arg(v(3, 3)); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h index c3013fbe7..1fec1f059 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h +++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h @@ -61,10 +61,8 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { - namespace Quick3DValueTypes { QT3DQUICKSHARED_PRIVATE_EXPORT void registerValueTypes(); @@ -281,9 +279,8 @@ public: Q_INVOKABLE bool fuzzyEquals(const QMatrix4x4 &m) const; }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE |