SelectableFilesModel: Use Utils::FileName

* Fix fallout caused by that

Change-Id: If1f068b060b414402918118a826a0f9405c976cd
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>

5 files changed, 29 insertions, 20 deletions

diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp b/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp
index da5b17e19d..5a6956269d 100644
--- a/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp
+++ b/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp
@@ -126,7 +126,7 @@ void FilesSelectionWizardPage::initializePage()
             this, &FilesSelectionWizardPage::parsingProgress);
     connect(m_model, &ProjectExplorer::SelectableFilesModel::parsingFinished,
             this, &FilesSelectionWizardPage::parsingFinished);
-    m_model->startParsing(m_genericProjectWizardDialog->path());
+    m_model->startParsing(Utils::FileName::fromString(m_genericProjectWizardDialog->path()));
 
     m_hideFilesFilterLabel->setVisible(false);
     m_hideFilesfilterLineEdit->setVisible(false);
@@ -145,9 +145,9 @@ void FilesSelectionWizardPage::cleanupPage()
     m_model->cancel();
 }
 
-void FilesSelectionWizardPage::parsingProgress(const QString &text)
+void FilesSelectionWizardPage::parsingProgress(const Utils::FileName &text)
 {
-    m_label->setText(tr("Generating file list...\n\n%1").arg(text));
+    m_label->setText(tr("Generating file list...\n\n%1").arg(text.toUserOutput()));
 }
 
 void FilesSelectionWizardPage::parsingFinished()
@@ -175,14 +175,14 @@ bool FilesSelectionWizardPage::isComplete() const
     return m_finished;
 }
 
-QStringList FilesSelectionWizardPage::selectedPaths() const
+QList<Utils::FileName> FilesSelectionWizardPage::selectedPaths() const
 {
-    return m_model ? m_model->selectedPaths() : QStringList();
+    return m_model ? m_model->selectedPaths() : QList<Utils::FileName>();
 }
 
-QStringList FilesSelectionWizardPage::selectedFiles() const
+QList<Utils::FileName> FilesSelectionWizardPage::selectedFiles() const
 {
-    return m_model ? m_model->selectedFiles() : QStringList();
+    return m_model ? m_model->selectedFiles() : QList<Utils::FileName>();
 }
 
 void FilesSelectionWizardPage::applyFilter()
diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.h b/src/plugins/genericprojectmanager/filesselectionwizardpage.h
index f3c8c2f30c..a5cbdcfda9 100644
--- a/src/plugins/genericprojectmanager/filesselectionwizardpage.h
+++ b/src/plugins/genericprojectmanager/filesselectionwizardpage.h
@@ -40,6 +40,7 @@ class QTreeView;
 class QLineEdit;
 QT_END_NAMESPACE
 
+namespace Utils { class FileName; }
 namespace ProjectExplorer { class SelectableFilesModel; }
 
 namespace GenericProjectManager {
@@ -56,12 +57,12 @@ public:
     bool isComplete() const;
     void initializePage();
     void cleanupPage();
-    QStringList selectedFiles() const;
-    QStringList selectedPaths() const;
+    QList<Utils::FileName> selectedFiles() const;
+    QList<Utils::FileName> selectedPaths() const;
 
 private slots:
     void applyFilter();
-    void parsingProgress(const QString &text);
+    void parsingProgress(const Utils::FileName &text);
     void parsingFinished();
 
 private:
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
index f3c249877c..32ed375fe4 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -47,6 +47,8 @@
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/selectablefilesmodel.h>
 
+#include <utils/algorithm.h>
+#include <utils/fileutils.h>
 #include <utils/mimetypes/mimedatabase.h>
 
 #include <QtPlugin>
@@ -89,10 +91,11 @@ void GenericProjectPlugin::editFiles()
     auto genericProject = qobject_cast<GenericProject *>(ProjectTree::currentProject());
     if (!genericProject)
         return;
-    SelectableFilesDialogEditFiles sfd(genericProject->projectFilePath().toFileInfo().path(), genericProject->files(),
-                              ICore::mainWindow());
+    SelectableFilesDialogEditFiles sfd(genericProject->projectFilePath(),
+                                       Utils::transform(genericProject->files(), [](const QString &f) { return Utils::FileName::fromString(f); }),
+                                       ICore::mainWindow());
     if (sfd.exec() == QDialog::Accepted)
-        genericProject->setFiles(sfd.selectedFiles());
+        genericProject->setFiles(Utils::transform(sfd.selectedFiles(), &Utils::FileName::toString));
 }
 
 } // namespace Internal
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 647757ab7d..4326f37601 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -35,6 +35,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/customwizard/customwizard.h>
 
+#include <utils/algorithm.h>
+#include <utils/fileutils.h>
 #include <utils/filewizardpage.h>
 #include <utils/mimetypes/mimedatabase.h>
 
@@ -84,12 +86,12 @@ QString GenericProjectWizardDialog::path() const
     return m_firstPage->path();
 }
 
-QStringList GenericProjectWizardDialog::selectedPaths() const
+QList<Utils::FileName> GenericProjectWizardDialog::selectedPaths() const
 {
     return m_secondPage->selectedPaths();
 }
 
-QStringList GenericProjectWizardDialog::selectedFiles() const
+QList<Utils::FileName> GenericProjectWizardDialog::selectedFiles() const
 {
     return m_secondPage->selectedFiles();
 }
@@ -156,7 +158,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
     const QString filesFileName = QFileInfo(dir, projectName + QLatin1String(".files")).absoluteFilePath();
     const QString includesFileName = QFileInfo(dir, projectName + QLatin1String(".includes")).absoluteFilePath();
     const QString configFileName = QFileInfo(dir, projectName + QLatin1String(".config")).absoluteFilePath();
-    const QStringList paths = wizard->selectedPaths();
+    const QStringList paths = Utils::transform(wizard->selectedPaths(), &Utils::FileName::toString);
 
     Utils::MimeDatabase mdb;
     Utils::MimeType headerTy = mdb.mimeTypeForName(QLatin1String("text/x-chdr"));
@@ -180,7 +182,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
     generatedCreatorFile.setContents(QLatin1String("[General]\n"));
     generatedCreatorFile.setAttributes(Core::GeneratedFile::OpenProjectAttribute);
 
-    QStringList sources = wizard->selectedFiles();
+    QStringList sources = Utils::transform(wizard->selectedFiles(), &Utils::FileName::toString);
     for (int i = 0; i < sources.length(); ++i)
         sources[i] = dir.relativeFilePath(sources[i]);
 
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.h b/src/plugins/genericprojectmanager/genericprojectwizard.h
index 716cab87f5..f69c396244 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.h
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.h
@@ -35,7 +35,10 @@
 #include <coreplugin/basefilewizardfactory.h>
 #include <utils/wizard.h>
 
-namespace Utils { class FileWizardPage; }
+namespace Utils {
+class FileName;
+class FileWizardPage;
+} // namespace Utils
 
 namespace GenericProjectManager {
 namespace Internal {
@@ -51,8 +54,8 @@ public:
 
     QString path() const;
     void setPath(const QString &path);
-    QStringList selectedFiles() const;
-    QStringList selectedPaths() const;
+    QList<Utils::FileName> selectedFiles() const;
+    QList<Utils::FileName> selectedPaths() const;
 
     QString projectName() const;