feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools/ProjectExplorer: Remove enum duplication

Browse Source 
... between CppTools::ProjectPart and ProjectExplorer::ToolChain.

Change-Id: I8b448747e454adbed77547460383b8515462cc81
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-10-08 09:49:02 +02:00
parent 167f08e2ce
commit 6aa11eb75e
29 changed files with 206 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/cpptools/projectpart.h
View File

@@ -30,6 +30,7 @@
#include "cppprojectfile.h"
#include <projectexplorer/headerpath.h>
#include <projectexplorer/language.h>
#include <projectexplorer/projectexplorer_global.h>
#include <projectexplorer/projectmacro.h>
@@ -49,38 +50,6 @@ namespace CppTools {
class CPPTOOLS_EXPORT ProjectPart
{
public:
// Keep in sync with Toolchain::LanguageVersion!
enum LanguageVersion {
C89,
C99,
C11,
C18,
LatestCVersion = C18,
CXX98,
CXX03,
CXX11,
CXX14,
CXX17,
CXX2a,
LatestCxxVersion = CXX2a,
};
enum LanguageExtension {
NoExtensions = 0,
GnuExtensions = 1 << 0,
MicrosoftExtensions = 1 << 1,
BorlandExtensions = 1 << 2,
OpenMPExtensions = 1 << 3,
ObjectiveCExtensions = 1 << 4,
AllExtensions = GnuExtensions
| MicrosoftExtensions
| BorlandExtensions
| OpenMPExtensions
| ObjectiveCExtensions
};
Q_DECLARE_FLAGS(LanguageExtensions, LanguageExtension)
enum QtVersion {
UnknownQt = -1,
NoQt,
@@ -129,8 +98,8 @@ public:
ProjectExplorer::Macros projectMacros;
LanguageVersion languageVersion = LatestCxxVersion;
LanguageExtensions languageExtensions = NoExtensions;
ProjectExplorer::LanguageVersion languageVersion = ProjectExplorer::LanguageVersion::LatestCxx;
ProjectExplorer::LanguageExtensions languageExtensions = ProjectExplorer::LanguageExtension::None;
ProjectExplorer::WarningFlags warningFlags = ProjectExplorer::WarningFlags::Default;
QtVersion qtVersion = UnknownQt;
CPlusPlus::LanguageFeatures languageFeatures;