QAxis: remove name property

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

6 files changed, 2 insertions, 61 deletions

diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp
index 9f041f829..6ab34fc25 100644
--- a/src/input/backend/axis.cpp
+++ b/src/input/backend/axis.cpp
@@ -60,7 +60,6 @@ void Axis::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QAxis *axis = static_cast<QAxis *>(peer);
     m_enabled = axis->isEnabled();
-    m_name = axis->name();
     Q_FOREACH (QAxisInput *input, axis->inputs())
         m_inputs.push_back(input->id());
 }
@@ -69,7 +68,6 @@ void Axis::cleanup()
 {
     m_enabled = false;
     m_inputs.clear();
-    m_name.clear();
     m_axisValue = 0.0f;
 }
 
@@ -93,8 +91,6 @@ void Axis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     if (e->type() == Qt3DCore::NodeUpdated) {
         if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) {
             m_enabled = propertyChange->value().toBool();
-        } else if (propertyChange->propertyName() == QByteArrayLiteral("name")) {
-            m_name = propertyChange->value().toString();
         }
     } else if (e->type() == Qt3DCore::NodeAdded) {
         if (propertyChange->propertyName() == QByteArrayLiteral("input"))
diff --git a/src/input/backend/axis_p.h b/src/input/backend/axis_p.h
index 8ba4d3b90..634631f45 100644
--- a/src/input/backend/axis_p.h
+++ b/src/input/backend/axis_p.h
@@ -69,13 +69,11 @@ public:
     inline bool isEnabled() const { return m_enabled; }
     inline QVector<Qt3DCore::QNodeId> inputs() const { return m_inputs; }
     inline float axisValue() const { return m_axisValue; }
-    inline QString name() const { return m_name; }
     void setAxisValue(float axisValue);
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     QVector<Qt3DCore::QNodeId> m_inputs;
-    QString m_name;
     bool m_enabled;
     float m_axisValue;
 };
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index 11a001594..b0e0efb0e 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -55,7 +55,6 @@ public:
 
     Q_DECLARE_PUBLIC(QAxis)
 
-    QString m_name;
     QVector<QAxisInput *> m_inputs;
     float m_value;
 
@@ -94,21 +93,6 @@ QAxis::~QAxis()
     QNode::cleanup();
 }
 
-void QAxis::setName(const QString &name)
-{
-    Q_D(QAxis);
-    if (d->m_name != name) {
-        d->m_name = name;
-        emit nameChanged(name);
-    }
-}
-
-QString QAxis::name() const
-{
-    Q_D(const QAxis);
-    return d->m_name;
-}
-
 void QAxis::addInput(QAxisInput *input)
 {
     Q_D(QAxis);
@@ -159,7 +143,6 @@ void QAxis::copy(const Qt3DCore::QNode *ref)
 {
     QNode::copy(ref);
     const QAxis *axis = static_cast<const QAxis *>(ref);
-    d_func()->m_name = axis->d_func()->m_name;
     Q_FOREACH (QAxisInput *input, axis->inputs())
         d_func()->m_inputs.append(qobject_cast<QAxisInput *>(QNode::clone(input)));
 
diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h
index dfe2c7617..89e8fed28 100644
--- a/src/input/frontend/qaxis.h
+++ b/src/input/frontend/qaxis.h
@@ -52,25 +52,18 @@ class QAxisInput;
 class QT3DINPUTSHARED_EXPORT QAxis : public Qt3DCore::QNode
 {
     Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(float value READ value NOTIFY valueChanged)
 public:
     explicit QAxis(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QAxis();
 
-    QString name() const;
-
     void addInput(QAxisInput *input);
     void removeInput(QAxisInput *input);
     QVector<QAxisInput *> inputs() const;
 
     float value() const;
 
-public Q_SLOTS:
-    void setName(const QString &name);
-
 Q_SIGNALS:
-    void nameChanged(const QString &name);
     void valueChanged(float value);
 
 protected:
diff --git a/tests/auto/input/axis/tst_axis.cpp b/tests/auto/input/axis/tst_axis.cpp
index 140b5730c..0795632fa 100644
--- a/tests/auto/input/axis/tst_axis.cpp
+++ b/tests/auto/input/axis/tst_axis.cpp
@@ -50,7 +50,6 @@ private Q_SLOTS:
         Qt3DInput::QAxisInput axisInput;
 
         axis.addInput(&axisInput);
-        axis.setName(QStringLiteral("L88"));
 
         // WHEN
         backendAxis.setPeer(&axis);
@@ -58,7 +57,6 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(backendAxis.peerUuid(), axis.id());
         QCOMPARE(backendAxis.isEnabled(), axis.isEnabled());
-        QCOMPARE(backendAxis.name(), axis.name());
         QCOMPARE(backendAxis.inputs().size(), axis.inputs().size());
 
         const int inputsCount = backendAxis.inputs().size();
@@ -75,7 +73,6 @@ private Q_SLOTS:
 
         // THEN
         QVERIFY(backendAxis.peerUuid().isNull());
-        QVERIFY(backendAxis.name().isEmpty());
         QCOMPARE(backendAxis.axisValue(), 0.0f);
         QCOMPARE(backendAxis.isEnabled(), false);
         QCOMPARE(backendAxis.inputs().size(), 0);
@@ -85,7 +82,6 @@ private Q_SLOTS:
         Qt3DInput::QAxisInput axisInput;
 
         axis.addInput(&axisInput);
-        axis.setName(QStringLiteral("L88"));
 
         // WHEN
         backendAxis.updateFromPeer(&axis);
@@ -94,7 +90,6 @@ private Q_SLOTS:
 
         // THEN
         QVERIFY(backendAxis.peerUuid().isNull());
-        QVERIFY(backendAxis.name().isEmpty());
         QCOMPARE(backendAxis.axisValue(), 0.0f);
         QCOMPARE(backendAxis.isEnabled(), false);
         QCOMPARE(backendAxis.inputs().size(), 0);
@@ -104,15 +99,7 @@ private Q_SLOTS:
     {
         // GIVEN
         Qt3DInput::Input::Axis backendAxis;
-
-        // WHEN
-        Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
-        updateChange->setValue(QStringLiteral("LT1"));
-        updateChange->setPropertyName("name");
-        backendAxis.sceneChangeEvent(updateChange);
-
-        // THEN
-        QCOMPARE(backendAxis.name(), QStringLiteral("LT1"));
+        Qt3DCore::QScenePropertyChangePtr updateChange;
 
         // WHEN
         updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp
index fc5481154..883237361 100644
--- a/tests/auto/input/qaxis/tst_qaxis.cpp
+++ b/tests/auto/input/qaxis/tst_qaxis.cpp
@@ -61,14 +61,12 @@ private Q_SLOTS:
         QTest::newRow("defaultConstructed") << defaultConstructed;
 
         Qt3DInput::QAxis *namedAxis = new Qt3DInput::QAxis();
-        namedAxis->setName(QStringLiteral("moveForward"));
         QTest::newRow("namedAxis") << namedAxis;
 
         Qt3DInput::QAxis *namedAxisWithInputs = new Qt3DInput::QAxis();
         Qt3DInput::QAxisInput *axisInput1 = new Qt3DInput::QAxisInput();
         Qt3DInput::QAxisInput *axisInput2 = new Qt3DInput::QAxisInput();
         Qt3DInput::QAxisInput *axisInput3 = new Qt3DInput::QAxisInput();
-        namedAxisWithInputs->setName("moveBackward");
         namedAxisWithInputs->addInput(axisInput1);
         namedAxisWithInputs->addInput(axisInput2);
         namedAxisWithInputs->addInput(axisInput3);
@@ -87,7 +85,6 @@ private Q_SLOTS:
         // THEN
         QVERIFY(clone != Q_NULLPTR);
         QCOMPARE(axis->id(), clone->id());
-        QCOMPARE(axis->name(), clone->name());
         QCOMPARE(axis->inputs().count(), clone->inputs().count());
         QCOMPARE(axis->value(), clone->value());
 
@@ -104,26 +101,13 @@ private Q_SLOTS:
         TestArbiter arbiter(axis.data());
 
         // WHEN
-        axis->setName(QStringLiteral("454"));
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "name");
-        QCOMPARE(change->value().toString(), QStringLiteral("454"));
-        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
-
-        arbiter.events.clear();
-
-        // WHEN
         Qt3DInput::QAxisInput *input = new Qt3DInput::QAxisInput();
         axis->addInput(input);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "input");
         QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), input->id());
         QCOMPARE(change->type(), Qt3DCore::NodeAdded);