Unify projectexplorer language IDs

We don't need two IDs for C++ and the QmlJS ID should look the same as
as the others.

Change-Id: Ib9747f6b36a90bb652951d85eec69666615670c4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

17 files changed, 27 insertions, 25 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index d35dedba8d..75d82c2e65 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -77,7 +77,7 @@ AutotoolsProject::AutotoolsProject(AutotoolsManager *manager, const QString &fil
     setDocument(new AutotoolsProjectFile(fileName));
     setRootProjectNode(new AutotoolsProjectNode(projectDirectory()));
     setProjectContext(Core::Context(Constants::PROJECT_CONTEXT));
-    setProjectLanguages(Core::Context(ProjectExplorer::Constants::LANG_CXX));
+    setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
 
     const QFileInfo fileInfo = projectFilePath().toFileInfo();
     m_projectName = fileInfo.absoluteDir().dirName();
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
index ae395bcdcf..52fcfe599a 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
@@ -66,7 +66,7 @@ bool ClangStaticAnalyzerRunControlFactory::canRun(RunConfiguration *runConfigura
     Project *project = runConfiguration->target()->project();
     QTC_ASSERT(project, return false);
     const Core::Context context = project->projectLanguages();
-    if (!context.contains(ProjectExplorer::Constants::LANG_CXX))
+    if (!context.contains(ProjectExplorer::Constants::CXX_LANGUAGE_ID))
         return false;
 
     Target *target = runConfiguration->target();
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 9bffe40068..7ad84824eb 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -82,7 +82,7 @@ CMakeProject::CMakeProject(CMakeManager *manager, const FileName &fileName)
 
     setRootProjectNode(new CMakeListsNode(fileName));
     setProjectContext(Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT));
-    setProjectLanguages(Core::Context(ProjectExplorer::Constants::LANG_CXX));
+    setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
 
     rootProjectNode()->setDisplayName(fileName.parentDir().fileName());
 
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 0995897322..be81648c23 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -104,7 +104,7 @@ namespace Internal {
 
 CppEditor::CppEditor()
 {
-    addContext(ProjectExplorer::Constants::LANG_CXX);
+    addContext(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
 }
 
 class CppEditorWidgetPrivate
diff --git a/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp b/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
index 612373c857..957de6384f 100644
--- a/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
+++ b/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
@@ -130,7 +130,7 @@ QList<Core::Id> BaseProjectPartBuilder::createProjectPartsForFiles(const QString
 
     if (cat.hasParts()) {
         // The ProjextExplorer does not distinguish between other versions than C++ and QML.
-        languages += ProjectExplorer::Constants::LANG_CXX;
+        languages += ProjectExplorer::Constants::CXX_LANGUAGE_ID;
 
         if (cat.hasCxxSources()) {
             createProjectPart(cat.cxxSources(),
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 0d9a3e6722..965557549b 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -972,7 +972,7 @@ ProjectPart::Ptr CppModelManager::fallbackProjectPart()
 
 bool CppModelManager::isCppEditor(Core::IEditor *editor)
 {
-    return editor->context().contains(ProjectExplorer::Constants::LANG_CXX);
+    return editor->context().contains(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
 }
 
 bool CppModelManager::isClangCodeModelActive() const
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 98a4d3ef32..8eff840de8 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -234,7 +234,7 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const
 {
     if (d.useCppDebugger == AutoEnabledLanguage)
         return runConfiguration()->target()->project()->projectLanguages().contains(
-                    ProjectExplorer::Constants::LANG_CXX);
+                    ProjectExplorer::Constants::CXX_LANGUAGE_ID);
     return d.useCppDebugger == EnabledLanguage;
 }
 
@@ -242,7 +242,7 @@ bool DebuggerRunConfigurationAspect::useQmlDebugger() const
 {
     if (d.useQmlDebugger == AutoEnabledLanguage) {
         const Core::Context languages = runConfiguration()->target()->project()->projectLanguages();
-        if (!languages.contains(ProjectExplorer::Constants::LANG_QMLJS))
+        if (!languages.contains(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID))
             return false;
 
         //
@@ -259,7 +259,7 @@ bool DebuggerRunConfigurationAspect::useQmlDebugger() const
             }
         }
 
-        return !languages.contains(ProjectExplorer::Constants::LANG_CXX);
+        return !languages.contains(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
     }
     return d.useQmlDebugger == EnabledLanguage;
 }
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index ef39655337..a06a6fba10 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -72,7 +72,7 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
     setDocument(new GenericProjectFile(this, fileName, GenericProject::Everything));
     setRootProjectNode(new GenericProjectNode(this));
     setProjectContext(Context(GenericProjectManager::Constants::PROJECTCONTEXT));
-    setProjectLanguages(Context(ProjectExplorer::Constants::LANG_CXX));
+    setProjectLanguages(Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
 
     const QFileInfo fileInfo = projectFilePath().toFileInfo();
     const QDir dir = fileInfo.dir();
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index ee90215398..9c1d4b4f54 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -95,10 +95,6 @@ const char C_PROJECT_TREE[]       = "ProjectExplorer.ProjectTreeContext";
 const char C_APP_OUTPUT[]         = "ProjectExplorer.ApplicationOutput";
 const char C_COMPILE_OUTPUT[]     = "ProjectExplorer.CompileOutput";
 
-// Languages
-const char LANG_CXX[]             = "CXX";
-const char LANG_QMLJS[]           = "QMLJS";
-
 // Menus
 const char M_RECENTPROJECTS[]     = "ProjectExplorer.Menu.Recent";
 const char M_UNLOADPROJECTS[]     = "ProjectExplorer.Menu.Unload";
@@ -214,6 +210,7 @@ const char DEFAULT_DEPLOYCONFIGURATION_ID[] = "ProjectExplorer.DefaultDeployConf
 // Keep these short: These constants are exposed to the MacroExplorer!
 const char C_LANGUAGE_ID[] = "C";
 const char CXX_LANGUAGE_ID[] = "Cxx";
+const char QMLJS_LANGUAGE_ID[] = "QMLJS";
 
 // ToolChain TypeIds
 const char CLANG_TOOLCHAIN_TYPEID[] = "ProjectExplorer.ToolChain.Clang";
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp
index 60ed1a9d7f..c3d523e1b5 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.cpp
+++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp
@@ -460,7 +460,7 @@ PythonProject::PythonProject(PythonProjectManager *manager, const QString &fileN
     setRootProjectNode(new PythonProjectNode(this));
 
     setProjectContext(Context(PythonProjectContext));
-    setProjectLanguages(Context(ProjectExplorer::Constants::LANG_CXX));
+    setProjectLanguages(Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
 
     QFileInfo fileInfo = projectFilePath().toFileInfo();
 
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index b36895c955..8f1c50f774 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -135,7 +135,7 @@ QbsProject::QbsProject(QbsManager *manager, const QString &fileName) :
     setRootProjectNode(new QbsRootProjectNode(this));
 
     setProjectContext(Context(Constants::PROJECT_ID));
-    setProjectLanguages(Context(ProjectExplorer::Constants::LANG_CXX));
+    setProjectLanguages(Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
 
     connect(this, &Project::activeTargetChanged, this, &QbsProject::changeActiveTarget);
     connect(this, &Project::addedTarget, this, &QbsProject::targetWasAdded);
@@ -1137,7 +1137,8 @@ void QbsProject::updateQmlJsCodeModel()
         }
     }
 
-    setProjectLanguage(ProjectExplorer::Constants::LANG_QMLJS, !projectInfo.sourceFiles.isEmpty());
+    setProjectLanguage(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID,
+                       !projectInfo.sourceFiles.isEmpty());
     modelManager->updateProjectInfo(projectInfo, this);
 }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 702ae7a24a..78d392f7af 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -261,7 +261,7 @@ QmakeProject::QmakeProject(QmakeManager *manager, const QString &fileName) :
     setProjectManager(manager);
     setDocument(new QmakeProjectFile(fileName));
     setProjectContext(Core::Context(QmakeProjectManager::Constants::PROJECT_ID));
-    setProjectLanguages(Core::Context(ProjectExplorer::Constants::LANG_CXX));
+    setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
     setRequiredKitPredicate(QtSupport::QtKitInformation::qtVersionPredicate());
 
     const QTextCodec *codec = Core::EditorManager::defaultTextCodec();
@@ -478,7 +478,7 @@ void QmakeProject::updateQmlJSCodeModel()
     // This assumption fails when there are no QDeclarativeEngine/QDeclarativeView (QtQuick 1)
     // or QQmlEngine/QQuickView (QtQuick 2) instances.
     if (hasQmlLib)
-        addProjectLanguage(ProjectExplorer::Constants::LANG_QMLJS);
+        addProjectLanguage(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID);
 
     projectInfo.activeResourceFiles.removeDuplicates();
     projectInfo.allResourceFiles.removeDuplicates();
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 937f614999..ae02a4130c 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -541,7 +541,8 @@ bool QMakeStep::fromMap(const QVariantMap &map)
     // change the qml_debug CONFIG flag based no the qmake build configuration.
     if (map.value(QLatin1String(QMAKE_QMLDEBUGLIBAUTO_KEY), false).toBool()) {
         m_linkQmlDebuggingLibrary =
-                project()->projectLanguages().contains(ProjectExplorer::Constants::LANG_QMLJS) &&
+                project()->projectLanguages().contains(
+                    ProjectExplorer::Constants::QMLJS_LANGUAGE_ID) &&
                 (qmakeBuildConfiguration()->qmakeBuildConfiguration() & BaseQtVersion::DebugBuild);
     } else {
         m_linkQmlDebuggingLibrary = map.value(QLatin1String(QMAKE_QMLDEBUGLIB_KEY), false).toBool();
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 624e9a6bfc..4c244b0c65 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -246,7 +246,7 @@ void QmlDesignerPlugin::integrateIntoQtCreator(QWidget *modeWidget)
     d->context->context().add(qmlDesignerMainContext);
     d->context->context().add(qmlDesignerFormEditorContext);
     d->context->context().add(qmlDesignerNavigatorContext);
-    d->context->context().add(ProjectExplorer::Constants::LANG_QMLJS);
+    d->context->context().add(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID);
 
     d->shortCutManager.registerActions(qmlDesignerMainContext, qmlDesignerFormEditorContext, qmlDesignerNavigatorContext);
 
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 295796e5a3..f68a9d0e4a 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -1017,7 +1017,7 @@ QString QmlJSEditorWidget::foldReplacementText(const QTextBlock &block) const
 
 QmlJSEditor::QmlJSEditor()
 {
-    addContext(ProjectExplorer::Constants::LANG_QMLJS);
+    addContext(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID);
 }
 
 bool QmlJSEditor::isDesignModePreferred() const
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index 1858c28631..16d1503879 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -257,8 +257,11 @@ ModelManagerInterface::WorkingCopy ModelManager::workingCopyInternal() const
         const QString key = document->filePath().toString();
         if (TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(document)) {
             // TODO the language should be a property on the document, not the editor
-            if (DocumentModel::editorsForDocument(document).first()->context().contains(ProjectExplorer::Constants::LANG_QMLJS))
-                workingCopy.insert(key, textDocument->plainText(), textDocument->document()->revision());
+            if (DocumentModel::editorsForDocument(document).first()
+                    ->context().contains(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID)) {
+                workingCopy.insert(key, textDocument->plainText(),
+                                   textDocument->document()->revision());
+            }
         }
     }
 
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index c2e3cb7c87..20883a4d82 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -63,7 +63,7 @@ QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileNa
     setRootProjectNode(new Internal::QmlProjectNode(this));
 
     setProjectContext(Context(QmlProjectManager::Constants::PROJECTCONTEXT));
-    setProjectLanguages(Context(ProjectExplorer::Constants::LANG_QMLJS));
+    setProjectLanguages(Context(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID));
 
     m_projectName = projectFilePath().toFileInfo().completeBaseName();