Project: Simplfy file adding/removing interface

The filetype is only relevant for Qt4 projects. But even for Qt4 projects
the file type is insufficient to decide where the file should be added.
So remove the file type from the interface and let the projectmanagers
themselves figure out what they want to do.

Also fix
Task-number: QTCREATORBUG-9688

Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 7 insertions, 16 deletions

diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index dca5a2c688..9db36e72ba 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -472,8 +472,6 @@ bool ProjectFileWizardExtension::processProject(
         const QList<Core::GeneratedFile> &files,
         bool *removeOpenProjectAttribute, QString *errorMessage)
 {
-    typedef QMultiMap<FileType, QString> TypeFileMap;
-
     *removeOpenProjectAttribute = false;
 
     QString generatedProject = generatedProjectFilePath(files);
@@ -491,20 +489,13 @@ bool ProjectFileWizardExtension::processProject(
         }
         *removeOpenProjectAttribute = true;
     } else {
-        // Split into lists by file type and bulk-add them.
-        TypeFileMap typeFileMap;
-        const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase();
-        foreach (const Core::GeneratedFile &generatedFile, files) {
-            const QString path = generatedFile.path();
-            typeFileMap.insert(typeForFileName(mdb, path), path);
-        }
-        foreach (FileType type, typeFileMap.uniqueKeys()) {
-            const QStringList typeFiles = typeFileMap.values(type);
-            if (!project->addFiles(type, typeFiles)) {
-                *errorMessage = tr("Failed to add one or more files to project\n'%1' (%2).").
-                                arg(project->path(), typeFiles.join(QString(QLatin1Char(','))));
-                return false;
-            }
+        QStringList filePaths;
+        foreach (const Core::GeneratedFile &generatedFile, files)
+            filePaths << generatedFile.path();
+        if (!project->addFiles(filePaths)) {
+            *errorMessage = tr("Failed to add one or more files to project\n'%1' (%2).").
+                    arg(project->path(), filePaths.join(QString(QLatin1Char(','))));
+            return false;
         }
     }
     return true;