diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-13 08:17:16 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-14 08:34:37 +0000 |
commit | 1d4cafb00ef78494dea7d24bc3ec3f72edc0f78b (patch) | |
tree | 69ed8d57d54e7fcb31e50b6a23b60803eef62a25 | |
parent | 69d2b5719180095a1601d81ebc8ed7b81b08e58b (diff) |
LogicalDevice: use m_enabled member from QBackendNode
Change-Id: Ibc00f888187b65ce5b589061703466d51dc09561
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/input/backend/logicaldevice.cpp | 32 | ||||
-rw-r--r-- | src/input/backend/logicaldevice_p.h | 2 |
2 files changed, 13 insertions, 21 deletions
diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp index d3b1c6287..0b730a0f8 100644 --- a/src/input/backend/logicaldevice.cpp +++ b/src/input/backend/logicaldevice.cpp @@ -52,15 +52,13 @@ namespace Qt3DInput { namespace Input { LogicalDevice::LogicalDevice() - : QBackendNode(), - m_enabled(false) + : QBackendNode() { } void LogicalDevice::updateFromPeer(Qt3DCore::QNode *peer) { QLogicalDevice *device = static_cast<QLogicalDevice *>(peer); - m_enabled = device->isEnabled(); Q_FOREACH (QAxis *axis, device->axes()) m_axes.push_back(axis->id()); Q_FOREACH (QAction *action, device->actions()) @@ -71,14 +69,13 @@ void LogicalDevice::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr { const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QLogicalDeviceData>>(change); const auto &data = typedChange->data; - m_enabled = change->isNodeEnabled(); m_actions = data.actionIds; m_axes = data.axisIds; } void LogicalDevice::cleanup() { - m_enabled = false; + QBackendNode::setEnabled(false); m_actions.clear(); m_axes.clear(); } @@ -86,21 +83,18 @@ void LogicalDevice::cleanup() void LogicalDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); - if (e->type() == Qt3DCore::NodeUpdated) { - if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) { - m_enabled = propertyChange->value().toBool(); - } else if (e->type() == Qt3DCore::NodeAdded) { - if (propertyChange->propertyName() == QByteArrayLiteral("axis")) - m_axes.push_back(propertyChange->value().value<Qt3DCore::QNodeId>()); - else if (propertyChange->propertyName() == QByteArrayLiteral("action")) - m_actions.push_back(propertyChange->value().value<Qt3DCore::QNodeId>()); - } else if (e->type() == Qt3DCore::NodeRemoved) { - if (propertyChange->propertyName() == QByteArrayLiteral("axis")) - m_axes.removeOne(propertyChange->value().value<Qt3DCore::QNodeId>()); - else if (propertyChange->propertyName() == QByteArrayLiteral("action")) - m_actions.removeOne(propertyChange->value().value<Qt3DCore::QNodeId>()); - } + if (e->type() == Qt3DCore::NodeAdded) { + if (propertyChange->propertyName() == QByteArrayLiteral("axis")) + m_axes.push_back(propertyChange->value().value<Qt3DCore::QNodeId>()); + else if (propertyChange->propertyName() == QByteArrayLiteral("action")) + m_actions.push_back(propertyChange->value().value<Qt3DCore::QNodeId>()); + } else if (e->type() == Qt3DCore::NodeRemoved) { + if (propertyChange->propertyName() == QByteArrayLiteral("axis")) + m_axes.removeOne(propertyChange->value().value<Qt3DCore::QNodeId>()); + else if (propertyChange->propertyName() == QByteArrayLiteral("action")) + m_actions.removeOne(propertyChange->value().value<Qt3DCore::QNodeId>()); } + QBackendNode::sceneChangeEvent(e); } LogicalDeviceNodeFunctor::LogicalDeviceNodeFunctor(LogicalDeviceManager *manager) diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h index 426df9400..1c26361ba 100644 --- a/src/input/backend/logicaldevice_p.h +++ b/src/input/backend/logicaldevice_p.h @@ -68,7 +68,6 @@ public: LogicalDevice(); void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void cleanup(); - inline bool isEnabled() const { return m_enabled; } inline QVector<Qt3DCore::QNodeId> axes() const { return m_axes; } inline QVector<Qt3DCore::QNodeId> actions() const { return m_actions; } @@ -80,7 +79,6 @@ private: QVector<Qt3DCore::QNodeId> m_axes; QVector<Qt3DCore::QNodeId> m_actions; - bool m_enabled; }; |