diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-30 18:17:35 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-03 10:20:47 +0000 |
commit | 03d62618692f93dfc1aa53e7e2245177432c2604 (patch) | |
tree | 010e65930c0db7ddd2080686cc63017e42320be2 /src/input/backend/qabstractphysicaldevicebackendnode.cpp | |
parent | 23b668235c9b902a2577b3ac6e369b77974382b4 (diff) |
Remove QBackendNode::updateFromPeer()
Implemented a few missing initializeFromPeer() implementations along
with the corresponding frontend node creation change creation functions.
Adapted unit tests.
Change-Id: I571e53a7b68a5544bd0e308df0baf7e52533306e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/backend/qabstractphysicaldevicebackendnode.cpp')
-rw-r--r-- | src/input/backend/qabstractphysicaldevicebackendnode.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp index 9a33654fb..4b95d3e86 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp +++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp @@ -150,19 +150,20 @@ QAbstractPhysicalDeviceBackendNode::QAbstractPhysicalDeviceBackendNode(QAbstract { } -void QAbstractPhysicalDeviceBackendNode::updateFromPeer(Qt3DCore::QNode *peer) -{ - Q_D(QAbstractPhysicalDeviceBackendNode); - QAbstractPhysicalDevice *physicalDevice = static_cast<QAbstractPhysicalDevice *>(peer); - const auto axisSettings = physicalDevice->axisSettings(); - for (QAxisSetting *axisSetting : axisSettings) { - // Each axis setting can apply to more than one axis. If an axis is - // mentioned in more than one setting, we use the last one - const auto axisIds = variantListToVector(axisSetting->axes()); - for (int axisId : axisIds) - d->addAxisSetting(axisId, axisSetting->id()); - } -} +// TODO: Fold this into a job as described below +//void QAbstractPhysicalDeviceBackendNode::updateFromPeer(Qt3DCore::QNode *peer) +//{ +// Q_D(QAbstractPhysicalDeviceBackendNode); +// QAbstractPhysicalDevice *physicalDevice = static_cast<QAbstractPhysicalDevice *>(peer); +// const auto axisSettings = physicalDevice->axisSettings(); +// for (QAxisSetting *axisSetting : axisSettings) { +// // Each axis setting can apply to more than one axis. If an axis is +// // mentioned in more than one setting, we use the last one +// const auto axisIds = variantListToVector(axisSetting->axes()); +// for (int axisId : axisIds) +// d->addAxisSetting(axisId, axisSetting->id()); +// } +//} void QAbstractPhysicalDeviceBackendNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) { |