diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp index 7d19d57560c..2dca4970552 100644 --- a/src/plugins/projectexplorer/customparser.cpp +++ b/src/plugins/projectexplorer/customparser.cpp @@ -226,11 +226,6 @@ CustomParser *CustomParser::createFromId(Utils::Id id) return nullptr; } -Utils::Id CustomParser::id() -{ - return Utils::Id("ProjectExplorer.OutputParser.Custom"); -} - OutputLineParser::Result CustomParser::handleLine(const QString &line, OutputFormat type) { const CustomParserExpression::CustomParserChannel channel = type == StdErrFormat diff --git a/src/plugins/projectexplorer/customparser.h b/src/plugins/projectexplorer/customparser.h index 125ac3bd923..a99ae18dbb2 100644 --- a/src/plugins/projectexplorer/customparser.h +++ b/src/plugins/projectexplorer/customparser.h @@ -124,7 +124,6 @@ public: void setSettings(const CustomParserSettings &settings); static CustomParser *createFromId(Utils::Id id); - static Utils::Id id(); private: Result handleLine(const QString &line, Utils::OutputFormat type) override; diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index 9ead29bf35e..3b8b3a49380 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -264,47 +264,6 @@ bool CustomToolChain::fromMap(const QVariantMap &data) setMkspecs(data.value(QLatin1String(mkspecsKeyC)).toString()); setOutputParserId(Utils::Id::fromSetting(data.value(QLatin1String(outputParserKeyC)))); - // Restore Pre-4.13 settings. - if (outputParserId() == Internal::CustomParser::id()) { - CustomParserSettings customParserSettings; - customParserSettings.error.setPattern( - data.value("ProjectExplorer.CustomToolChain.ErrorPattern").toString()); - customParserSettings.error.setFileNameCap( - data.value("ProjectExplorer.CustomToolChain.ErrorLineNumberCap").toInt()); - customParserSettings.error.setLineNumberCap( - data.value("ProjectExplorer.CustomToolChain.ErrorFileNameCap").toInt()); - customParserSettings.error.setMessageCap( - data.value("ProjectExplorer.CustomToolChain.ErrorMessageCap").toInt()); - customParserSettings.error.setChannel( - static_cast( - data.value("ProjectExplorer.CustomToolChain.ErrorChannel").toInt())); - customParserSettings.error.setExample( - data.value("ProjectExplorer.CustomToolChain.ErrorExample").toString()); - customParserSettings.warning.setPattern( - data.value("ProjectExplorer.CustomToolChain.WarningPattern").toString()); - customParserSettings.warning.setFileNameCap( - data.value("ProjectExplorer.CustomToolChain.WarningLineNumberCap").toInt()); - customParserSettings.warning.setLineNumberCap( - data.value("ProjectExplorer.CustomToolChain.WarningFileNameCap").toInt()); - customParserSettings.warning.setMessageCap( - data.value("ProjectExplorer.CustomToolChain.WarningMessageCap").toInt()); - customParserSettings.warning.setChannel( - static_cast( - data.value("ProjectExplorer.CustomToolChain.WarningChannel").toInt())); - customParserSettings.warning.setExample( - data.value("ProjectExplorer.CustomToolChain.WarningExample").toString()); - if (!customParserSettings.error.pattern().isEmpty() - || !customParserSettings.error.pattern().isEmpty()) { - // Found custom parser in old settings, move to new place. - customParserSettings.id = Utils::Id::fromString(QUuid::createUuid().toString()); - setOutputParserId(customParserSettings.id); - customParserSettings.displayName = tr("Parser for toolchain %1").arg(displayName()); - QList settings = ProjectExplorerPlugin::customParsers(); - settings << customParserSettings; - ProjectExplorerPlugin::setCustomParsers(settings); - } - } - return true; }