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

RunConfigurationAspect: Add RunConfiguration parameter to factory method

Browse Source 
Change-Id: I7fbb82dc3ff83593473a57c69d0eb89bc33f50f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-03-26 16:39:41 +01:00
parent 5d4c4a6968
commit 1650c22b7b
23 changed files with 75 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -37,7 +37,6 @@
#include "kitinformation.h"
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
#include <utils/outputformatter.h>
#include <utils/checkablemessagebox.h>
@@ -273,15 +272,16 @@ DebuggerRunConfigurationAspect *DebuggerRunConfigurationAspect::clone(RunConfigu
RunConfiguration::RunConfiguration(Target *target, const Core::Id id) :
ProjectConfiguration(target, id),
m_debuggerAspect(new DebuggerRunConfigurationAspect(this))
m_debuggerAspect(new DebuggerRunConfigurationAspect(this)),
m_aspectsInitialized(false)
{
Q_ASSERT(target);
addExtraAspects();
}
RunConfiguration::RunConfiguration(Target *target, RunConfiguration *source) :
ProjectConfiguration(target, source),
m_debuggerAspect(source->debuggerAspect()->clone(this))
m_debuggerAspect(source->debuggerAspect()->clone(this)),
m_aspectsInitialized(true)
{
Q_ASSERT(target);
foreach (IRunConfigurationAspect *aspect, source->m_aspects) {
@@ -299,9 +299,13 @@ RunConfiguration::~RunConfiguration()
void RunConfiguration::addExtraAspects()
{
if (m_aspectsInitialized)
return;
foreach (IRunControlFactory *factory, ExtensionSystem::PluginManager::getObjects<IRunControlFactory>())
if (IRunConfigurationAspect *aspect = factory->createRunConfigurationAspect())
if (IRunConfigurationAspect *aspect = factory->createRunConfigurationAspect(this))
m_aspects.append(aspect);
m_aspectsInitialized = true;
}
/*!
@@ -376,6 +380,7 @@ ProjectExplorer::Abi RunConfiguration::abi() const
bool RunConfiguration::fromMap(const QVariantMap &map)
{
addExtraAspects();
m_debuggerAspect->fromMap(map);
foreach (IRunConfigurationAspect *aspect, m_aspects)
@@ -402,6 +407,7 @@ bool RunConfiguration::fromMap(const QVariantMap &map)
QList<IRunConfigurationAspect *> RunConfiguration::extraAspects() const
{
QTC_ASSERT(m_aspectsInitialized, return QList<IRunConfigurationAspect *>());
return m_aspects;
}
@@ -445,6 +451,17 @@ IRunConfigurationFactory::~IRunConfigurationFactory()
{
}
RunConfiguration *IRunConfigurationFactory::create(Target *parent, const Core::Id id)
{
if (!canCreate(parent, id))
return 0;
RunConfiguration *rc = doCreate(parent, id);
if (!rc)
return 0;
rc->addExtraAspects();
return rc;
}
IRunConfigurationFactory *IRunConfigurationFactory::find(Target *parent, const QVariantMap &map)
{
QList<IRunConfigurationFactory *> factories
@@ -512,8 +529,9 @@ IRunControlFactory::~IRunControlFactory()
{
}
IRunConfigurationAspect *IRunControlFactory::createRunConfigurationAspect()
IRunConfigurationAspect *IRunControlFactory::createRunConfigurationAspect(RunConfiguration *rc)
{
Q_UNUSED(rc);
return 0;
}