Remove anything related to pick attribute in QObjectPicker

Change-Id: I5a25c97841854bd231af0600ecfe08ff4c056de1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

3 files changed, 1 insertions, 52 deletions

diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp
index 08c726c41..ce0314ef8 100644
--- a/tests/auto/render/objectpicker/tst_objectpicker.cpp
+++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp
@@ -37,7 +37,6 @@
 #include <QtTest/QTest>
 #include <Qt3DRender/private/objectpicker_p.h>
 #include <Qt3DRender/qobjectpicker.h>
-#include <Qt3DRender/qattribute.h>
 #include <Qt3DCore/private/qbackendnode_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include "testpostmanarbiter.h"
@@ -52,16 +51,13 @@ private Q_SLOTS:
         // GIVEN
         Qt3DRender::Render::ObjectPicker objectPicker;
         Qt3DRender::QObjectPicker picker;
-        Qt3DRender::QAttribute attr;
         picker.setHoverEnabled(true);
-        picker.setPickAttribute(&attr);
 
         // WHEN
         objectPicker.setPeer(&picker);
 
         // THEN
         QVERIFY(!objectPicker.peerUuid().isNull());
-        QVERIFY(!objectPicker.pickAttributeId().isNull());
         QCOMPARE(objectPicker.hoverEnabled(), true);
         QCOMPARE(objectPicker.isDirty(), true);
     }
@@ -73,15 +69,12 @@ private Q_SLOTS:
 
         // THEN
         QVERIFY(objectPicker.peerUuid().isNull());
-        QVERIFY(objectPicker.pickAttributeId().isNull());
         QCOMPARE(objectPicker.hoverEnabled(), false);
         QCOMPARE(objectPicker.isDirty(), false);
 
         // GIVEN
         Qt3DRender::QObjectPicker picker;
-        Qt3DRender::QAttribute attr;
         picker.setHoverEnabled(true);
-        picker.setPickAttribute(&attr);
 
         // WHEN
         objectPicker.updateFromPeer(&picker);
@@ -89,7 +82,6 @@ private Q_SLOTS:
 
         // THEN
         QVERIFY(objectPicker.peerUuid().isNull());
-        QVERIFY(objectPicker.pickAttributeId().isNull());
         QCOMPARE(objectPicker.hoverEnabled(), false);
         QCOMPARE(objectPicker.isDirty(), false);
     }
@@ -113,20 +105,6 @@ private Q_SLOTS:
 
         objectPicker.unsetDirty();
         QVERIFY(!objectPicker.isDirty());
-
-        // WHEN
-        Qt3DRender::QAttribute attr;
-        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
-        updateChange->setValue(QVariant::fromValue(attr.id()));
-        updateChange->setPropertyName("pickAttribute");
-        objectPicker.sceneChangeEvent(updateChange);
-
-        // THEN
-        QCOMPARE(objectPicker.pickAttributeId(), attr.id());
-        QVERIFY(objectPicker.isDirty());
-
-        objectPicker.unsetDirty();
-        QVERIFY(!objectPicker.isDirty());
     }
 
     void checkBackendPropertyNotifications()
diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp
index 90d059cd2..42e7bd49e 100644
--- a/tests/auto/render/picking/tst_picking.cpp
+++ b/tests/auto/render/picking/tst_picking.cpp
@@ -93,8 +93,6 @@ public:
         const QByteArray data = (*vertexBuffer->bufferFunctor())();
         vertexBuffer->setData(data);
 
-        picker->setPickAttribute(positionAttr);
-
         translate->setTranslation(position);
         transform->addTransform(translate);
 
diff --git a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
index db5f1aee6..a5d98d1f9 100644
--- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
+++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
@@ -40,7 +40,6 @@
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qbackendscenepropertychange.h>
 #include <Qt3DRender/QObjectPicker>
-#include <Qt3DRender/QAttribute>
 #include <Qt3DRender/QPickEvent>
 
 #include "testpostmanarbiter.h"
@@ -71,7 +70,6 @@ class tst_QObjectPicker : public Qt3DCore::QNode
 public:
     tst_QObjectPicker()
     {
-        qRegisterMetaType<Qt3DRender::QAttribute*>("Qt3DRender::QAttribute*");
         qRegisterMetaType<Qt3DRender::QPickEvent*>("Qt3DRender::QPickEvent*");
     }
 
@@ -91,11 +89,6 @@ private Q_SLOTS:
         objectPicker = new Qt3DRender::QObjectPicker();
         objectPicker->setHoverEnabled(true);
         QTest::newRow("objectPicker_all_true") << objectPicker;
-        objectPicker = new Qt3DRender::QObjectPicker();
-        Qt3DRender::QAttribute *attr = new Qt3DRender::QAttribute();
-        objectPicker->setPickAttribute(attr);
-        QTest::newRow("objectPicker_withAttribute") << objectPicker;
-
     }
 
     void checkCloning()
@@ -113,11 +106,6 @@ private Q_SLOTS:
         QCOMPARE(objectPicker->hoverEnabled(), clone->hoverEnabled());
         QCOMPARE(objectPicker->isPressed(), clone->isPressed());
         QCOMPARE(objectPicker->containsMouse(), clone->containsMouse());
-
-        if (objectPicker->pickAttribute()) {
-            QVERIFY(clone->pickAttribute());
-            QCOMPARE(clone->pickAttribute()->id(), objectPicker->pickAttribute()->id());
-        }
     }
 
     void checkPropertyUpdates()
@@ -127,32 +115,17 @@ private Q_SLOTS:
         TestArbiter arbiter(objectPicker.data());
 
         // WHEN
-        Qt3DRender::QAttribute *attr = new Qt3DRender::QAttribute();
-        objectPicker->setPickAttribute(attr);
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "pickAttribute");
-        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), attr->id());
-        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
-
-        arbiter.events.clear();
-
-        // WHEN
         objectPicker->setHoverEnabled(true);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "hoverEnabled");
         QCOMPARE(change->value().toBool(), true);
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
-
     }
 
     void checkBackendUpdates_data()