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

EffectComposer: Remove unused attributes

Browse Source 
Change-Id: Ib87cb2b1add0496e6cc15927a91a87976eb95a4d
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Ali Kianian
2025-04-23 12:08:58 +03:00
parent 77b2c68f39
commit 1186c495f8
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1666,7 +1666,7 @@ void EffectComposerModel::saveResources(const QString &name)
} }
} }
writeToFile(qmlUtf8, qmlFilePath, FileType::Text); writeToFile(qmlUtf8, qmlFilePath);
newFileNames.insert(qmlFilename); newFileNames.insert(qmlFilename);
// Save shaders and images // Save shaders and images
@@ -2298,11 +2298,11 @@ void EffectComposerModel::bakeShaders()
setVertexShader(generateVertexShader()); setVertexShader(generateVertexShader());
QString vs = m_vertexShader; QString vs = m_vertexShader;
writeToFile(vs.toUtf8(), m_vertexSourceFilename, FileType::Text); writeToFile(vs.toUtf8(), m_vertexSourceFilename);
setFragmentShader(generateFragmentShader()); setFragmentShader(generateFragmentShader());
QString fs = m_fragmentShader; QString fs = m_fragmentShader;
writeToFile(fs.toUtf8(), m_fragmentSourceFilename, FileType::Text); writeToFile(fs.toUtf8(), m_fragmentSourceFilename);
QtSupport::QtVersion *qtVer = QtSupport::QtKitAspect::qtVersion(kit); QtSupport::QtVersion *qtVer = QtSupport::QtKitAspect::qtVersion(kit);
if (!qtVer) { if (!qtVer) {
@@ -2835,8 +2835,7 @@ void EffectComposerModel::addOrUpdateNodeUniform(int idx, const QVariantMap &dat
startRebakeTimer(); startRebakeTimer();
} }
bool EffectComposerModel::writeToFile( bool EffectComposerModel::writeToFile(const QByteArray &buf, const QString &fileName)
const QByteArray &buf, const QString &fileName, [[maybe_unused]] FileType fileType)
{ {
Utils::FilePath fp = Utils::FilePath::fromString(fileName); Utils::FilePath fp = Utils::FilePath::fromString(fileName);
fp.absolutePath().createDir(); fp.absolutePath().createDir();

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

@@ -10,7 +10,6 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QColor> #include <QColor>
#include <QFileSystemWatcher>
#include <QMap> #include <QMap>
#include <QRegularExpression> #include <QRegularExpression>
#include <QSet> #include <QSet>
@@ -264,12 +263,7 @@ private:
QList<QUrl> defaultPreviewImages() const; QList<QUrl> defaultPreviewImages() const;
QUrl defaultPreviewImage() const; QUrl defaultPreviewImage() const;
enum class FileType bool writeToFile(const QByteArray &buf, const QString &filename);
{
Binary,
Text
};
bool writeToFile(const QByteArray &buf, const QString &filename, FileType fileType);
QList<CompositionNode *> m_nodes; QList<CompositionNode *> m_nodes;
QPointer<EffectComposerNodesModel> m_effectComposerNodesModel; QPointer<EffectComposerNodesModel> m_effectComposerNodesModel;
@@ -303,7 +297,6 @@ private:
// Used in preview QML, at ShaderEffect component of the file // Used in preview QML, at ShaderEffect component of the file
QString m_previewEffectPropertiesString; QString m_previewEffectPropertiesString;
QString m_qmlComponentString; QString m_qmlComponentString;
bool m_loadComponentImages = true;
bool m_isEnabled = true; bool m_isEnabled = true;
bool m_hasValidTarget = false; bool m_hasValidTarget = false;
QString m_currentComposition; QString m_currentComposition;