Change uuid -> id as it really isn't universally unique any longer

Change-Id: If25d1f71dfff62009db1cd4f72a1b0725b4c6d14
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>

3 files changed, 57 insertions, 57 deletions

diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index c59a11304..b0c143d21 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -348,12 +348,12 @@ void tst_Nodes::checkCloning()
 //    QCOMPARE(entity->components().count(), 3);
 
 //    Qt3D::QNode *rootClone = root->clone();
-//    QVERIFY(rootClone->uuid() == root->uuid());
+//    QVERIFY(rootClone->id() == root->id());
 //    QVERIFY(qobject_cast<MyQNode *>(rootClone) != Q_NULLPTR);
 //    QVERIFY(qobject_cast<MyQNode *>(rootClone)->customProperty() == root->customProperty());
 
 //    Qt3D::QEntity *entityClone = qobject_cast<Qt3D::QEntity *>(rootClone->children().first());
-//    QVERIFY(entity->uuid() == entityClone->uuid());
+//    QVERIFY(entity->id() == entityClone->id());
 //    QCOMPARE(root->children().count(), rootClone->children().count());
 //    QCOMPARE(entityClone->children().count(), entity->children().count());
 //    QCOMPARE(entityClone->components().count(), entity->components().count());
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index 94c6c480c..aa90d201b 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -195,7 +195,7 @@ public:
         m_lastChanges << e;
         // Sends reply to frontend
         Qt3D::QBackendScenePropertyChangePtr change(new Qt3D::QBackendScenePropertyChange(Qt3D::NodeUpdated, this));
-        change->setTargetNode(e->subject().m_node->uuid());
+        change->setTargetNode(e->subject().m_node->id());
         change->setPropertyName(QByteArrayLiteral("Reply"));
         notifyObservers(change);
     }
@@ -314,7 +314,7 @@ void tst_QChangeArbiter::registerObservers()
     QList<tst_SimpleObserver *> observers;
     for (int i = 0; i < 5; i++) {
         tst_SimpleObserver *s = new tst_SimpleObserver();
-        arbiter->registerObserver(s, root->uuid());
+        arbiter->registerObserver(s, root->id());
         observers << s;
     }
 
@@ -350,7 +350,7 @@ void tst_QChangeArbiter::registerSceneObserver()
     QList<tst_SimpleObserver *> observers;
     for (int i = 0; i < 5; i++) {
         tst_SimpleObserver *s = new tst_SimpleObserver();
-        arbiter->registerObserver(s, root->uuid());
+        arbiter->registerObserver(s, root->id());
         observers << s;
     }
 
@@ -411,7 +411,7 @@ void tst_QChangeArbiter::unregisterObservers()
     QList<tst_SimpleObserver *> observers;
     for (int i = 0; i < 5; i++) {
         tst_SimpleObserver *s = new tst_SimpleObserver();
-        arbiter->registerObserver(s, root->uuid());
+        arbiter->registerObserver(s, root->id());
         observers << s;
     }
 
@@ -429,7 +429,7 @@ void tst_QChangeArbiter::unregisterObservers()
     }
 
     Q_FOREACH (tst_SimpleObserver *o, observers)
-        arbiter->unregisterObserver(o, root->uuid());
+        arbiter->unregisterObserver(o, root->id());
 
     root->sendAllChangesNotification();
     arbiter->syncChanges();
@@ -458,7 +458,7 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     QList<tst_SimpleObserver *> observers;
     for (int i = 0; i < 5; i++) {
         tst_SimpleObserver *s = new tst_SimpleObserver();
-        arbiter->registerObserver(s, root->uuid());
+        arbiter->registerObserver(s, root->id());
         observers << s;
     }
 
@@ -550,13 +550,13 @@ void tst_QChangeArbiter::distributeFrontendChanges()
     tst_SimpleObserver *backendComponentUpdatedObserver = new tst_SimpleObserver();
     tst_SimpleObserver *backendComponentRemovedObserver = new tst_SimpleObserver();
 
-    arbiter->registerObserver(backendAllChangedObserver, root->uuid());
-    arbiter->registerObserver(backendNodeAddedObserver, root->uuid(), Qt3D::NodeAdded);
-    arbiter->registerObserver(backendNodeUpdatedObserver, root->uuid(), Qt3D::NodeUpdated);
-    arbiter->registerObserver(backendNodeRemovedObserver, root->uuid(), Qt3D::NodeRemoved);
-    arbiter->registerObserver(backendComponentAddedObserver, root->uuid(), Qt3D::ComponentAdded);
-    arbiter->registerObserver(backendComponentUpdatedObserver, root->uuid(), Qt3D::ComponentUpdated);
-    arbiter->registerObserver(backendComponentRemovedObserver, root->uuid(), Qt3D::ComponentRemoved);
+    arbiter->registerObserver(backendAllChangedObserver, root->id());
+    arbiter->registerObserver(backendNodeAddedObserver, root->id(), Qt3D::NodeAdded);
+    arbiter->registerObserver(backendNodeUpdatedObserver, root->id(), Qt3D::NodeUpdated);
+    arbiter->registerObserver(backendNodeRemovedObserver, root->id(), Qt3D::NodeRemoved);
+    arbiter->registerObserver(backendComponentAddedObserver, root->id(), Qt3D::ComponentAdded);
+    arbiter->registerObserver(backendComponentUpdatedObserver, root->id(), Qt3D::ComponentUpdated);
+    arbiter->registerObserver(backendComponentRemovedObserver, root->id(), Qt3D::ComponentRemoved);
 
     arbiter->syncChanges();
 
@@ -665,8 +665,8 @@ void tst_QChangeArbiter::distributeBackendChanges()
     scene->addObservable(root);
 
     tst_ObserverObservable *backenObserverObservable = new tst_ObserverObservable();
-    arbiter->registerObserver(backenObserverObservable, root->uuid());
-    arbiter->scene()->addObservable(backenObserverObservable, root->uuid());
+    arbiter->registerObserver(backenObserverObservable, root->id());
+    arbiter->scene()->addObservable(backenObserverObservable, root->id());
 
     arbiter->syncChanges();
     QVERIFY(root->lastChange().isNull());
@@ -684,7 +684,7 @@ void tst_QChangeArbiter::distributeBackendChanges()
     QCOMPARE(backenObserverObservable->lastChanges().count(), 2);
     Qt3D::QBackendScenePropertyChangePtr c = qSharedPointerDynamicCast<Qt3D::QBackendScenePropertyChange>(root->lastChange());
     QVERIFY(!c.isNull());
-    QVERIFY(c->targetNode() == root->uuid());
+    QVERIFY(c->targetNode() == root->id());
     QVERIFY(c->propertyName() == QByteArrayLiteral("Reply"));
     QVERIFY(c->type() == Qt3D::NodeUpdated);
 }
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index 1445645af..8c7d3441b 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -114,24 +114,24 @@ void tst_QScene::addObservable()
     scene->setArbiter(new Qt3D::QChangeArbiter());
 
     for (int i = 0; i < 5; i++)
-        scene->addObservable(observables.at(i), node1->uuid());
+        scene->addObservable(observables.at(i), node1->id());
 
     for (int i = 0; i < 5; i++)
-        scene->addObservable(observables.at(i + 5), node2->uuid());
+        scene->addObservable(observables.at(i + 5), node2->id());
 
-    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->uuid());
-    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->uuid());
+    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->id());
+    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->id());
 
     QCOMPARE(obs1.count(), 5);
     QCOMPARE(obs2.count(), obs1.count());
 
     Q_FOREACH (Qt3D::QObservableInterface *o, obs1) {
-        QVERIFY(scene->nodeIdFromObservable(o) == node1->uuid());
-        QVERIFY(scene->lookupNode(node1->uuid()) == Q_NULLPTR);
+        QVERIFY(scene->nodeIdFromObservable(o) == node1->id());
+        QVERIFY(scene->lookupNode(node1->id()) == Q_NULLPTR);
     }
     Q_FOREACH (Qt3D::QObservableInterface *o, obs2) {
-        QVERIFY(scene->nodeIdFromObservable(o) == node2->uuid());
-        QVERIFY(scene->lookupNode(node2->uuid()) == Q_NULLPTR);
+        QVERIFY(scene->nodeIdFromObservable(o) == node2->id());
+        QVERIFY(scene->lookupNode(node2->id()) == Q_NULLPTR);
     }
 }
 
@@ -149,8 +149,8 @@ void tst_QScene::addNodeObservable()
         scene->addObservable(nodes.at(i));
 
     Q_FOREACH (Qt3D::QNode *n, nodes) {
-        QVERIFY(n == scene->lookupNode(n->uuid()));
-        QVERIFY(scene->lookupObservables(n->uuid()).isEmpty());
+        QVERIFY(n == scene->lookupNode(n->id()));
+        QVERIFY(scene->lookupObservables(n->id()).isEmpty());
     }
 }
 
@@ -168,29 +168,29 @@ void tst_QScene::removeObservable()
     scene->setArbiter(new Qt3D::QChangeArbiter());
 
     for (int i = 0; i < 5; i++)
-        scene->addObservable(observables.at(i), node1->uuid());
+        scene->addObservable(observables.at(i), node1->id());
 
     for (int i = 0; i < 5; i++)
-        scene->addObservable(observables.at(i + 5), node2->uuid());
+        scene->addObservable(observables.at(i + 5), node2->id());
 
-    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->uuid());
-    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->uuid());
+    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->id());
+    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->id());
 
     QCOMPARE(obs1.count(), 5);
     QCOMPARE(obs2.count(), obs1.count());
 
-    scene->removeObservable(observables.at(0), node1->uuid());
-    QCOMPARE(scene->lookupObservables(node1->uuid()).count(), 4);
+    scene->removeObservable(observables.at(0), node1->id());
+    QCOMPARE(scene->lookupObservables(node1->id()).count(), 4);
 
-    scene->removeObservable(observables.at(0), node1->uuid());
-    QCOMPARE(scene->lookupObservables(node1->uuid()).count(), 4);
+    scene->removeObservable(observables.at(0), node1->id());
+    QCOMPARE(scene->lookupObservables(node1->id()).count(), 4);
 
-    scene->removeObservable(observables.at(6), node1->uuid());
-    QCOMPARE(scene->lookupObservables(node1->uuid()).count(), 4);
-    QCOMPARE(scene->lookupObservables(node2->uuid()).count(), 5);
+    scene->removeObservable(observables.at(6), node1->id());
+    QCOMPARE(scene->lookupObservables(node1->id()).count(), 4);
+    QCOMPARE(scene->lookupObservables(node2->id()).count(), 5);
 
-    scene->removeObservable(observables.at(0), node2->uuid());
-    QCOMPARE(scene->lookupObservables(node2->uuid()).count(), 5);
+    scene->removeObservable(observables.at(0), node2->id());
+    QCOMPARE(scene->lookupObservables(node2->id()).count(), 5);
 
     QVERIFY(scene->nodeIdFromObservable(observables.at(0)) == Qt3D::QNodeId());
 }
@@ -212,26 +212,26 @@ void tst_QScene::removeNodeObservable()
     scene->addObservable(node2);
 
     for (int i = 0; i < 5; i++)
-        scene->addObservable(observables.at(i), node1->uuid());
+        scene->addObservable(observables.at(i), node1->id());
 
     for (int i = 0; i < 5; i++)
-        scene->addObservable(observables.at(i + 5), node2->uuid());
+        scene->addObservable(observables.at(i + 5), node2->id());
 
-    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->uuid());
-    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->uuid());
+    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->id());
+    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->id());
 
     QCOMPARE(obs1.count(), 5);
     QCOMPARE(obs2.count(), obs1.count());
 
     scene->removeObservable(node1);
 
-    QVERIFY(scene->lookupNode(node1->uuid()) == Q_NULLPTR);
-    QVERIFY(scene->lookupObservables(node1->uuid()).empty());
+    QVERIFY(scene->lookupNode(node1->id()) == Q_NULLPTR);
+    QVERIFY(scene->lookupObservables(node1->id()).empty());
     QVERIFY(scene->nodeIdFromObservable(observables.at(0)) == Qt3D::QNodeId());
 
-    QVERIFY(scene->lookupNode(node2->uuid()) == node2);
-    QCOMPARE(scene->lookupObservables(node2->uuid()).count(), 5);
-    QVERIFY(scene->nodeIdFromObservable(observables.at(9)) == node2->uuid());
+    QVERIFY(scene->lookupNode(node2->id()) == node2);
+    QCOMPARE(scene->lookupObservables(node2->id()).count(), 5);
+    QVERIFY(scene->nodeIdFromObservable(observables.at(9)) == node2->id());
 }
 
 void tst_QScene::addChildNode()
@@ -252,11 +252,11 @@ void tst_QScene::addChildNode()
         nodes.append(child);
     }
 
-    QVERIFY(scene->lookupNode(root->uuid()) == root);
+    QVERIFY(scene->lookupNode(root->id()) == root);
     QCoreApplication::processEvents();
 
     Q_FOREACH (Qt3D::QNode *n, nodes) {
-        QVERIFY(scene->lookupNode(n->uuid()) == n);
+        QVERIFY(scene->lookupNode(n->id()) == n);
     }
 }
 
@@ -280,11 +280,11 @@ void tst_QScene::removeChildNode()
 
     while (!nodes.isEmpty()) {
         Qt3D::QNode *lst = nodes.takeLast();
-        QVERIFY(scene->lookupNode(lst->uuid()) == lst);
+        QVERIFY(scene->lookupNode(lst->id()) == lst);
         if (lst->parentNode() != Q_NULLPTR) {
             lst->setParent(Q_NULLPTR);
             QCoreApplication::processEvents();
-            QVERIFY(scene->lookupNode(lst->uuid()) == Q_NULLPTR);
+            QVERIFY(scene->lookupNode(lst->id()) == Q_NULLPTR);
         }
     }
 }
@@ -314,8 +314,8 @@ void tst_QScene::addEntityForComponent()
     }
 
     for (int i = 0; i < 10; i++) {
-        QList<Qt3D::QNodeId> uuids = scene->entitiesForComponent(components.at(i)->uuid());
-        QCOMPARE(uuids.count(), 10);
+        QList<Qt3D::QNodeId> ids = scene->entitiesForComponent(components.at(i)->id());
+        QCOMPARE(ids.count(), 10);
     }
 }
 
@@ -347,7 +347,7 @@ void tst_QScene::removeEntityForComponent()
         Qt3D::QEntity *e = entities.at(i);
         for (int j = 0; j < 10; j++) {
             e->removeComponent(components.at(j));
-            QCOMPARE(scene->entitiesForComponent(components.at(j)->uuid()).count(), 10 - (i + 1));
+            QCOMPARE(scene->entitiesForComponent(components.at(j)->id()).count(), 10 - (i + 1));
         }
     }
 }