Commit fd93aa43 authored by hjk's avatar hjk

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: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent 346f0c31
......@@ -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";
......
......@@ -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)
{
}
......
......@@ -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";
......
......@@ -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()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment