diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-10-08 09:49:02 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-10-08 12:34:57 +0000 |
commit | 6aa11eb75e2374bc1c0c643588b3d06d797759be (patch) | |
tree | e9b21a6049c0b76ff9b179124efa88aa51ecc484 /src/plugins/cpptools/cppcodemodelinspectordumper.cpp | |
parent | 167f08e2ce0dd5b10e9436987509bc5392871c5b (diff) | |
download | qt-creator-6aa11eb75e2374bc1c0c643588b3d06d797759be.tar.gz |
CppTools/ProjectExplorer: Remove enum duplication
... 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>
Diffstat (limited to 'src/plugins/cpptools/cppcodemodelinspectordumper.cpp')
-rw-r--r-- | src/plugins/cpptools/cppcodemodelinspectordumper.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/cpptools/cppcodemodelinspectordumper.cpp b/src/plugins/cpptools/cppcodemodelinspectordumper.cpp index 540ac99104..e359f71a05 100644 --- a/src/plugins/cpptools/cppcodemodelinspectordumper.cpp +++ b/src/plugins/cpptools/cppcodemodelinspectordumper.cpp @@ -103,9 +103,9 @@ QString Utils::toString(ProjectExplorer::HeaderPathType type) return QString(); } -QString Utils::toString(ProjectPart::LanguageVersion languageVersion) +QString Utils::toString(ProjectExplorer::LanguageVersion languageVersion) { -#define CASE_LANGUAGEVERSION(x) case ProjectPart::x: return QLatin1String(#x) +#define CASE_LANGUAGEVERSION(x) case ProjectExplorer::LanguageVersion::x: return QLatin1String(#x) switch (languageVersion) { CASE_LANGUAGEVERSION(C89); CASE_LANGUAGEVERSION(C99); @@ -123,19 +123,19 @@ QString Utils::toString(ProjectPart::LanguageVersion languageVersion) return QString(); } -QString Utils::toString(ProjectPart::LanguageExtensions languageExtension) +QString Utils::toString(ProjectExplorer::LanguageExtensions languageExtension) { QString result; -#define CASE_LANGUAGE_EXTENSION(ext) if (languageExtension & ProjectPart::ext) \ +#define CASE_LANGUAGE_EXTENSION(ext) if (languageExtension & ProjectExplorer::LanguageExtension::ext) \ result += QLatin1String(#ext ", "); - CASE_LANGUAGE_EXTENSION(NoExtensions); - CASE_LANGUAGE_EXTENSION(GnuExtensions); - CASE_LANGUAGE_EXTENSION(MicrosoftExtensions); - CASE_LANGUAGE_EXTENSION(BorlandExtensions); - CASE_LANGUAGE_EXTENSION(OpenMPExtensions); - CASE_LANGUAGE_EXTENSION(ObjectiveCExtensions); + CASE_LANGUAGE_EXTENSION(None); + CASE_LANGUAGE_EXTENSION(Gnu); + CASE_LANGUAGE_EXTENSION(Microsoft); + CASE_LANGUAGE_EXTENSION(Borland); + CASE_LANGUAGE_EXTENSION(OpenMP); + CASE_LANGUAGE_EXTENSION(ObjectiveC); #undef CASE_LANGUAGE_EXTENSION if (result.endsWith(QLatin1String(", "))) result.chop(2); |