summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-25 12:58:21 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-25 13:41:45 +0100
commita10e61dce43a0e40b71648147651817953111cbb (patch)
tree8528b9c9e912e52bfd4135be21f13256d07ff500 /src/animation
parent00dc70ae70a6c001df15a46e4e9ed9d8f9736071 (diff)
Avoid initializing QFlags with 0 or nullptr
It is being deprecated. Change-Id: Idb6e794be1a26a3ca7c1d19ac1f47e4a0125f11b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/backend/channelmapping.cpp3
-rw-r--r--src/animation/frontend/qcallbackmapping.cpp1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/animation/backend/channelmapping.cpp b/src/animation/backend/channelmapping.cpp
index 42942fdd3..1e3aa76f0 100644
--- a/src/animation/backend/channelmapping.cpp
+++ b/src/animation/backend/channelmapping.cpp
@@ -59,7 +59,6 @@ ChannelMapping::ChannelMapping()
, m_componentCount(0)
, m_propertyName(nullptr)
, m_callback(nullptr)
- , m_callbackFlags(0)
, m_skeletonId()
, m_mappingType(MappingType::ChannelMappingType)
{
@@ -74,7 +73,7 @@ void ChannelMapping::cleanup()
m_propertyName = nullptr;
m_componentCount = 0;
m_callback = nullptr;
- m_callbackFlags = 0;
+ m_callbackFlags = {};
m_skeletonId = Qt3DCore::QNodeId();
}
diff --git a/src/animation/frontend/qcallbackmapping.cpp b/src/animation/frontend/qcallbackmapping.cpp
index 24b5d2e6e..a86785012 100644
--- a/src/animation/frontend/qcallbackmapping.cpp
+++ b/src/animation/frontend/qcallbackmapping.cpp
@@ -51,7 +51,6 @@ QCallbackMappingPrivate::QCallbackMappingPrivate()
, m_channelName()
, m_type(static_cast<int>(QVariant::Invalid))
, m_callback(nullptr)
- , m_callbackFlags(0)
{
m_mappingType = QChannelMappingCreatedChangeBase::CallbackMapping;
}