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

ProjectExplorer: Remove legacy code

Browse Source 
No need to support pre-4.13 settings for an exotic feature like custom
toolchain parsers.

Change-Id: I4c9267d687049f66d3427ed596c91aaaa3c4a2eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-04-20 16:16:08 +02:00
parent c53e846ab9
commit fd02996ec9
3 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/customparser.cpp
View File

@@ -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

1
src/plugins/projectexplorer/customparser.h
View File

@@ -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;

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

@@ -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<CustomParserExpression::CustomParserChannel>(
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<CustomParserExpression::CustomParserChannel>(
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<CustomParserSettings> settings = ProjectExplorerPlugin::customParsers();
settings << customParserSettings;
ProjectExplorerPlugin::setCustomParsers(settings);
}
}
return true;
}