diff options
| author | Mike Krus <mike.krus@kdab.com> | 2016-05-01 19:28:19 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-02 21:36:49 +0000 |
| commit | 4a02cbc106cc447aa0bc72828690c01aa2406927 (patch) | |
| tree | e4da57d287215c6e2d7adb3d8515f6f41d189ad9 /src/plugins | |
| parent | 0a4c91e544608cd2e55c1a4f7834e832648f6674 (diff) | |
Fix CLANG reported warnings
Ignored 3rd party libraries
Change-Id: I20e1feac64a8fbfafc736b24d6d8c591192e817b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpio.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/gltf/gltfio.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpio.cpp b/src/plugins/sceneparsers/assimp/assimpio.cpp index eb13def2c..cbb94e347 100644 --- a/src/plugins/sceneparsers/assimp/assimpio.cpp +++ b/src/plugins/sceneparsers/assimp/assimpio.cpp @@ -465,7 +465,7 @@ Qt3DCore::QEntity *AssimpIO::node(aiNode *node) // Add Camera if (m_scene->m_cameras.contains(node)) - m_scene->m_cameras.value(node)->setParent(entityNode); + m_scene->m_cameras[node]->setParent(entityNode); // TO DO : Add lights .... diff --git a/src/plugins/sceneparsers/gltf/gltfio.cpp b/src/plugins/sceneparsers/gltf/gltfio.cpp index 5ffa11048..d2c400ca5 100644 --- a/src/plugins/sceneparsers/gltf/gltfio.cpp +++ b/src/plugins/sceneparsers/gltf/gltfio.cpp @@ -535,7 +535,7 @@ QMaterial *GLTFIO::materialWithCustomShader(const QString &id, const QJsonObject << "for material" << id << "in GLTF file" << m_basePath; return NULL; } - QTechnique *technique = m_techniques.value(techniqueName); + QTechnique *technique = m_techniques[techniqueName]; technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES); technique->graphicsApiFilter()->setMajorVersion(2); technique->graphicsApiFilter()->setMinorVersion(0); @@ -551,7 +551,7 @@ QMaterial *GLTFIO::materialWithCustomShader(const QString &id, const QJsonObject qCWarning(GLTFIOLog) << "unknown technique" << coreTechniqueName << "for material" << id << "in GLTF file" << m_basePath; } else { - coreTechnique = m_techniques.value(coreTechniqueName); + coreTechnique = m_techniques[coreTechniqueName]; coreTechnique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL); coreTechnique->graphicsApiFilter()->setMajorVersion(3); coreTechnique->graphicsApiFilter()->setMinorVersion(1); @@ -565,7 +565,7 @@ QMaterial *GLTFIO::materialWithCustomShader(const QString &id, const QJsonObject qCWarning(GLTFIOLog) << "unknown technique" << gl2TechniqueName << "for material" << id << "in GLTF file" << m_basePath; } else { - gl2Technique = m_techniques.value(gl2TechniqueName); + gl2Technique = m_techniques[gl2TechniqueName]; gl2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL); gl2Technique->graphicsApiFilter()->setMajorVersion(2); gl2Technique->graphicsApiFilter()->setMinorVersion(0); @@ -702,7 +702,7 @@ QMaterial *GLTFIO::commonMaterial(const QJsonObject &jsonObj) QMaterial* GLTFIO::material(const QString &id) { if (m_materialCache.contains(id)) - return m_materialCache.value(id); + return m_materialCache[id]; QJsonObject mats = m_json.object().value(KEY_MATERIALS).toObject(); if (!mats.contains(id)) { @@ -1245,7 +1245,7 @@ QVariant GLTFIO::parameterValueFromJSON(int type, const QJsonValue &value) const qCWarning(GLTFIOLog) << "unknown texture" << textureId; return QVariant(); } else { - return QVariant::fromValue(m_textures.value(textureId)); + return QVariant::fromValue(m_textures.value(textureId, nullptr)); } } } else if (value.isDouble()) { |