From fd93aa43776da3904911820cd81b1680ecc62a65 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Fri, 7 Feb 2014 22:39:44 +0100
Subject: [PATCH] ProjectExplorer: Some mime type consolidation

CPP_SOURCE, CPP_HEADER and FORM where duplicated,
LINGUIST is not really specific to qmake.

Change-Id: Iac27f74c2b9dbed5fc44c5dd08b9ba47802cc758
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/plugins/projectexplorer/projectexplorerconstants.h     | 1 +
 src/plugins/qmakeprojectmanager/externaleditors.cpp        | 5 +++--
 .../qmakeprojectmanager/qmakeprojectmanagerconstants.h     | 4 ----
 src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp       | 7 ++++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 749232d17df..ca7dbd2383e 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -168,6 +168,7 @@ const char C_SOURCE_MIMETYPE[]    = "text/x-csrc";
 const char C_HEADER_MIMETYPE[]    = "text/x-chdr";
 const char CPP_SOURCE_MIMETYPE[]  = "text/x-c++src";
 const char CPP_HEADER_MIMETYPE[]  = "text/x-c++hdr";
+const char LINGUIST_MIMETYPE[]    = "application/x-linguist";
 const char FORM_MIMETYPE[]        = "application/x-designer";
 const char QML_MIMETYPE[]         = "application/x-qml"; // separate def also in qmljstoolsconstants.h
 const char RESOURCE_MIMETYPE[]    = "application/vnd.qt.xml.resource";
diff --git a/src/plugins/qmakeprojectmanager/externaleditors.cpp b/src/plugins/qmakeprojectmanager/externaleditors.cpp
index 466b855ca82..d24f45b20f7 100644
--- a/src/plugins/qmakeprojectmanager/externaleditors.cpp
+++ b/src/plugins/qmakeprojectmanager/externaleditors.cpp
@@ -33,6 +33,7 @@
 #include <utils/synchronousprocess.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/session.h>
 #include <qtsupport/qtkitinformation.h>
@@ -170,7 +171,7 @@ bool ExternalQtEditor::startEditorProcess(const EditorLaunchData &data, QString
 LinguistExternalEditor::LinguistExternalEditor(QObject *parent) :
        ExternalQtEditor(linguistIdC,
                         QLatin1String(linguistDisplayName),
-                        QLatin1String(QmakeProjectManager::Constants::LINGUIST_MIMETYPE),
+                        QLatin1String(ProjectExplorer::Constants::LINGUIST_MIMETYPE),
                         parent)
 {
 }
@@ -187,7 +188,7 @@ bool LinguistExternalEditor::startEditor(const QString &fileName, QString *error
 MacDesignerExternalEditor::MacDesignerExternalEditor(QObject *parent) :
        ExternalQtEditor(designerIdC,
                         QLatin1String(designerDisplayName),
-                        QLatin1String(QmakeProjectManager::Constants::FORM_MIMETYPE),
+                        QLatin1String(ProjectExplorer::Constants::FORM_MIMETYPE),
                         parent)
 {
 }
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h
index 45f0a4d49b9..c0a66057db3 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h
@@ -48,10 +48,6 @@ const char PROFILE_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors"
 const char PROFILE_MIMETYPE[] = "application/vnd.qt.qmakeprofile";
 const char PROINCLUDEFILE_MIMETYPE [] = "application/vnd.qt.qmakeproincludefile";
 const char PROFEATUREFILE_MIMETYPE [] = "application/vnd.qt.qmakeprofeaturefile";
-const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
-const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr";
-const char FORM_MIMETYPE[] = "application/x-designer";
-const char LINGUIST_MIMETYPE[] = "application/x-linguist";
 
 // Actions
 const char RUNQMAKE[] = "Qt4Builder.RunQMake";
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
index f8cb6ea09d5..9242263ee81 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
@@ -40,6 +40,7 @@
 #include <cpptools/cpptoolsconstants.h>
 
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/targetsetuppage.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
@@ -61,17 +62,17 @@ QtWizard::QtWizard()
 
 QString QtWizard::sourceSuffix()
 {
-    return preferredSuffix(QLatin1String(Constants::CPP_SOURCE_MIMETYPE));
+    return preferredSuffix(QLatin1String(ProjectExplorer::Constants::CPP_SOURCE_MIMETYPE));
 }
 
 QString QtWizard::headerSuffix()
 {
-    return preferredSuffix(QLatin1String(Constants::CPP_HEADER_MIMETYPE));
+    return preferredSuffix(QLatin1String(ProjectExplorer::Constants::CPP_HEADER_MIMETYPE));
 }
 
 QString QtWizard::formSuffix()
 {
-    return preferredSuffix(QLatin1String(Constants::FORM_MIMETYPE));
+    return preferredSuffix(QLatin1String(ProjectExplorer::Constants::FORM_MIMETYPE));
 }
 
 QString QtWizard::profileSuffix()