QBackendNode::peerUuid() renamed to peerId()

Change-Id: I72471d0b22d16bbbee33610e30a06daadffedbd9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

10 files changed, 27 insertions, 27 deletions

diff --git a/tests/auto/input/action/tst_action.cpp b/tests/auto/input/action/tst_action.cpp
index c9162625b..c1612519b 100644
--- a/tests/auto/input/action/tst_action.cpp
+++ b/tests/auto/input/action/tst_action.cpp
@@ -55,7 +55,7 @@ private Q_SLOTS:
         backendAction.setPeer(&action);
 
         // THEN
-        QCOMPARE(backendAction.peerUuid(), action.id());
+        QCOMPARE(backendAction.peerId(), action.id());
         QCOMPARE(backendAction.isEnabled(), action.isEnabled());
         QCOMPARE(backendAction.inputs().size(), action.inputs().size());
 
@@ -72,7 +72,7 @@ private Q_SLOTS:
         Qt3DInput::Input::Action backendAction;
 
         // THEN
-        QVERIFY(backendAction.peerUuid().isNull());
+        QVERIFY(backendAction.peerId().isNull());
         QCOMPARE(backendAction.actionTriggered(), false);
         QCOMPARE(backendAction.isEnabled(), false);
         QCOMPARE(backendAction.inputs().size(), 0);
@@ -89,7 +89,7 @@ private Q_SLOTS:
         backendAction.cleanup();
 
         // THEN
-        QVERIFY(backendAction.peerUuid().isNull());
+        QVERIFY(backendAction.peerId().isNull());
         QCOMPARE(backendAction.actionTriggered(), false);
         QCOMPARE(backendAction.isEnabled(), false);
         QCOMPARE(backendAction.inputs().size(), 0);
diff --git a/tests/auto/input/axis/tst_axis.cpp b/tests/auto/input/axis/tst_axis.cpp
index 0795632fa..eb4b5789e 100644
--- a/tests/auto/input/axis/tst_axis.cpp
+++ b/tests/auto/input/axis/tst_axis.cpp
@@ -55,7 +55,7 @@ private Q_SLOTS:
         backendAxis.setPeer(&axis);
 
         // THEN
-        QCOMPARE(backendAxis.peerUuid(), axis.id());
+        QCOMPARE(backendAxis.peerId(), axis.id());
         QCOMPARE(backendAxis.isEnabled(), axis.isEnabled());
         QCOMPARE(backendAxis.inputs().size(), axis.inputs().size());
 
@@ -72,7 +72,7 @@ private Q_SLOTS:
         Qt3DInput::Input::Axis backendAxis;
 
         // THEN
-        QVERIFY(backendAxis.peerUuid().isNull());
+        QVERIFY(backendAxis.peerId().isNull());
         QCOMPARE(backendAxis.axisValue(), 0.0f);
         QCOMPARE(backendAxis.isEnabled(), false);
         QCOMPARE(backendAxis.inputs().size(), 0);
@@ -89,7 +89,7 @@ private Q_SLOTS:
         backendAxis.cleanup();
 
         // THEN
-        QVERIFY(backendAxis.peerUuid().isNull());
+        QVERIFY(backendAxis.peerId().isNull());
         QCOMPARE(backendAxis.axisValue(), 0.0f);
         QCOMPARE(backendAxis.isEnabled(), false);
         QCOMPARE(backendAxis.inputs().size(), 0);
diff --git a/tests/auto/input/axisinput/tst_axisinput.cpp b/tests/auto/input/axisinput/tst_axisinput.cpp
index 670a29ffa..a0025dade 100644
--- a/tests/auto/input/axisinput/tst_axisinput.cpp
+++ b/tests/auto/input/axisinput/tst_axisinput.cpp
@@ -69,7 +69,7 @@ private Q_SLOTS:
         backendAxisInput.setPeer(&axisInput);
 
         // THEN
-        QCOMPARE(backendAxisInput.peerUuid(), axisInput.id());
+        QCOMPARE(backendAxisInput.peerId(), axisInput.id());
         QCOMPARE(backendAxisInput.isEnabled(), axisInput.isEnabled());
         compareKeys(backendAxisInput.buttons(), axisInput.buttons());
         QCOMPARE(backendAxisInput.axis(), axisInput.axis());
@@ -83,7 +83,7 @@ private Q_SLOTS:
         Qt3DInput::Input::AxisInput backendAxisInput;
 
         // THEN
-        QVERIFY(backendAxisInput.peerUuid().isNull());
+        QVERIFY(backendAxisInput.peerId().isNull());
         QCOMPARE(backendAxisInput.scale(), 0.0f);
         QVERIFY(backendAxisInput.buttons().isEmpty());
         QCOMPARE(backendAxisInput.axis(), 0);
@@ -104,7 +104,7 @@ private Q_SLOTS:
         backendAxisInput.cleanup();
 
         // THEN
-        QVERIFY(backendAxisInput.peerUuid().isNull());
+        QVERIFY(backendAxisInput.peerId().isNull());
         QCOMPARE(backendAxisInput.scale(), 0.0f);
         QVERIFY(backendAxisInput.buttons().isEmpty());
         QCOMPARE(backendAxisInput.axis(), 0);
diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp
index cce07bd55..c2e186113 100644
--- a/tests/auto/render/attribute/tst_attribute.cpp
+++ b/tests/auto/render/attribute/tst_attribute.cpp
@@ -61,7 +61,7 @@ private Q_SLOTS:
         renderAttribute.setPeer(&attribute);
 
         // THEN
-        QCOMPARE(renderAttribute.peerUuid(), attribute.id());
+        QCOMPARE(renderAttribute.peerId(), attribute.id());
         QCOMPARE(renderAttribute.isDirty(), true);
         QCOMPARE(renderAttribute.vertexBaseType(), attribute.vertexBaseType());
         QCOMPARE(renderAttribute.vertexSize(), attribute.vertexSize());
@@ -82,7 +82,7 @@ private Q_SLOTS:
         renderAttribute.setRenderer(&renderer);
 
         // THEN
-        QVERIFY(renderAttribute.peerUuid().isNull());
+        QVERIFY(renderAttribute.peerId().isNull());
         QVERIFY(renderAttribute.bufferId().isNull());
         QVERIFY(renderAttribute.name().isEmpty());
         QCOMPARE(renderAttribute.isDirty(), false);
@@ -114,7 +114,7 @@ private Q_SLOTS:
         renderAttribute.cleanup();
 
         // THEN
-        QVERIFY(renderAttribute.peerUuid().isNull());
+        QVERIFY(renderAttribute.peerId().isNull());
         QVERIFY(renderAttribute.bufferId().isNull());
         QVERIFY(renderAttribute.name().isEmpty());
         QCOMPARE(renderAttribute.isDirty(), false);
diff --git a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp
index b3fba50f8..96305e8f7 100644
--- a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp
+++ b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp
@@ -50,7 +50,7 @@ private Q_SLOTS:
         boundingVolumeDebug.setPeer(&fbvH);
 
         // THEN
-        QVERIFY(!boundingVolumeDebug.peerUuid().isNull());
+        QVERIFY(!boundingVolumeDebug.peerId().isNull());
         QCOMPARE(boundingVolumeDebug.isRecursive(), true);
     }
 
@@ -60,7 +60,7 @@ private Q_SLOTS:
         Qt3DRender::Render::BoundingVolumeDebug boundingVolumeDebug;
 
         // THEN
-        QVERIFY(boundingVolumeDebug.peerUuid().isNull());
+        QVERIFY(boundingVolumeDebug.peerId().isNull());
         QCOMPARE(boundingVolumeDebug.isRecursive(), false);
         QCOMPARE(boundingVolumeDebug.radius(), 0.0f);
         QCOMPARE(boundingVolumeDebug.center(), QVector3D());
@@ -76,7 +76,7 @@ private Q_SLOTS:
         boundingVolumeDebug.cleanup();
 
         // THEN
-        QVERIFY(boundingVolumeDebug.peerUuid().isNull());
+        QVERIFY(boundingVolumeDebug.peerId().isNull());
         QCOMPARE(boundingVolumeDebug.isRecursive(), false);
         QCOMPARE(boundingVolumeDebug.radius(), 0.0f);
         QCOMPARE(boundingVolumeDebug.center(), QVector3D());
diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp
index a0ade76f3..b95b214d8 100644
--- a/tests/auto/render/buffer/tst_buffer.cpp
+++ b/tests/auto/render/buffer/tst_buffer.cpp
@@ -77,7 +77,7 @@ private Q_SLOTS:
         renderBuffer.setPeer(&buffer);
 
         // THEN
-        QCOMPARE(renderBuffer.peerUuid(), buffer.id());
+        QCOMPARE(renderBuffer.peerId(), buffer.id());
         QCOMPARE(renderBuffer.isDirty(), true);
         QCOMPARE(renderBuffer.type(), buffer.type());
         QCOMPARE(renderBuffer.usage(), buffer.usage());
@@ -96,7 +96,7 @@ private Q_SLOTS:
         QCOMPARE(renderBuffer.type(), Qt3DRender::QBuffer::VertexBuffer);
         QCOMPARE(renderBuffer.usage(), Qt3DRender::QBuffer::StaticDraw);
         QVERIFY(renderBuffer.data().isEmpty());
-        QVERIFY(renderBuffer.peerUuid().isNull());
+        QVERIFY(renderBuffer.peerId().isNull());
         QVERIFY(renderBuffer.bufferFunctor().isNull());
 
         // GIVEN
diff --git a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
index faa89567e..33e9e31ad 100644
--- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
+++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
@@ -52,7 +52,7 @@ public:
 
     void setIdInternal(Qt3DRender::Render::FrameGraphNode *node, Qt3DCore::QNodeId id)
     {
-        Qt3DCore::QBackendNodePrivate::get(node)->m_peerUuid = id;
+        Qt3DCore::QBackendNodePrivate::get(node)->m_peerId = id;
     }
 
 private Q_SLOTS:
@@ -65,7 +65,7 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(n.nodeType(), Qt3DRender::Render::FrameGraphNode::InvalidNodeType);
         QVERIFY(n.isEnabled());
-        QVERIFY(n.peerUuid().isNull());
+        QVERIFY(n.peerId().isNull());
         QVERIFY(n.manager() == Q_NULLPTR);
         QVERIFY(n.parentId().isNull());
         QVERIFY(n.childrenIds().empty());
diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp
index 79ed7a940..91a2b5fcf 100644
--- a/tests/auto/render/geometry/tst_geometry.cpp
+++ b/tests/auto/render/geometry/tst_geometry.cpp
@@ -61,7 +61,7 @@ private Q_SLOTS:
         renderGeometry.setPeer(&geometry);
 
         // THEN
-        QCOMPARE(renderGeometry.peerUuid(), geometry.id());
+        QCOMPARE(renderGeometry.peerId(), geometry.id());
         QCOMPARE(renderGeometry.isDirty(), true);
         QCOMPARE(renderGeometry.attributes().count(), 4);
         QCOMPARE(renderGeometry.verticesPerPatch(), 4);
@@ -79,7 +79,7 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(renderGeometry.isDirty(), false);
         QVERIFY(renderGeometry.attributes().isEmpty());
-        QVERIFY(renderGeometry.peerUuid().isNull());
+        QVERIFY(renderGeometry.peerId().isNull());
         QCOMPARE(renderGeometry.verticesPerPatch(), 0);
         QCOMPARE(renderGeometry.boundingPositionAttribute(), Qt3DCore::QNodeId());
 
diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
index 07f94c08f..ab883f6d9 100644
--- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
+++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
@@ -87,7 +87,7 @@ private Q_SLOTS:
         renderGeometryRenderer.setPeer(&geometryRenderer);
 
         // THEN
-        QCOMPARE(renderGeometryRenderer.peerUuid(), geometryRenderer.id());
+        QCOMPARE(renderGeometryRenderer.peerId(), geometryRenderer.id());
         QCOMPARE(renderGeometryRenderer.isDirty(), true);
         QCOMPARE(renderGeometryRenderer.instanceCount(), geometryRenderer.instanceCount());
         QCOMPARE(renderGeometryRenderer.primitiveCount(), geometryRenderer.primitiveCount());
@@ -108,7 +108,7 @@ private Q_SLOTS:
         Qt3DRender::Render::GeometryRenderer renderGeometryRenderer;
 
         // THEN
-        QVERIFY(renderGeometryRenderer.peerUuid().isNull());
+        QVERIFY(renderGeometryRenderer.peerId().isNull());
         QVERIFY(renderGeometryRenderer.geometryId().isNull());
         QCOMPARE(renderGeometryRenderer.isDirty(), false);
         QCOMPARE(renderGeometryRenderer.instanceCount(), 0);
@@ -143,7 +143,7 @@ private Q_SLOTS:
         renderGeometryRenderer.cleanup();
 
         // THEN
-        QVERIFY(renderGeometryRenderer.peerUuid().isNull());
+        QVERIFY(renderGeometryRenderer.peerId().isNull());
         QVERIFY(renderGeometryRenderer.geometryId().isNull());
         QCOMPARE(renderGeometryRenderer.isDirty(), false);
         QCOMPARE(renderGeometryRenderer.instanceCount(), 0);
diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp
index 4e911a935..dc3bc33de 100644
--- a/tests/auto/render/objectpicker/tst_objectpicker.cpp
+++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp
@@ -51,7 +51,7 @@ private Q_SLOTS:
         objectPicker.setPeer(&picker);
 
         // THEN
-        QVERIFY(!objectPicker.peerUuid().isNull());
+        QVERIFY(!objectPicker.peerId().isNull());
         QCOMPARE(objectPicker.isHoverEnabled(), true);
         QCOMPARE(objectPicker.isDirty(), true);
     }
@@ -62,7 +62,7 @@ private Q_SLOTS:
         Qt3DRender::Render::ObjectPicker objectPicker;
 
         // THEN
-        QVERIFY(objectPicker.peerUuid().isNull());
+        QVERIFY(objectPicker.peerId().isNull());
         QCOMPARE(objectPicker.isHoverEnabled(), false);
         QCOMPARE(objectPicker.isDirty(), false);
 
@@ -75,7 +75,7 @@ private Q_SLOTS:
         objectPicker.cleanup();
 
         // THEN
-        QVERIFY(objectPicker.peerUuid().isNull());
+        QVERIFY(objectPicker.peerId().isNull());
         QCOMPARE(objectPicker.isHoverEnabled(), false);
         QCOMPARE(objectPicker.isDirty(), false);
     }