From 51000a531f6b3d3a9c0bd7226667af9ec58a85aa Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Wed, 23 Oct 2024 09:45:14 +0300 Subject: [PATCH] EffectComposer: Remove unused parameter from getImageElementName Change-Id: I43d52c722806421243dfe395ae9ce5c25a878e8c Reviewed-by: Mahmoud Badri --- src/plugins/effectcomposer/effectcomposermodel.cpp | 8 ++++---- src/plugins/effectcomposer/effectcomposermodel.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/effectcomposer/effectcomposermodel.cpp b/src/plugins/effectcomposer/effectcomposermodel.cpp index d7a94a7278f..32dce7cef65 100644 --- a/src/plugins/effectcomposer/effectcomposermodel.cpp +++ b/src/plugins/effectcomposer/effectcomposermodel.cpp @@ -1494,7 +1494,7 @@ QString EffectComposerModel::valueAsString(const Uniform &uniform) QVector4D v4 = uniform.value().value(); return QString("Qt.vector4d(%1, %2, %3, %4)").arg(v4.x()).arg(v4.y()).arg(v4.z()).arg(v4.w()); } else if (uniform.type() == Uniform::Type::Sampler) { - return getImageElementName(uniform, true); + return getImageElementName(uniform); } else if (uniform.type() == Uniform::Type::Color) { return QString("\"%1\"").arg(uniform.value().toString()); } else if (uniform.type() == Uniform::Type::Channel) { @@ -1537,7 +1537,7 @@ QString EffectComposerModel::valueAsBinding(const Uniform &uniform) QString sw = QString("g_propertyData.%1.w").arg(uniform.name()); return QString("Qt.vector4d(%1, %2, %3, %4)").arg(sx, sy, sz, sw); } else if (uniform.type() == Uniform::Type::Sampler) { - return getImageElementName(uniform, false); + return getImageElementName(uniform); } else { qWarning() << QString("Unhandled const variable type: %1").arg(int(uniform.type())).toLatin1(); return QString(); @@ -1574,7 +1574,7 @@ QString EffectComposerModel::valueAsVariable(const Uniform &uniform) } // Return name for the image property Image element -QString EffectComposerModel::getImageElementName(const Uniform &uniform, bool) +QString EffectComposerModel::getImageElementName(const Uniform &uniform) const { QString simplifiedName = uniform.name().simplified(); simplifiedName = simplifiedName.remove(' '); @@ -2067,7 +2067,7 @@ QString EffectComposerModel::getQmlImagesString(bool localFiles) .arg(uniform->name(), imagePath); } imagesString += " Image {\n"; - QString simplifiedName = getImageElementName(*uniform, localFiles); + QString simplifiedName = getImageElementName(*uniform); imagesString += QString(" id: %1\n").arg(simplifiedName); imagesString += " anchors.fill: parent\n"; // File paths are absolute, return as local when requested diff --git a/src/plugins/effectcomposer/effectcomposermodel.h b/src/plugins/effectcomposer/effectcomposermodel.h index 09aeb724532..fc04255f111 100644 --- a/src/plugins/effectcomposer/effectcomposermodel.h +++ b/src/plugins/effectcomposer/effectcomposermodel.h @@ -182,7 +182,7 @@ private: QString valueAsString(const Uniform &uniform); QString valueAsBinding(const Uniform &uniform); QString valueAsVariable(const Uniform &uniform); - QString getImageElementName(const Uniform &uniform, bool localFiles); + QString getImageElementName(const Uniform &uniform) const; const QString getConstVariables(); const QString getDefineProperties(); int getTagIndex(const QStringList &code, const QString &tag);