Commit 9689582e authored by dt's avatar dt

Refacotring: Move BuildConfiguration into internal namespace.

It should not be used outside of the ProjectExplorer and is likewise not
exported.
parent 10482c81
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "buildconfiguration.h" #include "buildconfiguration.h"
using namespace ProjectExplorer; using namespace ProjectExplorer::Internal;
BuildConfiguration::BuildConfiguration(const QString &name) BuildConfiguration::BuildConfiguration(const QString &name)
: m_name(name) : m_name(name)
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <QtCore/QHash> #include <QtCore/QHash>
namespace ProjectExplorer { namespace ProjectExplorer {
namespace Internal {
class BuildConfiguration class BuildConfiguration
{ {
public: public:
...@@ -55,7 +55,7 @@ private: ...@@ -55,7 +55,7 @@ private:
QHash<QString, QVariant> m_values; QHash<QString, QVariant> m_values;
QString m_name; QString m_name;
}; };
}
} // namespace ProjectExplorer } // namespace ProjectExplorer
#endif // BUILDCONFIGURATION_H #endif // BUILDCONFIGURATION_H
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
namespace ProjectExplorer { using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal;
BuildStep::BuildStep(Project * pro) BuildStep::BuildStep(Project * pro)
: m_project(pro) : m_project(pro)
...@@ -141,5 +142,3 @@ IBuildStepFactory::~IBuildStepFactory() ...@@ -141,5 +142,3 @@ IBuildStepFactory::~IBuildStepFactory()
{ {
} }
} // namespace ProjectExplorer
...@@ -39,7 +39,9 @@ ...@@ -39,7 +39,9 @@
namespace ProjectExplorer { namespace ProjectExplorer {
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 +134,14 @@ Q_SIGNALS: ...@@ -132,14 +134,14 @@ Q_SIGNALS:
void displayNameChanged(BuildStep *, const QString &displayName); void displayNameChanged(BuildStep *, const QString &displayName);
private: private:
QList<BuildConfiguration *> buildConfigurations(); QList<Internal::BuildConfiguration *> buildConfigurations();
void addBuildConfiguration(const QString & name); void addBuildConfiguration(const QString & name);
void removeBuildConfiguration(const QString & name); void removeBuildConfiguration(const QString & name);
BuildConfiguration *getBuildConfiguration(const QString & name) const; Internal::BuildConfiguration *getBuildConfiguration(const QString & name) const;
void copyBuildConfiguration(const QString &source, const QString &dest); void copyBuildConfiguration(const QString &source, const QString &dest);
QList<BuildConfiguration *> m_buildConfigurations; QList<Internal::BuildConfiguration *> m_buildConfigurations;
BuildConfiguration *m_configuration; Internal::BuildConfiguration *m_configuration;
Project *m_project; Project *m_project;
}; };
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <QtCore/QTextCodec> #include <QtCore/QTextCodec>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal;
Project::Project() Project::Project()
: m_activeRunConfiguration(0), : m_activeRunConfiguration(0),
......
...@@ -165,13 +165,13 @@ protected: ...@@ -165,13 +165,13 @@ protected:
virtual void restoreSettingsImpl(PersistentSettingsReader &reader); virtual void restoreSettingsImpl(PersistentSettingsReader &reader);
private: private:
BuildConfiguration *getBuildConfiguration(const QString & name) const; Internal::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<BuildConfiguration *> m_buildConfigurationValues; QList<Internal::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;
......
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