Core: Remove QString overload for GeneratedFile

Adapt the only remaining user.

Change-Id: Iddd8b3a51e4eccbf04272bfb2db4cab44aa6e106
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

3 files changed, 24 insertions, 39 deletions

diff --git a/src/plugins/coreplugin/generatedfile.cpp b/src/plugins/coreplugin/generatedfile.cpp
index bf8277f5de..c18dd53144 100644
--- a/src/plugins/coreplugin/generatedfile.cpp
+++ b/src/plugins/coreplugin/generatedfile.cpp
@@ -10,8 +10,6 @@
 
 #include <QCoreApplication>
 #include <QDebug>
-#include <QDir>
-#include <QString>
 
 using namespace Utils;
 
@@ -34,9 +32,8 @@ class GeneratedFilePrivate : public QSharedData
 {
 public:
     GeneratedFilePrivate() = default;
-    explicit GeneratedFilePrivate(const Utils::FilePath &path);
-    explicit GeneratedFilePrivate(const QString &path);
-    Utils::FilePath path;
+    explicit GeneratedFilePrivate(const FilePath &path);
+    FilePath path;
     QByteArray contents;
     Id editorId;
     bool binary = false;
@@ -58,13 +55,7 @@ QDebug &operator<<(QDebug &debug, const Core::GeneratedFile &file)
     return debug;
 }
 
-GeneratedFilePrivate::GeneratedFilePrivate(const QString &path) : // FIXME Don't use - Remove when possible
-    path(FilePath::fromString(path).cleanPath()),
-    attributes({})
-{
-}
-
-GeneratedFilePrivate::GeneratedFilePrivate(const Utils::FilePath &path) :
+GeneratedFilePrivate::GeneratedFilePrivate(const FilePath &path) :
     path(path.cleanPath()),
     attributes({})
 {
@@ -75,12 +66,7 @@ GeneratedFile::GeneratedFile() :
 {
 }
 
-GeneratedFile::GeneratedFile(const QString &path) : // FIXME Don't use - Remove when possible
-    m_d(new GeneratedFilePrivate(path))
-{
-}
-
-GeneratedFile::GeneratedFile(const Utils::FilePath &path) :
+GeneratedFile::GeneratedFile(const FilePath &path) :
     m_d(new GeneratedFilePrivate(path))
 {
 }
@@ -101,7 +87,7 @@ FilePath GeneratedFile::filePath() const
     return m_d->path;
 }
 
-void GeneratedFile::setFilePath(const Utils::FilePath &p)
+void GeneratedFile::setFilePath(const FilePath &p)
 {
     m_d->path = p;
 }
diff --git a/src/plugins/coreplugin/generatedfile.h b/src/plugins/coreplugin/generatedfile.h
index 09c7590922..ddf9cb7a9d 100644
--- a/src/plugins/coreplugin/generatedfile.h
+++ b/src/plugins/coreplugin/generatedfile.h
@@ -36,7 +36,6 @@ public:
 
     GeneratedFile();
     explicit GeneratedFile(const Utils::FilePath &path);
-    explicit GeneratedFile(const QString &path);
     GeneratedFile(const GeneratedFile &);
     GeneratedFile &operator=(const GeneratedFile &);
     ~GeneratedFile();
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
index 1152cd7ce8..d0fb9414ab 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
@@ -35,9 +35,9 @@ struct ProjectContents {
 };
 
 // Create a binary icon file
-static inline Core::GeneratedFile generateIconFile(const Utils::FilePath &source,
-                                                   const QString &target,
-                                                   QString *errorMessage)
+static Core::GeneratedFile generateIconFile(const FilePath &source,
+                                            const FilePath &target,
+                                            QString *errorMessage)
 {
     // Read out source
     Utils::FileReader reader;
@@ -69,11 +69,11 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
     const QChar blank = QLatin1Char(' ');
     QList<Core::GeneratedFile> rc;
 
-    QString baseDir = p.path;
-    baseDir += slash;
-    baseDir += p.fileName;
-    const QString slashLessBaseDir = baseDir;
-    baseDir += slash;
+    QString baseDir_ = p.path;
+    baseDir_ += slash;
+    baseDir_ += p.fileName;
+    const QString slashLessBaseDir = baseDir_;
+    const FilePath baseDir = FilePath::fromString(baseDir_);
 
     QSet<QString> widgetLibraries;
     QSet<QString> widgetProjects;
@@ -100,7 +100,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
         const QString pluginHeaderContents = processTemplate(p.templatePath + QLatin1String("/tpl_single.h"), sm, errorMessage);
         if (pluginHeaderContents.isEmpty())
             return QList<Core::GeneratedFile>();
-        Core::GeneratedFile pluginHeader(baseDir + wo.pluginHeaderFile);
+        Core::GeneratedFile pluginHeader(baseDir / wo.pluginHeaderFile);
         pluginHeader.setContents(CppEditor::AbstractEditorSupport::licenseTemplate(
                                      FilePath::fromString(wo.pluginHeaderFile), wo.pluginClassName)
                                  + pluginHeaderContents);
@@ -129,7 +129,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
         const QString pluginSourceContents = processTemplate(p.templatePath + QLatin1String("/tpl_single.cpp"), sm, errorMessage);
         if (pluginSourceContents.isEmpty())
             return QList<Core::GeneratedFile>();
-        Core::GeneratedFile pluginSource(baseDir + wo.pluginSourceFile);
+        Core::GeneratedFile pluginSource(baseDir / wo.pluginSourceFile);
         pluginSource.setContents(CppEditor::AbstractEditorSupport::licenseTemplate(
                                      FilePath::fromString(wo.pluginSourceFile), wo.pluginClassName)
                                  + pluginSourceContents);
@@ -176,7 +176,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
             const QString widgetHeaderContents = processTemplate(p.templatePath + QLatin1String("/tpl_widget.h"), sm, errorMessage);
             if (widgetHeaderContents.isEmpty())
                 return QList<Core::GeneratedFile>();
-            Core::GeneratedFile widgetHeader(baseDir + wo.widgetHeaderFile);
+            Core::GeneratedFile widgetHeader(baseDir / wo.widgetHeaderFile);
             widgetHeader.setContents(CppEditor::AbstractEditorSupport::licenseTemplate(
                                          FilePath::fromString(wo.widgetHeaderFile),
                                          wo.widgetClassName)
@@ -188,7 +188,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
             const QString widgetSourceContents = processTemplate(p.templatePath + QLatin1String("/tpl_widget.cpp"), sm, errorMessage);
             if (widgetSourceContents.isEmpty())
                 return QList<Core::GeneratedFile>();
-            Core::GeneratedFile widgetSource(baseDir + wo.widgetSourceFile);
+            Core::GeneratedFile widgetSource(baseDir / wo.widgetSourceFile);
             widgetSource.setContents(CppEditor::AbstractEditorSupport::licenseTemplate(
                                          FilePath::fromString(wo.widgetSourceFile),
                                          wo.widgetClassName)
@@ -211,7 +211,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
         const QString widgetPriContents = processTemplate(pc.tmpl, sm, errorMessage);
         if (widgetPriContents.isEmpty())
             return QList<Core::GeneratedFile>();
-        Core::GeneratedFile widgetPri(baseDir + it.key());
+        Core::GeneratedFile widgetPri(baseDir / it.key());
         widgetPri.setContents(widgetPriContents);
         rc.push_back(widgetPri);
     }
@@ -225,7 +225,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
         const QString collectionHeaderContents = processTemplate(p.templatePath + QLatin1String("/tpl_collection.h"), sm, errorMessage);
         if (collectionHeaderContents.isEmpty())
             return QList<Core::GeneratedFile>();
-        Core::GeneratedFile collectionHeader(baseDir + options.collectionHeaderFile);
+        Core::GeneratedFile collectionHeader(baseDir / options.collectionHeaderFile);
         collectionHeader.setContents(CppEditor::AbstractEditorSupport::licenseTemplate(
                                          FilePath::fromString(options.collectionHeaderFile),
                                          options.collectionClassName)
@@ -243,7 +243,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
         const QString collectionSourceFileContents = processTemplate(p.templatePath + QLatin1String("/tpl_collection.cpp"), sm, errorMessage);
         if (collectionSourceFileContents.isEmpty())
             return QList<Core::GeneratedFile>();
-        Core::GeneratedFile collectionSource(baseDir + options.collectionSourceFile);
+        Core::GeneratedFile collectionSource(baseDir / options.collectionSourceFile);
         collectionSource.setContents(CppEditor::AbstractEditorSupport::licenseTemplate(
                                          FilePath::fromString(options.collectionSourceFile),
                                          options.collectionClassName)
@@ -261,8 +261,8 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
     for (QString icon : std::as_const(pluginIcons)) {
         const QFileInfo qfi(icon);
         if (qfi.dir() != slashLessBaseDir) {
-            const QString newIcon = baseDir + qfi.fileName();
-            const Core::GeneratedFile iconFile = generateIconFile(Utils::FilePath::fromFileInfo(qfi),
+            const FilePath newIcon = baseDir / qfi.fileName();
+            const Core::GeneratedFile iconFile = generateIconFile(FilePath::fromFileInfo(qfi),
                                                                   newIcon,
                                                                   errorMessage);
             if (iconFile.filePath().isEmpty())
@@ -278,7 +278,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
     const QString resourceFileContents = processTemplate(p.templatePath + QLatin1String("/tpl_resources.qrc"), sm, errorMessage);
     if (resourceFileContents.isEmpty())
         return QList<Core::GeneratedFile>();
-    Core::GeneratedFile resourceFile(baseDir + options.resourceFile);
+    Core::GeneratedFile resourceFile(baseDir / options.resourceFile);
     resourceFile.setContents(resourceFileContents);
     rc.push_back(resourceFile);
 
@@ -293,7 +293,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
     const QString proFileContents = processTemplate(p.templatePath + QLatin1String("/tpl_plugin.pro"), sm, errorMessage);
     if (proFileContents.isEmpty())
         return QList<Core::GeneratedFile>();
-    Core::GeneratedFile proFile(baseDir + p.fileName + QLatin1String(".pro"));
+    Core::GeneratedFile proFile(baseDir / p.fileName + QLatin1String(".pro"));
     proFile.setContents(proFileContents);
     proFile.setAttributes(Core::GeneratedFile::OpenProjectAttribute);
     rc.push_back(proFile);