From 3b9dfa2b96f2cfe74e45d86dee31f3986e1499fc Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Wed, 7 Mar 2018 18:23:26 +0100 Subject: [PATCH] CustomParser: Remove upgrade path for legacy settings ... after converting the enum-based parser selection to a string-based system. The upgrade path has been available for four major Creator versions. Introduced by 2ff642d8e4e2f16b01d20ad589d07f4620f0f914 Change-Id: I0c7ef9794f56d9a1a663cc4bd4a7eeacf3847834 Reviewed-by: Orgad Shaneh --- .../projectexplorer/customtoolchain.cpp | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index a5b9a743025..e8feb0b15fb 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -379,43 +379,8 @@ Core::Id CustomToolChain::outputParserId() const return m_outputParserId; } -static Core::Id convertLegacySettings(Core::Id parserId) -{ - enum OutputParser - { - Gcc = 0, - Clang = 1, - LinuxIcc = 2, - Msvc = 3, - Custom = 4, - OutputParserCount - }; - - bool ok; - const OutputParser index = static_cast(parserId.toString().toInt(&ok)); - if (!ok) - return parserId; - - switch (index) { - case Gcc: - return GccParser::id(); - case Clang: - return ClangParser::id(); - case LinuxIcc: - return LinuxIccParser::id(); - case Msvc: - return HostOsInfo::isWindowsHost() ? MsvcParser::id() : CustomParser::id(); - case Custom: - return CustomParser::id(); - default: - return parserId; - } -} - void CustomToolChain::setOutputParserId(Core::Id parserId) { - parserId = convertLegacySettings(parserId); - if (m_outputParserId == parserId) return; m_outputParserId = parserId;