diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 10:32:13 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-12-06 09:05:42 +0100 |
commit | 9f3ebe697d09dca60fb870f128e26623f9f2a931 (patch) | |
tree | 633ae10499eb7a7278ff0448dd0078584853641a /src/animation | |
parent | 037a549902dee87fe6ccb50995351f37543fec98 (diff) |
Fix usages of text stream operators
Change-Id: I8f3fe9475749f10f33c8eb750befa8845ccc37d6
(cherry picked from commit 58db7d01e0d424fdf46baa70e2e41b8009429c78)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/animation')
-rw-r--r-- | src/animation/backend/animationclip_p.h | 8 | ||||
-rw-r--r-- | src/animation/backend/animationutils_p.h | 10 | ||||
-rw-r--r-- | src/animation/backend/fcurve_p.h | 14 | ||||
-rw-r--r-- | src/animation/backend/gltfimporter.cpp | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/animation/backend/animationclip_p.h b/src/animation/backend/animationclip_p.h index 22f589f72..ce97ef2c7 100644 --- a/src/animation/backend/animationclip_p.h +++ b/src/animation/backend/animationclip_p.h @@ -129,10 +129,10 @@ private: inline QDebug operator<<(QDebug dbg, const AnimationClip &animationClip) { QDebugStateSaver saver(dbg); - dbg << "QNodeId =" << animationClip.peerId() << endl - << "Name =" << animationClip.name() << endl - << "Duration: " << animationClip.duration() << endl - << "Channels:" << endl; + dbg << "QNodeId =" << animationClip.peerId() << Qt::endl + << "Name =" << animationClip.name() << Qt::endl + << "Duration: " << animationClip.duration() << Qt::endl + << "Channels:" << Qt::endl; const QVector<Channel> channels = animationClip.channels(); for (const auto &channel : channels) { diff --git a/src/animation/backend/animationutils_p.h b/src/animation/backend/animationutils_p.h index eab15f0e5..8c71e704a 100644 --- a/src/animation/backend/animationutils_p.h +++ b/src/animation/backend/animationutils_p.h @@ -98,10 +98,10 @@ struct MappingData inline QDebug operator<<(QDebug dbg, const MappingData &mapping) { QDebugStateSaver saver(dbg); - dbg << "targetId =" << mapping.targetId << endl - << "jointIndex =" << mapping.jointIndex << endl - << "jointTransformComponent: " << mapping.jointTransformComponent << endl - << "propertyName:" << mapping.propertyName << endl + dbg << "targetId =" << mapping.targetId << Qt::endl + << "jointIndex =" << mapping.jointIndex << Qt::endl + << "jointTransformComponent: " << mapping.jointTransformComponent << Qt::endl + << "propertyName:" << mapping.propertyName << Qt::endl << "channelIndices:" << mapping.channelIndices; return dbg; } @@ -251,7 +251,7 @@ inline QDebug operator<<(QDebug dbg, const ClipFormat &format) dbg << format.sourceClipIndices[j] << ""; dbg << "src clip mask =" << format.sourceClipMask[i]; - dbg << endl; + dbg << Qt::endl; sourceIndex += componentCount; } return dbg; diff --git a/src/animation/backend/fcurve_p.h b/src/animation/backend/fcurve_p.h index 935db5922..4c5cfb351 100644 --- a/src/animation/backend/fcurve_p.h +++ b/src/animation/backend/fcurve_p.h @@ -101,7 +101,7 @@ private: inline QDebug operator<<(QDebug dbg, const FCurve &fcurve) { QDebugStateSaver saver(dbg); - dbg << "Keyframe Count = " << fcurve.keyframeCount() << endl; + dbg << "Keyframe Count = " << fcurve.keyframeCount() << Qt::endl; for (int i = 0; i < fcurve.keyframeCount(); ++i) { const Keyframe &kf = fcurve.keyframe(i); switch (kf.interpolation) { @@ -110,14 +110,14 @@ inline QDebug operator<<(QDebug dbg, const FCurve &fcurve) << ", value = " << kf.value << ", leftHandle = " << kf.leftControlPoint << ", rightHandle = " << kf.rightControlPoint - << endl; + << Qt::endl; break; } case QKeyFrame::ConstantInterpolation: case QKeyFrame::LinearInterpolation: { dbg << "t = " << fcurve.localTime(i) << ", value = " << kf.value - << endl; + << Qt::endl; break; } } @@ -139,8 +139,8 @@ struct ChannelComponent inline QDebug operator<<(QDebug dbg, const ChannelComponent &channelComponent) { QDebugStateSaver saver(dbg); - dbg << "Channel Component Name: " << channelComponent.name << endl - << "FCurve:" << channelComponent.fcurve << endl; + dbg << "Channel Component Name: " << channelComponent.name << Qt::endl + << "FCurve:" << channelComponent.fcurve << Qt::endl; return dbg; } #endif @@ -159,8 +159,8 @@ struct Channel inline QDebug operator<<(QDebug dbg, const Channel &channel) { QDebugStateSaver saver(dbg); - dbg << "Channel Name: " << channel.name << endl - << "Channels:" << channel.channelComponents.size() << endl; + dbg << "Channel Name: " << channel.name << Qt::endl + << "Channels:" << channel.channelComponents.size() << Qt::endl; for (const auto &channelComponent : qAsConst(channel.channelComponents)) { dbg << channelComponent; diff --git a/src/animation/backend/gltfimporter.cpp b/src/animation/backend/gltfimporter.cpp index 01ccf159d..a5127efd0 100644 --- a/src/animation/backend/gltfimporter.cpp +++ b/src/animation/backend/gltfimporter.cpp @@ -515,7 +515,7 @@ GLTFImporter::AnimationNameAndChannels GLTFImporter::createAnimationData(int ani const auto interpolationType = gltfToQKeyFrameInterpolation(sampler.interpolationMode); if (sampler.inputAccessorIndex == -1 || sampler.outputAccessorIndex == -1) { - qWarning() << "Skipping channel due to invalid accessor indices in the sampler" << endl; + qWarning() << "Skipping channel due to invalid accessor indices in the sampler" << Qt::endl; continue; } |