From 73e72b39c3e9f95d5d1cd10309d35cf4735ffd9b Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Wed, 21 Dec 2016 12:13:16 +0100 Subject: [PATCH] CustomParser: Remove compatibility settings The new settings were introduced in Creator 4.0 Change-Id: Ic68125889574fe6ce6691de8f634d5ad096cd80a Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/customtoolchain.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index 2e5a93be319..3423ce69e8f 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -76,11 +76,6 @@ static const char warningMessageCapKeyC[] = "ProjectExplorer.CustomToolChain.War static const char warningChannelKeyC[] = "ProjectExplorer.CustomToolChain.WarningChannel"; static const char warningExampleKeyC[] = "ProjectExplorer.CustomToolChain.WarningExample"; -// TODO Creator 4.1: remove (added in 3.7 for compatibility) -static const char lineNumberCapKeyC[] = "ProjectExplorer.CustomToolChain.LineNumberCap"; -static const char fileNameCapKeyC[] = "ProjectExplorer.CustomToolChain.FileNameCap"; -static const char messageCapKeyC[] = "ProjectExplorer.CustomToolChain.MessageCap"; - // -------------------------------------------------------------------------- // CustomToolChain // -------------------------------------------------------------------------- @@ -354,14 +349,6 @@ bool CustomToolChain::fromMap(const QVariantMap &data) static_cast(data.value(QLatin1String(warningChannelKeyC)).toInt())); m_customParserSettings.warning.setExample(data.value(QLatin1String(warningExampleKeyC)).toString()); - // TODO Creator 4.1: remove (added in 3.7 for compatibility) - if (m_customParserSettings.error.fileNameCap() == 0) - m_customParserSettings.error.setFileNameCap(data.value(QLatin1String(fileNameCapKeyC)).toInt()); - if (m_customParserSettings.error.lineNumberCap() == 0) - m_customParserSettings.error.setLineNumberCap(data.value(QLatin1String(lineNumberCapKeyC)).toInt()); - if (m_customParserSettings.error.messageCap() == 0) - m_customParserSettings.error.setMessageCap(data.value(QLatin1String(messageCapKeyC)).toInt()); - QTC_ASSERT(m_outputParser >= Gcc && m_outputParser < OutputParserCount, return false); return true;