diff options
author | Daniel Teske <daniel.teske@digia.com> | 2012-11-08 15:19:40 +0100 |
---|---|---|
committer | Daniel Teske <daniel.teske@digia.com> | 2012-11-16 14:39:39 +0100 |
commit | 058ca549c480dfad79edeaa974198c6015f25f5f (patch) | |
tree | d4a51755429e82fcb645f754418481b5d565cdcc /src | |
parent | 0192dd6ddc4ca48313901a60ec34301e27168282 (diff) | |
download | qt-creator-058ca549c480dfad79edeaa974198c6015f25f5f.tar.gz |
Rename DeployConfiguration::configurationWidget()
To createConfigWidget(). Which indicates that a new widget is created
and makes it the same name as BuildStep/BuildConfiguration
Change-Id: Ib1858bc5382556ebb9a8a474fa79f0e7e9593cf7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
9 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/madde/qt4maemodeployconfiguration.cpp b/src/plugins/madde/qt4maemodeployconfiguration.cpp index 1ab972d7fe..0f07c706d5 100644 --- a/src/plugins/madde/qt4maemodeployconfiguration.cpp +++ b/src/plugins/madde/qt4maemodeployconfiguration.cpp @@ -78,7 +78,7 @@ Qt4MaemoDeployConfiguration::Qt4MaemoDeployConfiguration(ProjectExplorer::Target cloneSteps(source); } -DeployConfigurationWidget *Qt4MaemoDeployConfiguration::configurationWidget() const +DeployConfigurationWidget *Qt4MaemoDeployConfiguration::createConfigWidget() { return new RemoteLinuxDeployConfigurationWidget; } diff --git a/src/plugins/madde/qt4maemodeployconfiguration.h b/src/plugins/madde/qt4maemodeployconfiguration.h index 89f236190d..68d16a2cb5 100644 --- a/src/plugins/madde/qt4maemodeployconfiguration.h +++ b/src/plugins/madde/qt4maemodeployconfiguration.h @@ -62,7 +62,7 @@ class Qt4MaemoDeployConfiguration : public RemoteLinux::RemoteLinuxDeployConfigu public: ~Qt4MaemoDeployConfiguration(); - ProjectExplorer::DeployConfigurationWidget *configurationWidget() const; + ProjectExplorer::DeployConfigurationWidget *createConfigWidget(); static Core::Id fremantleWithPackagingId(); static Core::Id fremantleWithoutPackagingId(); diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index adf95a56b0..4094d1aec7 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -91,7 +91,7 @@ QVariantMap DeployConfiguration::toMap() const return map; } -DeployConfigurationWidget *DeployConfiguration::configurationWidget() const +DeployConfigurationWidget *DeployConfiguration::createConfigWidget() { return 0; } diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 28f70fd83c..b0398254d6 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -58,7 +58,7 @@ public: virtual QVariantMap toMap() const; - virtual DeployConfigurationWidget *configurationWidget() const; + virtual DeployConfigurationWidget *createConfigWidget(); virtual bool isEnabled() const; virtual QString disabledReason() const; diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index d00f19f21b..524c5b21cb 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -496,7 +496,7 @@ void RunSettingsWidget::updateDeployConfiguration(DeployConfiguration *dc) m_deployConfigurationCombo->setCurrentIndex(actDc.row()); m_ignoreChange = false; - m_deployConfigurationWidget = dc->configurationWidget(); + m_deployConfigurationWidget = dc->createConfigWidget(); if (m_deployConfigurationWidget) { m_deployConfigurationWidget->init(dc); m_deployLayout->addWidget(m_deployConfigurationWidget); diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp index 9a995dc3a5..5c3de649fe 100644 --- a/src/plugins/qnx/blackberrydeployconfiguration.cpp +++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp @@ -159,7 +159,7 @@ BlackBerryDeployInformation *BlackBerryDeployConfiguration::deploymentInfo() con return info; } -ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::configurationWidget() const +ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::createConfigWidget() { return new BlackBerryDeployConfigurationWidget; } diff --git a/src/plugins/qnx/blackberrydeployconfiguration.h b/src/plugins/qnx/blackberrydeployconfiguration.h index 1ffdff7002..6432718eff 100644 --- a/src/plugins/qnx/blackberrydeployconfiguration.h +++ b/src/plugins/qnx/blackberrydeployconfiguration.h @@ -54,7 +54,7 @@ public: explicit BlackBerryDeployConfiguration(ProjectExplorer::Target *parent); virtual ~BlackBerryDeployConfiguration(); - ProjectExplorer::DeployConfigurationWidget *configurationWidget() const; + ProjectExplorer::DeployConfigurationWidget *createConfigWidget(); BlackBerryDeployInformation *deploymentInfo() const; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index 19ec75e7ab..2bbc59a180 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp @@ -51,7 +51,7 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer:: : DeployConfiguration(target, source) { } -DeployConfigurationWidget *RemoteLinuxDeployConfiguration::configurationWidget() const +DeployConfigurationWidget *RemoteLinuxDeployConfiguration::createConfigWidget() { return new RemoteLinuxDeployConfigurationWidget; } diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index 1e882f1df1..fe129c1319 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h @@ -51,7 +51,7 @@ public: RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, RemoteLinuxDeployConfiguration *source); - ProjectExplorer::DeployConfigurationWidget *configurationWidget() const; + ProjectExplorer::DeployConfigurationWidget *createConfigWidget(); template<class T> T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const { |