From 3c5dc450b8ec797ba625c1a208c458fee5bd8d2f Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 8 Oct 2018 10:54:27 +0200 Subject: [PATCH] CppTools: Remove enum duplication Change-Id: I2eb452780c21f8d30034bcfbb3266fc8daa10802 Reviewed-by: Ivan Donchevskii --- src/plugins/cpptools/cppprojectinfogenerator.cpp | 6 +++--- 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 0e2d8bc3663..9eec00ed54d 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 ProjectInfoGenerator::createProjectParts(const RawProj part, cat.cxxSources(), cat.partName("C++"), - Language::CXX, + Language::Cxx, LanguageExtension::None); } @@ -187,7 +187,7 @@ QVector 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 752c648fd1a..6f97faf9cbf 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 @@ -32,8 +33,6 @@ namespace CppTools { namespace Internal { -enum class Language { C, CXX }; - class ProjectInfoGenerator { public: