diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-03-28 10:09:34 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-05-10 10:10:14 +0000 |
| commit | 7a310b1f813e3f3c2759c7b316ed9af30f57d5cd (patch) | |
| tree | 18e7d1b8bc95abd018ed75e3e6aef8248ff236d5 /src/animation/backend/channelmapping.cpp | |
| parent | f15623b689b43ad0799fe9515b8032418cf724d6 (diff) | |
QChannelMapping: only send const char *propertyName to backend
It was otherwise sending a QString property as well as the
const char *propertyName. Given only propertyName is actually used,
remove QString property from the backend to avoid useless confusion
and stop sending the notification change.
Change-Id: Ie26771e320e26d44d7fce3e0a864bad1d4df558f
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/animation/backend/channelmapping.cpp')
| -rw-r--r-- | src/animation/backend/channelmapping.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/animation/backend/channelmapping.cpp b/src/animation/backend/channelmapping.cpp index d8572a074..2323182c6 100644 --- a/src/animation/backend/channelmapping.cpp +++ b/src/animation/backend/channelmapping.cpp @@ -53,7 +53,6 @@ ChannelMapping::ChannelMapping() : BackendNode(ReadOnly) , m_channelName() , m_targetId() - , m_property() , m_type(static_cast<int>(QVariant::Invalid)) , m_componentCount(0) , m_propertyName(nullptr) @@ -73,7 +72,6 @@ void ChannelMapping::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePt const auto &data = typedChange->data; m_channelName = data.channelName; m_targetId = data.targetId; - m_property = data.property; m_type = data.type; m_componentCount = data.componentCount; m_propertyName = data.propertyName; @@ -107,7 +105,6 @@ void ChannelMapping::cleanup() setEnabled(false); m_channelName.clear(); m_targetId = Qt3DCore::QNodeId(); - m_property.clear(); m_type = static_cast<int>(QVariant::Invalid); m_propertyName = nullptr; m_componentCount = 0; @@ -125,8 +122,6 @@ void ChannelMapping::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) m_channelName = change->value().toString(); else if (change->propertyName() == QByteArrayLiteral("target")) m_targetId = change->value().value<Qt3DCore::QNodeId>(); - else if (change->propertyName() == QByteArrayLiteral("property")) - m_property = change->value().toString(); else if (change->propertyName() == QByteArrayLiteral("type")) m_type = change->value().toInt(); else if (change->propertyName() == QByteArrayLiteral("propertyName")) |