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

Utils/all: Create an OutputFormatterFactory

Browse Source 
Essentially following the scheme used for the various project
configurations. This makes it possible to construct OutputFormatters
by Id only, potentially reducing hard plugin dependencies and
opening the road to have several output formatters per
RunConfiguration/Outputpane/...

Change-Id: I4b5fb6fb6be8b0d9a0859f178bb0effc3398b09e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-08-06 10:57:59 +02:00
parent 86e9c42c90
commit fcffb5f2fc
16 changed files with 137 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -326,11 +326,7 @@ void RunControl::setRunConfiguration(RunConfiguration *runConfig)
d->runConfiguration = runConfig;
d->runConfigId = runConfig->id();
d->runnable = runConfig->runnable();
d->displayName = runConfig->displayName();
if (auto outputFormatter = runConfig->createOutputFormatter()) {
delete d->outputFormatter;
d->outputFormatter = outputFormatter;
}
d->displayName = runConfig->displayName();
d->macroExpander = runConfig->macroExpander();
setTarget(runConfig->target());
}
@@ -340,6 +336,12 @@ void RunControl::setTarget(Target *target)
QTC_ASSERT(target, return);
QTC_CHECK(!d->target);
d->target = target;
delete d->outputFormatter;
d->outputFormatter = OutputFormatterFactory::createFormatter(target);
if (!d->outputFormatter)
d->outputFormatter = new OutputFormatter();
setKit(target->kit());
d->project = target->project();
}
@@ -1557,4 +1559,37 @@ void Runnable::setCommandLine(const CommandLine &cmdLine)
commandLineArguments = cmdLine.arguments();
}
// OutputFormatterFactory
static QList<OutputFormatterFactory *> g_outputFormatterFactories;
OutputFormatterFactory::OutputFormatterFactory()
{
// This is a bit cheating: We know that only two formatters exist right now,
// and this here gives the second (python) implicit more priority.
// For a final solution, probably all matching formatters should be used
// in parallel, so there's no need to invent a fancy priority system here.
g_outputFormatterFactories.prepend(this);
}
OutputFormatterFactory::~OutputFormatterFactory()
{
g_outputFormatterFactories.removeOne(this);
}
OutputFormatter *OutputFormatterFactory::createFormatter(Target *target)
{
for (auto factory : qAsConst(g_outputFormatterFactories)) {
if (auto formatter = factory->m_creator(target))
return formatter;
}
return nullptr;
}
void OutputFormatterFactory::setFormatterCreator
(const std::function<OutputFormatter *(Target *)> &creator)
{
m_creator = creator;
}
} // namespace ProjectExplorer