From f649a4c527c9685e1d30aa3048994ec4e7632990 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 1 May 2017 14:55:47 +0100 Subject: Use multi-arg where possible (clazy reports) Change-Id: I333e65e3173077c53ffae8cff3c2c1c37da6bd26 Reviewed-by: Sean Harmer --- tools/qgltf/qgltf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp index bc011eaa7..e5f49bdc6 100644 --- a/tools/qgltf/qgltf.cpp +++ b/tools/qgltf/qgltf.cpp @@ -1964,13 +1964,13 @@ void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename) if (newName.isEmpty()) newName = newShaderName(); QString key = basename + QStringLiteral("_") + newName + QStringLiteral("_v"); - QString fn = QString(QStringLiteral("%1.%2")).arg(key).arg("vert"); + QString fn = QString(QStringLiteral("%1.vert")).arg(key); vertexShader["uri"] = fn; writeShader(prog->vertShader, fn, m_subst_es2); if (opts.genCore) { QJsonObject coreVertexShader; QString coreKey = QString(QStringLiteral("%1_core").arg(key)); - fn = QString(QStringLiteral("%1.%2")).arg(coreKey).arg("vert"); + fn = QString(QStringLiteral("%1.vert")).arg(coreKey); coreVertexShader["type"] = 35633; coreVertexShader["uri"] = fn; writeShader(prog->vertShader, fn, m_subst_core); @@ -1986,13 +1986,13 @@ void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename) if (newName.isEmpty()) newName = newShaderName(); QString key = basename + QStringLiteral("_") + newName + QStringLiteral("_f"); - QString fn = QString(QStringLiteral("%1.%2")).arg(key).arg("frag"); + QString fn = QString(QStringLiteral("%1.frag")).arg(key); fragmentShader["uri"] = fn; writeShader(prog->fragShader, fn, m_subst_es2); if (opts.genCore) { QJsonObject coreFragmentShader; QString coreKey = QString(QStringLiteral("%1_core").arg(key)); - fn = QString(QStringLiteral("%1.%2")).arg(coreKey).arg("frag"); + fn = QString(QStringLiteral("%1.frag")).arg(coreKey); coreFragmentShader["type"] = 35632; coreFragmentShader["uri"] = fn; writeShader(prog->fragShader, fn, m_subst_core); -- cgit v1.2.3