diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-01-09 11:36:39 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-01-14 06:18:58 +0000 |
commit | df5a63b059956e8a717db9110327cc86612cc934 (patch) | |
tree | 8fb9afc3515b99083df0f508448f5a9417181c6b /src/render/materialsystem/shaderbuilder.cpp | |
parent | 65ed4fa2ff95b54eacd82a7fb91f213464796756 (diff) |
Fix usage of C++14 features
Change-Id: Ibd460eceafdd29d7d88ac2418496dc7002de1095
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/shaderbuilder.cpp')
-rw-r--r-- | src/render/materialsystem/shaderbuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/shaderbuilder.cpp b/src/render/materialsystem/shaderbuilder.cpp index 23f1400c9..7434cd901 100644 --- a/src/render/materialsystem/shaderbuilder.cpp +++ b/src/render/materialsystem/shaderbuilder.cpp @@ -278,7 +278,7 @@ void ShaderBuilder::syncFromFrontEnd(const QNode *frontEnd, bool firstTime) markDirty(AbstractRenderer::ShadersDirty); } - static const std::pair<QShaderProgram::ShaderType, QUrl (QShaderProgramBuilder::*)() const> shaderTypesToGetters[] = { + static const QVector<std::pair<QShaderProgram::ShaderType, QUrl (QShaderProgramBuilder::*)() const>> shaderTypesToGetters = { {QShaderProgram::Vertex, &QShaderProgramBuilder::vertexShaderGraph}, {QShaderProgram::TessellationControl, &QShaderProgramBuilder::tessellationControlShaderGraph}, {QShaderProgram::TessellationEvaluation, &QShaderProgramBuilder::tessellationEvaluationShaderGraph}, @@ -287,7 +287,7 @@ void ShaderBuilder::syncFromFrontEnd(const QNode *frontEnd, bool firstTime) {QShaderProgram::Compute, &QShaderProgramBuilder::computeShaderGraph}, }; - for (auto it = std::cbegin(shaderTypesToGetters), end = std::cend(shaderTypesToGetters); it != end; ++it) { + for (auto it = shaderTypesToGetters.cbegin(), end = shaderTypesToGetters.cend(); it != end; ++it) { const QUrl url = (node->*(it->second))(); if (url != m_graphs.value(it->first)) { setShaderGraph(it->first, url); |