diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-10-08 10:54:27 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-10-09 08:14:09 +0000 |
| commit | 3c5dc450b8ec797ba625c1a208c458fee5bd8d2f (patch) | |
| tree | df52117fdaf39c6b4e3bb6a46856adb0b47b6f2c /src/plugins/cpptools | |
| parent | 74fbcd9c636aff09ee1f347a7a19313640aeba32 (diff) | |
| download | qt-creator-3c5dc450b8ec797ba625c1a208c458fee5bd8d2f.tar.gz | |
CppTools: Remove enum duplication
Change-Id: I2eb452780c21f8d30034bcfbb3266fc8daa10802
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppprojectinfogenerator.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppprojectinfogenerator.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cppprojectinfogenerator.cpp b/src/plugins/cpptools/cppprojectinfogenerator.cpp index 0e2d8bc366..9eec00ed54 100644 --- a/src/plugins/cpptools/cppprojectinfogenerator.cpp +++ b/src/plugins/cpptools/cppprojectinfogenerator.cpp @@ -72,7 +72,7 @@ public: } else { // No compiler set in kit. if (m_language == Language::C) m_projectPart.languageVersion = ProjectExplorer::LanguageVersion::LatestC; - if (m_language == Language::CXX) + else if (m_language == Language::Cxx) m_projectPart.languageVersion = ProjectExplorer::LanguageVersion::LatestCxx; } @@ -178,7 +178,7 @@ QVector<ProjectPart::Ptr> ProjectInfoGenerator::createProjectParts(const RawProj part, cat.cxxSources(), cat.partName("C++"), - Language::CXX, + Language::Cxx, LanguageExtension::None); } @@ -187,7 +187,7 @@ QVector<ProjectPart::Ptr> ProjectInfoGenerator::createProjectParts(const RawProj part, cat.objcxxSources(), cat.partName("Obj-C++"), - Language::CXX, + Language::Cxx, LanguageExtension::ObjectiveC); } diff --git a/src/plugins/cpptools/cppprojectinfogenerator.h b/src/plugins/cpptools/cppprojectinfogenerator.h index 752c648fd1..6f97faf9cb 100644 --- a/src/plugins/cpptools/cppprojectinfogenerator.h +++ b/src/plugins/cpptools/cppprojectinfogenerator.h @@ -25,6 +25,7 @@ #pragma once +#include "cpptools_utils.h" #include "projectinfo.h" #include <QFutureInterface> @@ -32,8 +33,6 @@ namespace CppTools { namespace Internal { -enum class Language { C, CXX }; - class ProjectInfoGenerator { public: |