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

Remove the build config display name method from Project

Browse Source
This commit is contained in:
con
2009-09-21 17:54:02 +02:00
parent 21565b99d1
commit 30362e1050
6 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View File

@@ -31,6 +31,7 @@
#include "buildstep.h" #include "buildstep.h"
#include "buildstepspage.h" #include "buildstepspage.h"
#include "project.h" #include "project.h"
#include "buildconfiguration.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -188,7 +189,7 @@ void BuildSettingsWidget::buildConfigurationDisplayNameChanged(const QString &bu
{ {
for (int i=0; i<m_buildConfigurationComboBox->count(); ++i) { for (int i=0; i<m_buildConfigurationComboBox->count(); ++i) {
if (m_buildConfigurationComboBox->itemData(i).toString() == buildConfiguration) { if (m_buildConfigurationComboBox->itemData(i).toString() == buildConfiguration) {
m_buildConfigurationComboBox->setItemText(i, m_project->displayNameFor(buildConfiguration)); m_buildConfigurationComboBox->setItemText(i, m_project->buildConfiguration(buildConfiguration)->displayName());
break; break;
} }
} }
@@ -220,7 +221,7 @@ void BuildSettingsWidget::updateBuildSettings()
// Add tree items // Add tree items
foreach (const QString &buildConfiguration, m_project->buildConfigurations()) { foreach (const QString &buildConfiguration, m_project->buildConfigurations()) {
m_buildConfigurationComboBox->addItem(m_project->displayNameFor(buildConfiguration), buildConfiguration); m_buildConfigurationComboBox->addItem(m_project->buildConfiguration(buildConfiguration)->displayName(), buildConfiguration);
if (buildConfiguration == m_buildConfiguration) if (buildConfiguration == m_buildConfiguration)
m_buildConfigurationComboBox->setCurrentIndex(m_buildConfigurationComboBox->count() - 1); m_buildConfigurationComboBox->setCurrentIndex(m_buildConfigurationComboBox->count() - 1);
} }
@@ -273,7 +274,7 @@ void BuildSettingsWidget::createConfiguration()
// Check that we don't have a configuration with the same displayName // Check that we don't have a configuration with the same displayName
QStringList displayNames; QStringList displayNames;
foreach (const QString &bc, buildConfigurations) foreach (const QString &bc, buildConfigurations)
displayNames << m_project->displayNameFor(bc); displayNames << m_project->buildConfiguration(bc)->displayName();
if (displayNames.contains(newDisplayName)) { if (displayNames.contains(newDisplayName)) {
int i = 2; int i = 2;
@@ -325,7 +326,7 @@ void BuildSettingsWidget::cloneConfiguration(const QString &sourceConfiguration)
// Check that we don't have a configuration with the same displayName // Check that we don't have a configuration with the same displayName
QStringList displayNames; QStringList displayNames;
foreach (const QString &bc, buildConfigurations) foreach (const QString &bc, buildConfigurations)
displayNames << m_project->displayNameFor(bc); displayNames << m_project->buildConfiguration(bc)->displayName();
if (displayNames.contains(newDisplayName)) { if (displayNames.contains(newDisplayName)) {
int i = 2; int i = 2;

33
src/plugins/projectexplorer/project.cpp
View File

@@ -215,7 +215,7 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
//save buildsettings //save buildsettings
foreach (const QString &buildConfigurationName, buildConfigurations()) { foreach (const QString &buildConfigurationName, buildConfigurations()) {
QMap<QString, QVariant> temp = QMap<QString, QVariant> temp =
getBuildConfiguration(buildConfigurationName)->toMap(); buildConfiguration(buildConfigurationName)->toMap();
writer.saveValue("buildConfiguration-" + buildConfigurationName, temp); writer.saveValue("buildConfiguration-" + buildConfigurationName, temp);
} }
@@ -297,7 +297,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
addBuildConfiguration(buildConfigurationName); addBuildConfiguration(buildConfigurationName);
QMap<QString, QVariant> temp = QMap<QString, QVariant> temp =
reader.restoreValue("buildConfiguration-" + buildConfigurationName).toMap(); reader.restoreValue("buildConfiguration-" + buildConfigurationName).toMap();
getBuildConfiguration(buildConfigurationName)->setValuesFromMap(temp); buildConfiguration(buildConfigurationName)->setValuesFromMap(temp);
} }
const QList<IBuildStepFactory *> buildStepFactories = const QList<IBuildStepFactory *> buildStepFactories =
@@ -410,7 +410,7 @@ QVariant Project::value(const QString &name) const
return QVariant(); return QVariant();
} }
BuildConfiguration *Project::getBuildConfiguration(const QString &name) const BuildConfiguration *Project::buildConfiguration(const QString &name) const
{ {
for (int i = 0; i != m_buildConfigurationValues.size(); ++i) for (int i = 0; i != m_buildConfigurationValues.size(); ++i)
if (m_buildConfigurationValues.at(i)->name() == name) if (m_buildConfigurationValues.at(i)->name() == name)
@@ -418,16 +418,16 @@ BuildConfiguration *Project::getBuildConfiguration(const QString &name) const
return 0; return 0;
} }
void Project::setValue(const QString &buildConfiguration, const QString &name, const QVariant &value) void Project::setValue(const QString &buildConfigurationName, const QString &name, const QVariant &value)
{ {
BuildConfiguration *bc = getBuildConfiguration(buildConfiguration); BuildConfiguration *bc = buildConfiguration(buildConfigurationName);
Q_ASSERT(bc); Q_ASSERT(bc);
bc->setValue(name, value); bc->setValue(name, value);
} }
QVariant Project::value(const QString &buildConfiguration, const QString &name) const QVariant Project::value(const QString &buildConfigurationName, const QString &name) const
{ {
BuildConfiguration *bc = getBuildConfiguration(buildConfiguration); BuildConfiguration *bc = buildConfiguration(buildConfigurationName);
if (bc) if (bc)
return bc->value(name); return bc->value(name);
else else
@@ -502,27 +502,22 @@ EditorConfiguration *Project::editorConfiguration() const
return m_editorConfiguration; return m_editorConfiguration;
} }
QString Project::displayNameFor(const QString &buildConfiguration) void Project::setDisplayNameFor(const QString &buildConfigurationName, const QString &displayName)
{
return getBuildConfiguration(buildConfiguration)->displayName();
}
void Project::setDisplayNameFor(const QString &buildConfiguration, const QString &displayName)
{ {
QStringList displayNames; QStringList displayNames;
foreach (const QString &bc, buildConfigurations()) { foreach (BuildConfiguration *bc, m_buildConfigurationValues) {
if (bc != buildConfiguration) if (bc->name() != buildConfigurationName)
displayNames << displayNameFor(bc); displayNames << bc->displayName();
} }
if (displayNames.contains(displayName)) { if (displayNames.contains(displayName)) {
int i = 2; int i = 2;
while (displayNames.contains(displayName + QString::number(i))) while (displayNames.contains(displayName + QString::number(i)))
++i; ++i;
getBuildConfiguration(buildConfiguration)->setDisplayName(displayName + QString::number(i)); buildConfiguration(buildConfigurationName)->setDisplayName(displayName + QString::number(i));
} else { } else {
getBuildConfiguration(buildConfiguration)->setDisplayName(displayName); buildConfiguration(buildConfigurationName)->setDisplayName(displayName);
} }
emit buildConfigurationDisplayNameChanged(buildConfiguration); emit buildConfigurationDisplayNameChanged(buildConfigurationName);
} }
QByteArray Project::predefinedMacros(const QString &) const QByteArray Project::predefinedMacros(const QString &) const

7
src/plugins/projectexplorer/project.h
View File

@@ -56,10 +56,7 @@ class Environment;
class ProjectNode; class ProjectNode;
class PersistentSettingsWriter; class PersistentSettingsWriter;
class PersistentSettingsReader; class PersistentSettingsReader;
namespace Internal {
class BuildConfiguration; class BuildConfiguration;
}
class PROJECTEXPLORER_EXPORT Project class PROJECTEXPLORER_EXPORT Project
: public QObject : public QObject
@@ -101,8 +98,8 @@ public:
void addBuildConfiguration(const QString &name); void addBuildConfiguration(const QString &name);
void removeBuildConfiguration(const QString &name); void removeBuildConfiguration(const QString &name);
void copyBuildConfiguration(const QString &source, const QString &dest); void copyBuildConfiguration(const QString &source, const QString &dest);
BuildConfiguration *buildConfiguration(const QString & name) const;
QStringList buildConfigurations() const; QStringList buildConfigurations() const;
QString displayNameFor(const QString &buildConfiguration);
void setDisplayNameFor(const QString &buildConfiguration, const QString &displayName); void setDisplayNameFor(const QString &buildConfiguration, const QString &displayName);
QString activeBuildConfiguration() const; QString activeBuildConfiguration() const;
@@ -191,8 +188,6 @@ protected:
virtual bool restoreSettingsImpl(PersistentSettingsReader &reader); virtual bool restoreSettingsImpl(PersistentSettingsReader &reader);
private: private:
BuildConfiguration *getBuildConfiguration(const QString & name) const;
QList<BuildStep *> m_buildSteps; QList<BuildStep *> m_buildSteps;
QList<BuildStep *> m_cleanSteps; QList<BuildStep *> m_cleanSteps;
QStringList m_buildConfigurations; QStringList m_buildConfigurations;

3
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -62,6 +62,7 @@
#include "projectwelcomepage.h" #include "projectwelcomepage.h"
#include "projectwelcomepagewidget.h" #include "projectwelcomepagewidget.h"
#include "corelistenercheckingforrunningbuild.h" #include "corelistenercheckingforrunningbuild.h"
#include "buildconfiguration.h"
#include <coreplugin/basemode.h> #include <coreplugin/basemode.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
@@ -1916,7 +1917,7 @@ void ProjectExplorerPlugin::populateBuildConfigurationMenu()
if (Project *pro = d->m_currentProject) { if (Project *pro = d->m_currentProject) {
const QString &activeBuildConfiguration = pro->activeBuildConfiguration(); const QString &activeBuildConfiguration = pro->activeBuildConfiguration();
foreach (const QString &buildConfiguration, pro->buildConfigurations()) { foreach (const QString &buildConfiguration, pro->buildConfigurations()) {
QString displayName = pro->displayNameFor(buildConfiguration); QString displayName = pro->buildConfiguration(buildConfiguration)->displayName();
QAction *act = new QAction(displayName, d->m_buildConfigurationActionGroup); QAction *act = new QAction(displayName, d->m_buildConfigurationActionGroup);
if (debug) if (debug)
qDebug() << "BuildConfiguration " << buildConfiguration << "active: " << activeBuildConfiguration; qDebug() << "BuildConfiguration " << buildConfiguration << "active: " << activeBuildConfiguration;

7
src/plugins/projectexplorer/projectwindow.cpp
View File

@@ -37,6 +37,7 @@
#include "session.h" #include "session.h"
#include "projecttreewidget.h" #include "projecttreewidget.h"
#include "runconfiguration.h" #include "runconfiguration.h"
#include "buildconfiguration.h"
#include <coreplugin/minisplitter.h> #include <coreplugin/minisplitter.h>
#include <coreplugin/fileiconprovider.h> #include <coreplugin/fileiconprovider.h>
@@ -436,7 +437,7 @@ BuildConfigurationComboBox::BuildConfigurationComboBox(Project *p, QWidget *pare
//m_comboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents); //m_comboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
QStringList buildConfigurations = p->buildConfigurations(); QStringList buildConfigurations = p->buildConfigurations();
foreach(const QString &buildConfiguration, buildConfigurations) foreach(const QString &buildConfiguration, buildConfigurations)
m_comboBox->addItem(p->displayNameFor(buildConfiguration), buildConfiguration); m_comboBox->addItem(p->buildConfiguration(buildConfiguration)->displayName(), buildConfiguration);
if (buildConfigurations.count() == 1) { if (buildConfigurations.count() == 1) {
m_label->setText(m_comboBox->itemText(0)); m_label->setText(m_comboBox->itemText(0));
setCurrentWidget(m_label); setCurrentWidget(m_label);
@@ -468,7 +469,7 @@ void BuildConfigurationComboBox::nameChanged(const QString &buildConfiguration)
int index = nameToIndex(buildConfiguration); int index = nameToIndex(buildConfiguration);
if (index == -1) if (index == -1)
return; return;
const QString &displayName = m_project->displayNameFor(buildConfiguration); const QString &displayName = m_project->buildConfiguration(buildConfiguration)->displayName();
m_comboBox->setItemText(index, displayName); m_comboBox->setItemText(index, displayName);
if (m_comboBox->count() == 1) if (m_comboBox->count() == 1)
m_label->setText(displayName); m_label->setText(displayName);
@@ -495,7 +496,7 @@ void BuildConfigurationComboBox::activeConfigurationChanged()
void BuildConfigurationComboBox::addedBuildConfiguration(ProjectExplorer::Project *,const QString &buildConfiguration) void BuildConfigurationComboBox::addedBuildConfiguration(ProjectExplorer::Project *,const QString &buildConfiguration)
{ {
ignoreIndexChange = true; ignoreIndexChange = true;
m_comboBox->addItem(m_project->displayNameFor(buildConfiguration), buildConfiguration); m_comboBox->addItem(m_project->buildConfiguration(buildConfiguration)->displayName(), buildConfiguration);
if (m_comboBox->count() == 2) if (m_comboBox->count() == 2)
setCurrentWidget(m_comboBox); setCurrentWidget(m_comboBox);

3
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -40,6 +40,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/mainwindow.h> #include <coreplugin/mainwindow.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/buildconfiguration.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
@@ -172,7 +173,7 @@ void Qt4ProjectConfigWidget::init(const QString &buildConfiguration)
m_buildConfiguration = buildConfiguration; m_buildConfiguration = buildConfiguration;
m_ui->nameLineEdit->setText(m_pro->displayNameFor(m_buildConfiguration)); m_ui->nameLineEdit->setText(m_pro->buildConfiguration(m_buildConfiguration)->displayName());
setupQtVersionsComboBox(); setupQtVersionsComboBox();