Commit 95d7639b authored by dt's avatar dt
Browse files

Qt4: Move Qt4Target and Qt4BC out of the Internal namespace

Reviewed-By: hunger
parent ed18065e
......@@ -47,9 +47,10 @@ class Project;
}
namespace Qt4ProjectManager {
namespace Internal {
class Qt4BuildConfiguration;
namespace Internal {
class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
{
Q_OBJECT
......@@ -83,7 +84,7 @@ public:
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
virtual ~MakeStep();
Internal::Qt4BuildConfiguration *qt4BuildConfiguration() const;
Qt4BuildConfiguration *qt4BuildConfiguration() const;
virtual bool init();
virtual void run(QFutureInterface<bool> &);
......
......@@ -44,9 +44,9 @@ class Project;
namespace Qt4ProjectManager {
class Qt4Project;
class Qt4BuildConfiguration;
namespace Internal {
class Qt4BuildConfiguration;
class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory
{
......@@ -77,7 +77,7 @@ public:
explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
virtual ~QMakeStep();
Internal::Qt4BuildConfiguration *qt4BuildConfiguration() const;
Qt4BuildConfiguration *qt4BuildConfiguration() const;
virtual bool init();
virtual void run(QFutureInterface<bool> &);
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
......
......@@ -54,9 +54,9 @@ QT_FORWARD_DECLARE_CLASS(QTimer);
namespace ProjectExplorer { class BuildStep; }
namespace Qt4ProjectManager {
namespace Internal {
class Qt4BuildConfiguration;
namespace Internal {
class Qt4ProFileNode;
class MaemoDeployables : public QAbstractListModel
......
......@@ -51,13 +51,13 @@ class QProcess;
QT_END_NAMESPACE
namespace Qt4ProjectManager {
namespace Internal {
class Qt4BuildConfiguration;
class MaemoDeployableListModel;
namespace Internal {
class MaemoDeployStep;
class MaemoDeployableListModel;
class MaemoToolChain;
class MaemoProFileWrapper;
class Qt4BuildConfiguration;
class MaemoPackageCreationStep : public ProjectExplorer::BuildStep
{
......
......@@ -39,8 +39,8 @@ class Project;
}
namespace Qt4ProjectManager {
namespace Internal {
class Qt4BuildConfiguration;
namespace Internal {
class MaemoPublisherFremantleFree : public QObject
{
......
......@@ -41,9 +41,10 @@ QT_END_NAMESPACE
namespace ProjectExplorer { class Project; }
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
namespace Internal {
class MaemoPublisherFremantleFree;
class Qt4BuildConfiguration;
class MaemoPublishingBuildSettingsPageFremantleFree : public QWizardPage
{
......
......@@ -45,13 +45,13 @@ QT_FORWARD_DECLARE_CLASS(QWidget)
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
class Qt4Project;
class Qt4Target;
namespace Internal {
class Qt4BuildConfiguration;
class Qt4ProFileNode;
class Qt4Target;
class MaemoDeviceConfigListModel;
class MaemoDeployStep;
......
......@@ -60,11 +60,11 @@ class EnvironmentWidget;
namespace Utils { class DetailsWidget; }
namespace Qt4ProjectManager {
namespace Internal {
class Qt4BuildConfiguration;
namespace Internal {
class MaemoDeviceEnvReader;
class MaemoRunConfiguration;
class Qt4BuildConfiguration;
class MaemoRunConfigurationWidget : public QWidget
{
......
......@@ -46,10 +46,10 @@ class Target;
namespace Qt4ProjectManager {
class Qt4Project;
class Qt4Target;
namespace Internal {
class Qt4ProFileNode;
class Qt4Target;
class MaemoTemplatesManager : public QObject
{
......
......@@ -58,6 +58,7 @@
#include <QSettings>
#include <QMessageBox>
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
namespace {
......
......@@ -40,10 +40,10 @@ class RunConfiguration;
namespace Qt4ProjectManager {
class QtVersion;
class Qt4Target;
namespace Internal {
class Qt4ProFileNode;
class Qt4Target;
class S60DeployConfigurationFactory;
class S60DeviceRunConfiguration;
......
......@@ -53,10 +53,10 @@ class Launcher;
namespace Qt4ProjectManager {
class QtVersion;
class Qt4Target;
namespace Internal {
class Qt4ProFileNode;
class Qt4Target;
class S60DeviceRunConfigurationFactory;
class S60DeviceRunConfiguration : public ProjectExplorer::RunConfiguration
......@@ -65,7 +65,7 @@ class S60DeviceRunConfiguration : public ProjectExplorer::RunConfiguration
friend class S60DeviceRunConfigurationFactory;
public:
S60DeviceRunConfiguration(Qt4ProjectManager::Internal::Qt4Target *parent, const QString &proFilePath);
S60DeviceRunConfiguration(Qt4ProjectManager::Qt4Target *parent, const QString &proFilePath);
virtual ~S60DeviceRunConfiguration();
Qt4Target *qt4Target() const;
......@@ -97,7 +97,7 @@ signals:
void targetInformationChanged();
protected:
S60DeviceRunConfiguration(Qt4ProjectManager::Internal::Qt4Target *parent, S60DeviceRunConfiguration *source);
S60DeviceRunConfiguration(Qt4ProjectManager::Qt4Target *parent, S60DeviceRunConfiguration *source);
QString defaultDisplayName() const;
virtual bool fromMap(const QVariantMap &map);
private slots:
......
......@@ -47,10 +47,10 @@ class DetailsWidget;
namespace Qt4ProjectManager {
class Qt4Project;
class Qt4Target;
namespace Internal {
class Qt4ProFileNode;
class Qt4Target;
class S60EmulatorRunConfigurationFactory;
class S60EmulatorRunConfiguration : public ProjectExplorer::RunConfiguration
......@@ -59,7 +59,7 @@ class S60EmulatorRunConfiguration : public ProjectExplorer::RunConfiguration
friend class S60EmulatorRunConfigurationFactory;
public:
S60EmulatorRunConfiguration(Qt4ProjectManager::Internal::Qt4Target *parent, const QString &proFilePath);
S60EmulatorRunConfiguration(Qt4ProjectManager::Qt4Target *parent, const QString &proFilePath);
virtual ~S60EmulatorRunConfiguration();
Qt4Target *qt4Target() const;
......@@ -82,7 +82,7 @@ private slots:
void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
protected:
S60EmulatorRunConfiguration(Qt4ProjectManager::Internal::Qt4Target *parent, S60EmulatorRunConfiguration *source);
S60EmulatorRunConfiguration(Qt4ProjectManager::Qt4Target *parent, S60EmulatorRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map);
private:
......
......@@ -726,7 +726,7 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(ProjectExplorer::Target
QtVersion *version = QtVersionManager::instance()->version(info.versionId);
Q_ASSERT(version);
Qt4Target *qt4Target(static_cast<Qt4Target *>(parent));
Qt4Target *qt4Target = static_cast<Qt4Target *>(parent);
bool ok;
QString buildConfigurationName = QInputDialog::getText(0,
......
......@@ -43,16 +43,17 @@ namespace Qt4ProjectManager {
class QMakeStep;
class MakeStep;
class Qt4Target;
namespace Internal {
class Qt4ProFileNode;
class Qt4BuildConfigurationFactory;
class Qt4Target;
}
class Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration
{
Q_OBJECT
friend class Qt4BuildConfigurationFactory;
friend class Internal::Qt4BuildConfigurationFactory;
public:
explicit Qt4BuildConfiguration(Qt4Target *target);
......@@ -133,7 +134,7 @@ signals:
/// emitted if the build configuration changed in a way that
/// should trigger a reevaluation of all .pro files
void proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *);
void proFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *);
void buildDirectoryInitialized();
......@@ -160,6 +161,7 @@ private:
Qt4ProjectManager::Internal::Qt4ProFileNode *m_subNodeBuild;
};
namespace Internal {
class Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
{
Q_OBJECT
......@@ -196,7 +198,7 @@ private:
QMap<QString, VersionInfo> m_versions;
};
} // namespace Qt4ProjectManager
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // QT4BUILDCONFIGURATION_H
......@@ -372,11 +372,11 @@ void Qt4Project::onAddedTarget(ProjectExplorer::Target *t)
Q_ASSERT(qt4target);
connect(qt4target, SIGNAL(buildDirectoryInitialized()),
this, SIGNAL(buildDirectoryInitialized()));
connect(qt4target, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target*)),
this, SLOT(proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target*)));
connect(qt4target, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target*)),
this, SLOT(proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target*)));
}
void Qt4Project::proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target *target)
void Qt4Project::proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target *target)
{
if (activeTarget() == target)
scheduleAsyncUpdate();
......
......@@ -153,7 +153,7 @@ public:
Internal::Qt4TargetFactory *targetFactory() const;
Internal::Qt4Target *activeTarget() const;
Qt4Target *activeTarget() const;
QList<Core::IFile *> dependencies(); //NBS remove
QList<ProjectExplorer::Project *>dependsOn();
......@@ -208,7 +208,7 @@ protected:
virtual bool fromMap(const QVariantMap &map);
private slots:
void proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target *target);
void proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target *target);
void asyncUpdate();
......
......@@ -41,13 +41,11 @@ namespace Utils {
}
namespace Qt4ProjectManager {
class Qt4Project;
namespace Internal {
class Qt4Target;
class Qt4BuildConfiguration;
class Qt4Target;
namespace Internal {
namespace Ui {
class Qt4ProjectConfigWidget;
}
......
......@@ -55,14 +55,13 @@ namespace ProjectExplorer {
}
namespace Qt4ProjectManager {
class Qt4Project;
class Qt4Target;
namespace Internal {
class Qt4PriFileNode;
class Qt4ProFileNode;
class Qt4RunConfigurationFactory;
class Qt4Target;
class Qt4RunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
{
......
......@@ -444,8 +444,8 @@ void Qt4Target::onAddedBuildConfiguration(ProjectExplorer::BuildConfiguration *b
Q_ASSERT(qt4bc);
connect(qt4bc, SIGNAL(buildDirectoryInitialized()),
this, SIGNAL(buildDirectoryInitialized()));
connect(qt4bc, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *)),
this, SLOT(onProFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *)));
connect(qt4bc, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *)),
this, SLOT(onProFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *)));
}
void Qt4Target::onAddedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
......@@ -466,7 +466,7 @@ void Qt4Target::slotUpdateDeviceInformation()
}
}
void Qt4Target::onProFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *bc)
void Qt4Target::onProFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *bc)
{
if (bc && bc == activeBuildConfiguration())
emit proFileEvaluateNeeded(this);
......
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