diff options
Diffstat (limited to 'tests/auto/core/qentity/tst_qentity.cpp')
| -rw-r--r-- | tests/auto/core/qentity/tst_qentity.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/tests/auto/core/qentity/tst_qentity.cpp b/tests/auto/core/qentity/tst_qentity.cpp index 2f7ebf314..042b62386 100644 --- a/tests/auto/core/qentity/tst_qentity.cpp +++ b/tests/auto/core/qentity/tst_qentity.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/qcomponent.h> #include <QtCore/qscopedpointer.h> -using namespace Qt3D; +using namespace Qt3DCore; class tst_Entity : public QObject { @@ -66,11 +66,11 @@ private slots: void verifyCopy(); }; -class MyQComponent : public Qt3D::QComponent +class MyQComponent : public Qt3DCore::QComponent { Q_OBJECT public: - explicit MyQComponent(Qt3D::QNode *parent = 0) + explicit MyQComponent(Qt3DCore::QNode *parent = 0) : QComponent(parent) {} @@ -84,14 +84,14 @@ protected: }; -class MyEntity : public Qt3D::QEntity +class MyEntity : public Qt3DCore::QEntity { public: - explicit MyEntity(Qt3D::QNode *parent = 0) + explicit MyEntity(Qt3DCore::QNode *parent = 0) : QEntity(parent) {} - void makeCopyOf(Qt3D::QEntity *other) + void makeCopyOf(Qt3DCore::QEntity *other) { QEntity::copy(other); } @@ -119,7 +119,7 @@ void tst_Entity::constructionDestruction() void tst_Entity::addComponentSingleParentSingleAggregation() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity(new QEntity()); MyQComponent *comp = new MyQComponent(entity.data()); QCoreApplication::processEvents(); @@ -142,8 +142,8 @@ void tst_Entity::addComponentSingleParentSingleAggregation() void tst_Entity::addComponentSingleParentSeveralAggregations() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity1(new QEntity()); - QScopedPointer<Qt3D::QEntity> entity2(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity()); MyQComponent *comp1 = new MyQComponent(entity1.data()); MyQComponent *comp2 = new MyQComponent(entity1.data()); @@ -193,8 +193,8 @@ void tst_Entity::addComponentSingleParentSeveralAggregations() void tst_Entity::addComponentsSeveralParentsSingleAggregations() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity1(new QEntity()); - QScopedPointer<Qt3D::QEntity> entity2(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity()); MyQComponent *comp1 = new MyQComponent(entity1.data()); MyQComponent *comp2 = new MyQComponent(entity1.data()); @@ -241,8 +241,8 @@ void tst_Entity::addComponentsSeveralParentsSingleAggregations() void tst_Entity::addComponentsSeveralParentsSeveralAggregations() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity1(new QEntity()); - QScopedPointer<Qt3D::QEntity> entity2(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity()); MyQComponent *comp1 = new MyQComponent(entity1.data()); MyQComponent *comp2 = new MyQComponent(entity1.data()); @@ -292,7 +292,7 @@ void tst_Entity::addComponentsSeveralParentsSeveralAggregations() void tst_Entity::removeComponentSingleParentSingleAggregation() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity(new QEntity()); MyQComponent *comp = new MyQComponent(entity.data()); QCoreApplication::processEvents(); entity->addComponent(comp); @@ -316,8 +316,8 @@ void tst_Entity::removeComponentSingleParentSingleAggregation() void tst_Entity::removeComponentSingleParentSeveralAggregations() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity1(new QEntity()); - QScopedPointer<Qt3D::QEntity> entity2(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity()); MyQComponent *comp1 = new MyQComponent(entity1.data()); MyQComponent *comp2 = new MyQComponent(entity1.data()); @@ -391,8 +391,8 @@ void tst_Entity::removeComponentSingleParentSeveralAggregations() void tst_Entity::removeComponentsSeveralParentsSingleAggreation() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity1(new QEntity()); - QScopedPointer<Qt3D::QEntity> entity2(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity()); MyQComponent *comp1 = new MyQComponent(entity1.data()); MyQComponent *comp2 = new MyQComponent(entity1.data()); @@ -443,8 +443,8 @@ void tst_Entity::removeComponentsSeveralParentsSingleAggreation() void tst_Entity::removeComponentsSeveralParentsSeveralAggregations() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity1(new QEntity()); - QScopedPointer<Qt3D::QEntity> entity2(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity()); MyQComponent *comp1 = new MyQComponent(entity1.data()); MyQComponent *comp2 = new MyQComponent(entity1.data()); @@ -519,7 +519,7 @@ void tst_Entity::removeComponentsSeveralParentsSeveralAggregations() void tst_Entity::addSeveralTimesSameComponent() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity(new QEntity()); MyQComponent *comp = new MyQComponent(entity.data()); QCoreApplication::processEvents(); entity->addComponent(comp); @@ -543,7 +543,7 @@ void tst_Entity::addSeveralTimesSameComponent() void tst_Entity::removeSeveralTimesSameComponent() { // GIVEN - QScopedPointer<Qt3D::QEntity> entity(new QEntity()); + QScopedPointer<Qt3DCore::QEntity> entity(new QEntity()); MyQComponent *comp = new MyQComponent(entity.data()); QCoreApplication::processEvents(); entity->addComponent(comp); @@ -568,7 +568,7 @@ void tst_Entity::removeSeveralTimesSameComponent() void tst_Entity::verifyCopy() { // GIVEN - QScopedPointer<Qt3D::QEntity> root(new Qt3D::QEntity()); + QScopedPointer<Qt3DCore::QEntity> root(new Qt3DCore::QEntity()); MyEntity *parentLessEntity = new MyEntity(); MyEntity *parentedEntity = new MyEntity(root.data()); |