diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-29 19:35:20 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 15:43:11 +0000 |
commit | a01b14670e5b35a951ec57297613418dc829d65c (patch) | |
tree | d9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /tools | |
parent | f9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff) |
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qgltf/qgltf.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp index 56ef71d7d..3d4c1a420 100644 --- a/tools/qgltf/qgltf.cpp +++ b/tools/qgltf/qgltf.cpp @@ -186,7 +186,7 @@ Assimp::IOStream *AssimpIOSystem::Open(const char *pFile, const char *pMode) if (file->open(openMode)) return new AssimpIOStream(file.take()); - return Q_NULLPTR; + return nullptr; } void AssimpIOSystem::Close(Assimp::IOStream *pFile) @@ -354,7 +354,7 @@ protected: }; Importer::Importer() - : m_rootNode(Q_NULLPTR) + : m_rootNode(nullptr) { } @@ -472,7 +472,7 @@ const Importer::Node *Importer::findNode(const Node *root, const QString &origin if (cn) return cn; } - return Q_NULLPTR; + return nullptr; } class AssimpImporter : public Importer @@ -1096,19 +1096,19 @@ void AssimpImporter::parseAnimations() float t = float(a->mPositionKeys[kf].mTime); aiVector3D v = a->mPositionKeys[kf].mValue; animInfo.hasTranslation = true; - addKeyFrame(keyFrames, t, &v, Q_NULLPTR, Q_NULLPTR); + addKeyFrame(keyFrames, t, &v, nullptr, nullptr); } for (uint kf = 0; kf < a->mNumRotationKeys; ++kf) { float t = float(a->mRotationKeys[kf].mTime); aiQuaternion v = a->mRotationKeys[kf].mValue; animInfo.hasRotation = true; - addKeyFrame(keyFrames, t, Q_NULLPTR, &v, Q_NULLPTR); + addKeyFrame(keyFrames, t, nullptr, &v, nullptr); } for (uint kf = 0; kf < a->mNumScalingKeys; ++kf) { float t = float(a->mScalingKeys[kf].mTime); aiVector3D v = a->mScalingKeys[kf].mValue; animInfo.hasScale = true; - addKeyFrame(keyFrames, t, Q_NULLPTR, Q_NULLPTR, &v); + addKeyFrame(keyFrames, t, nullptr, nullptr, &v); } // Here we should ideally get rid of non-animated properties (that @@ -1282,7 +1282,7 @@ private: QVector<ProgramInfo> m_progs; struct TechniqueInfo { - TechniqueInfo() : opaque(true), prog(Q_NULLPTR) { } + TechniqueInfo() : opaque(true), prog(nullptr) { } TechniqueInfo(const QString &name, bool opaque, ProgramInfo *prog) : name(name) , opaque(opaque) |