EffectComposer: Remove warnings and unused code from the model

Change-Id: I8171467e70d8d716b0598b0b533f216e5e0afc25
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>

3 files changed, 7 insertions, 24 deletions

diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml
index d3170c9d27..251b429a4d 100644
--- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml
+++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml
@@ -33,7 +33,7 @@ Column {
             oldComponent.destroy();
         try {
             const newObject = Qt.createQmlObject(
-                effectComposerModel.qmlComponentString,
+                effectComposerModel.qmlComponentString(),
                 componentParent,
                 ""
             );
diff --git a/src/plugins/effectcomposer/effectcomposermodel.cpp b/src/plugins/effectcomposer/effectcomposermodel.cpp
index 1edc70c75b..ffa63a0353 100644
--- a/src/plugins/effectcomposer/effectcomposermodel.cpp
+++ b/src/plugins/effectcomposer/effectcomposermodel.cpp
@@ -9,9 +9,6 @@
 #include "syntaxhighlighterdata.h"
 #include "uniform.h"
 
-#include <qmlprojectmanager/qmlproject.h>
-
-#include <projectexplorer/project.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/target.h>
 
@@ -255,7 +252,7 @@ void EffectComposerModel::setVertexShader(const QString &newVertexShader)
     m_vertexShader = newVertexShader;
 }
 
-const QString &EffectComposerModel::qmlComponentString() const
+QString EffectComposerModel::qmlComponentString() const
 {
     return m_qmlComponentString;
 }
@@ -1363,13 +1360,13 @@ void EffectComposerModel::updateCustomUniforms()
 
 void EffectComposerModel::createFiles()
 {
-    if (QFileInfo(m_vertexShaderFilename).exists())
+    if (QFileInfo::exists(m_vertexShaderFilename))
         QFile(m_vertexShaderFilename).remove();
-    if (QFileInfo(m_fragmentShaderFilename).exists())
+    if (QFileInfo::exists(m_fragmentShaderFilename))
         QFile(m_fragmentShaderFilename).remove();
-    if (QFileInfo(m_vertexShaderPreviewFilename).exists())
+    if (QFileInfo::exists(m_vertexShaderPreviewFilename))
         QFile(m_vertexShaderPreviewFilename).remove();
-    if (QFileInfo(m_fragmentShaderPreviewFilename).exists())
+    if (QFileInfo::exists(m_fragmentShaderPreviewFilename))
         QFile(m_fragmentShaderPreviewFilename).remove();
 
     auto vertexShaderFile = QTemporaryFile(QDir::tempPath() + "/dsem_XXXXXX.vert.qsb");
@@ -1502,16 +1499,6 @@ void EffectComposerModel::setIsEnabled(bool enabled)
     emit isEnabledChanged();
 }
 
-// Returns name for image mipmap property.
-// e.g. "myImage" -> "myImageMipmap".
-QString EffectComposerModel::mipmapPropertyName(const QString &name) const
-{
-    QString simplifiedName = name.simplified();
-    simplifiedName = simplifiedName.remove(' ');
-    simplifiedName += "Mipmap";
-    return simplifiedName;
-}
-
 QString EffectComposerModel::getQmlImagesString(bool localFiles)
 {
     QString imagesString;
@@ -1537,8 +1524,6 @@ QString EffectComposerModel::getQmlImagesString(bool localFiles)
 
                 if (uniform->enableMipmap())
                     imagesString += "        mipmap: true\n";
-                else
-                    QString mipmapProperty = mipmapPropertyName(uniform->name());
             }
 
             imagesString += "        visible: false\n";
diff --git a/src/plugins/effectcomposer/effectcomposermodel.h b/src/plugins/effectcomposer/effectcomposermodel.h
index 69afc503ea..e8c7a5c61d 100644
--- a/src/plugins/effectcomposer/effectcomposermodel.h
+++ b/src/plugins/effectcomposer/effectcomposermodel.h
@@ -47,7 +47,6 @@ class EffectComposerModel : public QAbstractListModel
     Q_PROPERTY(bool hasUnsavedChanges MEMBER m_hasUnsavedChanges WRITE setHasUnsavedChanges NOTIFY hasUnsavedChangesChanged)
     Q_PROPERTY(bool shadersUpToDate READ shadersUpToDate WRITE setShadersUpToDate NOTIFY shadersUpToDateChanged)
     Q_PROPERTY(bool isEnabled READ isEnabled WRITE setIsEnabled NOTIFY isEnabledChanged)
-    Q_PROPERTY(QString qmlComponentString READ qmlComponentString)
     Q_PROPERTY(QString currentComposition READ currentComposition WRITE setCurrentComposition NOTIFY currentCompositionChanged)
 
 public:
@@ -83,7 +82,7 @@ public:
     QString vertexShader() const;
     void setVertexShader(const QString &newVertexShader);
 
-    const QString &qmlComponentString() const;
+    Q_INVOKABLE QString qmlComponentString() const;
 
     Q_INVOKABLE void updateQmlComponent();
 
@@ -170,7 +169,6 @@ private:
     void bakeShaders();
     void saveResources(const QString &name);
 
-    QString mipmapPropertyName(const QString &name) const;
     QString getQmlImagesString(bool localFiles);
     QString getQmlComponentString(bool localFiles);