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

CustomParser: Remove compatibility settings

Browse Source 
The new settings were introduced in Creator 4.0

Change-Id: Ic68125889574fe6ce6691de8f634d5ad096cd80a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Andre Hartmann
2016-12-21 12:13:16 +01:00
committed by André Hartmann
parent aaf86ae636
commit 73e72b39c3
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/customtoolchain.cpp
View File

@@ -76,11 +76,6 @@ static const char warningMessageCapKeyC[] = "ProjectExplorer.CustomToolChain.War
static const char warningChannelKeyC[] = "ProjectExplorer.CustomToolChain.WarningChannel"; static const char warningChannelKeyC[] = "ProjectExplorer.CustomToolChain.WarningChannel";
static const char warningExampleKeyC[] = "ProjectExplorer.CustomToolChain.WarningExample"; 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 // CustomToolChain
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -354,14 +349,6 @@ bool CustomToolChain::fromMap(const QVariantMap &data)
static_cast<CustomParserExpression::CustomParserChannel>(data.value(QLatin1String(warningChannelKeyC)).toInt())); static_cast<CustomParserExpression::CustomParserChannel>(data.value(QLatin1String(warningChannelKeyC)).toInt()));
m_customParserSettings.warning.setExample(data.value(QLatin1String(warningExampleKeyC)).toString()); 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); QTC_ASSERT(m_outputParser >= Gcc && m_outputParser < OutputParserCount, return false);
return true; return true;