Export the build configuration class.

This commit is contained in:
con
2009-09-21 15:50:27 +02:00
parent 69e00d8f20
commit 21565b99d1
6 changed files with 28 additions and 23 deletions

View File

@@ -29,7 +29,11 @@
#include "buildconfiguration.h" #include "buildconfiguration.h"
using namespace ProjectExplorer::Internal; using namespace ProjectExplorer;
BuildConfiguration::BuildConfiguration()
{
}
BuildConfiguration::BuildConfiguration(const QString &name) BuildConfiguration::BuildConfiguration(const QString &name)
: m_name(name) : m_name(name)
@@ -49,7 +53,7 @@ QString BuildConfiguration::name() const
QString BuildConfiguration::displayName() QString BuildConfiguration::displayName()
{ {
QVariant v = getValue("ProjectExplorer.BuildConfiguration.DisplayName"); QVariant v = value("ProjectExplorer.BuildConfiguration.DisplayName");
if (v.isValid()) { if (v.isValid()) {
return v.toString(); return v.toString();
} else { } else {
@@ -63,7 +67,7 @@ void BuildConfiguration::setDisplayName(const QString &name)
setValue("ProjectExplorer.BuildConfiguration.DisplayName", name); setValue("ProjectExplorer.BuildConfiguration.DisplayName", name);
} }
QVariant BuildConfiguration::getValue(const QString & key) const QVariant BuildConfiguration::value(const QString & key) const
{ {
QHash<QString, QVariant>::const_iterator it = m_values.find(key); QHash<QString, QVariant>::const_iterator it = m_values.find(key);
if (it != m_values.constEnd()) if (it != m_values.constEnd())
@@ -94,4 +98,3 @@ QMap<QString, QVariant> BuildConfiguration::toMap() const
result.insert(it.key(), it.value()); result.insert(it.key(), it.value());
return result; return result;
} }

View File

@@ -30,20 +30,26 @@
#ifndef BUILDCONFIGURATION_H #ifndef BUILDCONFIGURATION_H
#define BUILDCONFIGURATION_H #define BUILDCONFIGURATION_H
#include <QtCore/QString> #include "projectexplorer_export.h"
#include <QtCore/QVariant>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QObject>
#include <QtCore/QVariant>
namespace ProjectExplorer { namespace ProjectExplorer {
namespace Internal {
class BuildConfiguration class PROJECTEXPLORER_EXPORT BuildConfiguration : public QObject
{ {
Q_OBJECT
public: public:
explicit BuildConfiguration();
BuildConfiguration(const QString &name); BuildConfiguration(const QString &name);
BuildConfiguration(const QString &name, BuildConfiguration *source); BuildConfiguration(const QString &name, BuildConfiguration *source);
QString name() const; QString name() const;
QVariant getValue(const QString &key) const; QVariant value(const QString &key) const;
void setValue(const QString &key, QVariant value); void setValue(const QString &key, QVariant value);
QString displayName(); QString displayName();
@@ -57,7 +63,6 @@ private:
QString m_name; QString m_name;
}; };
}
} // namespace ProjectExplorer } // namespace ProjectExplorer
#endif // BUILDCONFIGURATION_H #endif // BUILDCONFIGURATION_H

View File

@@ -35,7 +35,6 @@
#include <QtGui/QLayout> #include <QtGui/QLayout>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal;
BuildStep::BuildStep(Project * pro) BuildStep::BuildStep(Project * pro)
: m_project(pro) : m_project(pro)
@@ -92,14 +91,14 @@ QVariant BuildStep::value(const QString &buildConfiguration, const QString &name
{ {
BuildConfiguration *bc = getBuildConfiguration(buildConfiguration); BuildConfiguration *bc = getBuildConfiguration(buildConfiguration);
if (bc) if (bc)
return bc->getValue(name); return bc->value(name);
else else
return QVariant(); return QVariant();
} }
QVariant BuildStep::value(const QString &name) const QVariant BuildStep::value(const QString &name) const
{ {
return m_configuration->getValue(name); return m_configuration->value(name);
} }
void BuildStep::setValuesFromMap(const QMap<QString, QVariant> & values) void BuildStep::setValuesFromMap(const QMap<QString, QVariant> & values)

View File

@@ -39,9 +39,7 @@
namespace ProjectExplorer { namespace ProjectExplorer {
class Project; class Project;
namespace Internal {
class BuildConfiguration; class BuildConfiguration;
}
/* /*
// BuildSteps are the primary way plugin developers can customize // BuildSteps are the primary way plugin developers can customize
@@ -132,14 +130,14 @@ Q_SIGNALS:
void addToOutputWindow(const QString &string); void addToOutputWindow(const QString &string);
private: private:
QList<Internal::BuildConfiguration *> buildConfigurations(); QList<BuildConfiguration *> buildConfigurations();
void addBuildConfiguration(const QString & name); void addBuildConfiguration(const QString & name);
void removeBuildConfiguration(const QString & name); void removeBuildConfiguration(const QString & name);
Internal::BuildConfiguration *getBuildConfiguration(const QString & name) const; BuildConfiguration *getBuildConfiguration(const QString & name) const;
void copyBuildConfiguration(const QString &source, const QString &dest); void copyBuildConfiguration(const QString &source, const QString &dest);
QList<Internal::BuildConfiguration *> m_buildConfigurations; QList<BuildConfiguration *> m_buildConfigurations;
Internal::BuildConfiguration *m_configuration; BuildConfiguration *m_configuration;
Project *m_project; Project *m_project;
}; };

View File

@@ -429,7 +429,7 @@ QVariant Project::value(const QString &buildConfiguration, const QString &name)
{ {
BuildConfiguration *bc = getBuildConfiguration(buildConfiguration); BuildConfiguration *bc = getBuildConfiguration(buildConfiguration);
if (bc) if (bc)
return bc->getValue(name); return bc->value(name);
else else
return QVariant(); return QVariant();
} }

View File

@@ -191,13 +191,13 @@ protected:
virtual bool restoreSettingsImpl(PersistentSettingsReader &reader); virtual bool restoreSettingsImpl(PersistentSettingsReader &reader);
private: private:
Internal::BuildConfiguration *getBuildConfiguration(const QString & name) const; 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;
QMap<QString, QVariant> m_values; QMap<QString, QVariant> m_values;
QList<Internal::BuildConfiguration *> m_buildConfigurationValues; QList<BuildConfiguration *> m_buildConfigurationValues;
QString m_activeBuildConfiguration; QString m_activeBuildConfiguration;
QList<QSharedPointer<RunConfiguration> > m_runConfigurations; QList<QSharedPointer<RunConfiguration> > m_runConfigurations;
QSharedPointer<RunConfiguration> m_activeRunConfiguration; QSharedPointer<RunConfiguration> m_activeRunConfiguration;