feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

EffectComposer: Remove unused parameter from getImageElementName

Browse Source 
Change-Id: I43d52c722806421243dfe395ae9ce5c25a878e8c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Ali Kianian
2024-10-23 09:45:14 +03:00
parent 68e0b5a3f2
commit 51000a531f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/effectcomposer/effectcomposermodel.cpp
View File

@@ -1494,7 +1494,7 @@ QString EffectComposerModel::valueAsString(const Uniform &uniform)
QVector4D v4 = uniform.value().value<QVector4D>(); QVector4D v4 = uniform.value().value<QVector4D>();
return QString("Qt.vector4d(%1, %2, %3, %4)").arg(v4.x()).arg(v4.y()).arg(v4.z()).arg(v4.w()); 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) { } else if (uniform.type() == Uniform::Type::Sampler) {
return getImageElementName(uniform, true); return getImageElementName(uniform);
} else if (uniform.type() == Uniform::Type::Color) { } else if (uniform.type() == Uniform::Type::Color) {
return QString("\"%1\"").arg(uniform.value().toString()); return QString("\"%1\"").arg(uniform.value().toString());
} else if (uniform.type() == Uniform::Type::Channel) { } 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()); QString sw = QString("g_propertyData.%1.w").arg(uniform.name());
return QString("Qt.vector4d(%1, %2, %3, %4)").arg(sx, sy, sz, sw); return QString("Qt.vector4d(%1, %2, %3, %4)").arg(sx, sy, sz, sw);
} else if (uniform.type() == Uniform::Type::Sampler) { } else if (uniform.type() == Uniform::Type::Sampler) {
return getImageElementName(uniform, false); return getImageElementName(uniform);
} else { } else {
qWarning() << QString("Unhandled const variable type: %1").arg(int(uniform.type())).toLatin1(); qWarning() << QString("Unhandled const variable type: %1").arg(int(uniform.type())).toLatin1();
return QString(); return QString();
@@ -1574,7 +1574,7 @@ QString EffectComposerModel::valueAsVariable(const Uniform &uniform)
} }
// Return name for the image property Image element // 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(); QString simplifiedName = uniform.name().simplified();
simplifiedName = simplifiedName.remove(' '); simplifiedName = simplifiedName.remove(' ');
@@ -2067,7 +2067,7 @@ QString EffectComposerModel::getQmlImagesString(bool localFiles)
.arg(uniform->name(), imagePath); .arg(uniform->name(), imagePath);
} }
imagesString += " Image {\n"; imagesString += " Image {\n";
QString simplifiedName = getImageElementName(*uniform, localFiles); QString simplifiedName = getImageElementName(*uniform);
imagesString += QString(" id: %1\n").arg(simplifiedName); imagesString += QString(" id: %1\n").arg(simplifiedName);
imagesString += " anchors.fill: parent\n"; imagesString += " anchors.fill: parent\n";
// File paths are absolute, return as local when requested // File paths are absolute, return as local when requested

2
src/plugins/effectcomposer/effectcomposermodel.h
View File

@@ -182,7 +182,7 @@ private:
QString valueAsString(const Uniform &uniform); QString valueAsString(const Uniform &uniform);
QString valueAsBinding(const Uniform &uniform); QString valueAsBinding(const Uniform &uniform);
QString valueAsVariable(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 getConstVariables();
const QString getDefineProperties(); const QString getDefineProperties();
int getTagIndex(const QStringList &code, const QString &tag); int getTagIndex(const QStringList &code, const QString &tag);