Commit d6d48fa2 authored by dt's avatar dt
Browse files

Some cleanup after BuildConfiguration refactoring

parent 87e642a4
......@@ -102,8 +102,6 @@ void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
bool MakeStep::init()
{
CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
// TODO, we should probably have a member cmakeBuildConfiguration();
setBuildParser(bc->buildParser());
setEnabled(true);
......
......@@ -125,7 +125,6 @@ QString GenericMakeStep::makeCommand() const
{
QString command = m_makeCommand;
if (command.isEmpty()) {
// TODO
GenericProject *pro = genericBuildConfiguration()->genericProject();
if (ProjectExplorer::ToolChain *toolChain = pro->toolChain())
command = toolChain->makeCommand();
......@@ -187,7 +186,6 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
m_ui->setupUi(this);
// TODO update this list also on rescans of the GenericLists.txt
//TODO
GenericProject *pro = m_makeStep->genericBuildConfiguration()->genericProject();
foreach (const QString &target, pro->targets()) {
QListWidgetItem *item = new QListWidgetItem(target, m_ui->targetsList);
......
......@@ -158,7 +158,6 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(const QString &type
BuildConfiguration *GenericBuildConfigurationFactory::clone(BuildConfiguration *source) const
{
// TODO
GenericBuildConfiguration *bc = new GenericBuildConfiguration(static_cast<GenericBuildConfiguration *>(source));
m_project->addBuildConfiguration(bc);
return bc;
......
......@@ -379,7 +379,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
BuildConfiguration *Project::activeBuildConfiguration() const
{
return m_activeBuildConfiguration; //TODO
return m_activeBuildConfiguration;
}
void Project::setActiveBuildConfiguration(BuildConfiguration *configuration)
......
......@@ -106,7 +106,6 @@ bool MakeStep::init()
Environment environment = bc->environment();
setEnvironment(environment);
//TODO
QString workingDirectory = bc->buildDirectory();
setWorkingDirectory(workingDirectory);
......
......@@ -80,7 +80,6 @@ QStringList QMakeStep::allArguments()
arguments << buildConfiguration()->project()->file()->fileName();
arguments << "-r";
// TODO
if (!additonalArguments.contains("-spec"))
arguments << "-spec" << bc->qtVersion()->mkspec();
......@@ -116,7 +115,6 @@ QStringList QMakeStep::allArguments()
bool QMakeStep::init()
{
// TODO
Qt4BuildConfiguration *qt4bc = qt4BuildConfiguration();
const QtVersion *qtVersion = qt4bc->qtVersion();
......
......@@ -269,7 +269,7 @@ MakeStep *Qt4BuildConfiguration::makeStep() const
}
// returns true if both are equal
bool Qt4BuildConfiguration::compareBuildConfigurationToImportFrom(const QString &workingDirectory)
bool Qt4BuildConfiguration::compareToImportFrom(const QString &workingDirectory)
{
QMakeStep *qs = qmakeStep();
if (QDir(workingDirectory).exists(QLatin1String("Makefile")) && qs) {
......
......@@ -94,8 +94,7 @@ public:
QString makeCommand() const;
QString defaultMakeTarget() const;
// TODO rename
bool compareBuildConfigurationToImportFrom(const QString &workingDirectory);
bool compareToImportFrom(const QString &workingDirectory);
static QStringList removeSpecFromArgumentList(const QStringList &old);
static QString extractSpecFromArgumentList(const QStringList &list, QString directory, QtVersion *version);
......
......@@ -241,7 +241,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
visible = true;
} else {
// check that the qmake flags, arguments match
visible = !m_buildConfiguration->compareBuildConfigurationToImportFrom(m_buildConfiguration->buildDirectory());
visible = !m_buildConfiguration->compareToImportFrom(m_buildConfiguration->buildDirectory());
}
} else {
visible = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment