summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-07-11 10:32:13 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-12-06 09:05:42 +0100
commit9f3ebe697d09dca60fb870f128e26623f9f2a931 (patch)
tree633ae10499eb7a7278ff0448dd0078584853641a
parent037a549902dee87fe6ccb50995351f37543fec98 (diff)
downloadqt3d-9f3ebe697d09dca60fb870f128e26623f9f2a931.tar.gz
Fix usages of text stream operators
Change-Id: I8f3fe9475749f10f33c8eb750befa8845ccc37d6 (cherry picked from commit 58db7d01e0d424fdf46baa70e2e41b8009429c78) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/animation/backend/animationclip_p.h8
-rw-r--r--src/animation/backend/animationutils_p.h10
-rw-r--r--src/animation/backend/fcurve_p.h14
-rw-r--r--src/animation/backend/gltfimporter.cpp2
-rw-r--r--src/core/resources/qresourcemanager_p.h8
-rw-r--r--src/core/transforms/matrix4x4_avx2.cpp10
-rw-r--r--src/core/transforms/matrix4x4_sse.cpp10
-rw-r--r--src/render/geometry/skeleton_p.h4
-rw-r--r--src/render/materialsystem/shader_p.h2
-rw-r--r--src/render/texture/texture_p.h2
-rw-r--r--src/render/texture/textureimage_p.h2
11 files changed, 36 insertions, 36 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;
}
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index b3837fb1f..ba39695a4 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -476,14 +476,14 @@ template <typename ValueType, typename KeyType,
QDebug operator<<(QDebug dbg, const QResourceManager<ValueType, KeyType, LockingPolicy> &manager)
{
QDebugStateSaver saver(dbg);
- dbg << "Contains" << manager.count() << "items" << endl;
+ dbg << "Contains" << manager.count() << "items" << Qt::endl;
- dbg << "Key to Handle Map:" << endl;
+ dbg << "Key to Handle Map:" << Qt::endl;
const auto end = manager.m_keyToHandleMap.cend();
for (auto it = manager.m_keyToHandleMap.cbegin(); it != end; ++it)
- dbg << "QNodeId =" << it.key() << "Handle =" << it.value() << endl;
+ dbg << "QNodeId =" << it.key() << "Handle =" << it.value() << Qt::endl;
-// dbg << "Resources:" << endl;
+// dbg << "Resources:" << Qt::endl;
// dbg << manager.m_handleManager;
return dbg;
}
diff --git a/src/core/transforms/matrix4x4_avx2.cpp b/src/core/transforms/matrix4x4_avx2.cpp
index 556e778d0..a06a59a99 100644
--- a/src/core/transforms/matrix4x4_avx2.cpp
+++ b/src/core/transforms/matrix4x4_avx2.cpp
@@ -47,12 +47,12 @@ namespace Qt3DCore {
QDebug operator<<(QDebug dbg, const Matrix4x4_AVX2 &m)
{
- dbg.nospace() << "Matrix4x4_AVX2(" << endl
+ dbg.nospace() << "Matrix4x4_AVX2(" << Qt::endl
<< qSetFieldWidth(10)
- << m.m11() << m.m12() << m.m13() << m.m14() << endl
- << m.m21() << m.m22() << m.m23() << m.m24() << endl
- << m.m31() << m.m32() << m.m33() << m.m34() << endl
- << m.m41() << m.m42() << m.m43() << m.m44() << endl
+ << m.m11() << m.m12() << m.m13() << m.m14() << Qt::endl
+ << m.m21() << m.m22() << m.m23() << m.m24() << Qt::endl
+ << m.m31() << m.m32() << m.m33() << m.m34() << Qt::endl
+ << m.m41() << m.m42() << m.m43() << m.m44() << Qt::endl
<< qSetFieldWidth(0) << ')';
return dbg;
}
diff --git a/src/core/transforms/matrix4x4_sse.cpp b/src/core/transforms/matrix4x4_sse.cpp
index d35cc2e35..bc8c57b9d 100644
--- a/src/core/transforms/matrix4x4_sse.cpp
+++ b/src/core/transforms/matrix4x4_sse.cpp
@@ -47,12 +47,12 @@ namespace Qt3DCore {
QDebug operator<<(QDebug dbg, const Matrix4x4_SSE &m)
{
- dbg.nospace() << "Matrix4x4_SSE(" << endl
+ dbg.nospace() << "Matrix4x4_SSE(" << Qt::endl
<< qSetFieldWidth(10)
- << m.m11() << m.m12() << m.m13() << m.m14() << endl
- << m.m21() << m.m22() << m.m23() << m.m24() << endl
- << m.m31() << m.m32() << m.m33() << m.m34() << endl
- << m.m41() << m.m42() << m.m43() << m.m44() << endl
+ << m.m11() << m.m12() << m.m13() << m.m14() << Qt::endl
+ << m.m21() << m.m22() << m.m23() << m.m24() << Qt::endl
+ << m.m31() << m.m32() << m.m33() << m.m34() << Qt::endl
+ << m.m41() << m.m42() << m.m43() << m.m44() << Qt::endl
<< qSetFieldWidth(0) << ')';
return dbg;
}
diff --git a/src/render/geometry/skeleton_p.h b/src/render/geometry/skeleton_p.h
index eb9551f07..7a5299944 100644
--- a/src/render/geometry/skeleton_p.h
+++ b/src/render/geometry/skeleton_p.h
@@ -151,8 +151,8 @@ private:
inline QDebug operator<<(QDebug dbg, const Skeleton &skeleton)
{
QDebugStateSaver saver(dbg);
- dbg << "QNodeId =" << skeleton.peerId() << endl
- << "Name =" << skeleton.name() << endl;
+ dbg << "QNodeId =" << skeleton.peerId() << Qt::endl
+ << "Name =" << skeleton.name() << Qt::endl;
return dbg;
}
#endif
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index fe1a401d9..1c9731e50 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -176,7 +176,7 @@ private:
inline QDebug operator<<(QDebug dbg, const Shader &shader)
{
QDebugStateSaver saver(dbg);
- dbg << "QNodeId =" << shader.peerId() << "dna =" << shader.dna() << endl;
+ dbg << "QNodeId =" << shader.peerId() << "dna =" << shader.dna() << Qt::endl;
return dbg;
}
#endif
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index 9e347243e..83a05ebcc 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -204,7 +204,7 @@ private:
inline QDebug operator<<(QDebug dbg, const Texture &texture)
{
QDebugStateSaver saver(dbg);
- dbg << "QNodeId =" << texture.peerId() << "imageCount =" << texture.textureImageIds().size() << endl;
+ dbg << "QNodeId =" << texture.peerId() << "imageCount =" << texture.textureImageIds().size() << Qt::endl;
return dbg;
}
#endif
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index 57bbdea75..ced8f1ad2 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -117,7 +117,7 @@ inline QDebug operator<<(QDebug dbg, const TextureImage &textureImage)
<< "mip level =" << textureImage.mipLevel()
<< "layer =" << textureImage.layer()
<< "cube face =" << textureImage.face()
- << "dataGenerator =" << textureImage.dataGenerator() << endl;
+ << "dataGenerator =" << textureImage.dataGenerator() << Qt::endl;
return dbg;
}
#endif