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

Rename DeployConfiguration::configurationWidget()

Browse Source 
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>
This commit is contained in:
Daniel Teske
2012-11-08 15:19:40 +01:00
parent 0192dd6ddc
commit 058ca549c4
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/madde/qt4maemodeployconfiguration.cpp
View File

@@ -78,7 +78,7 @@ Qt4MaemoDeployConfiguration::Qt4MaemoDeployConfiguration(ProjectExplorer::Target
cloneSteps(source); cloneSteps(source);
} }
DeployConfigurationWidget *Qt4MaemoDeployConfiguration::configurationWidget() const DeployConfigurationWidget *Qt4MaemoDeployConfiguration::createConfigWidget()
{ {
return new RemoteLinuxDeployConfigurationWidget; return new RemoteLinuxDeployConfigurationWidget;
} }

2
src/plugins/madde/qt4maemodeployconfiguration.h
View File

@@ -62,7 +62,7 @@ class Qt4MaemoDeployConfiguration : public RemoteLinux::RemoteLinuxDeployConfigu
public: public:
~Qt4MaemoDeployConfiguration(); ~Qt4MaemoDeployConfiguration();
ProjectExplorer::DeployConfigurationWidget *configurationWidget() const; ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
static Core::Id fremantleWithPackagingId(); static Core::Id fremantleWithPackagingId();
static Core::Id fremantleWithoutPackagingId(); static Core::Id fremantleWithoutPackagingId();

2
src/plugins/projectexplorer/deployconfiguration.cpp
View File

@@ -91,7 +91,7 @@ QVariantMap DeployConfiguration::toMap() const
return map; return map;
} }
DeployConfigurationWidget *DeployConfiguration::configurationWidget() const DeployConfigurationWidget *DeployConfiguration::createConfigWidget()
{ {
return 0; return 0;
} }

2
src/plugins/projectexplorer/deployconfiguration.h
View File

@@ -58,7 +58,7 @@ public:
virtual QVariantMap toMap() const; virtual QVariantMap toMap() const;
virtual DeployConfigurationWidget *configurationWidget() const; virtual DeployConfigurationWidget *createConfigWidget();
virtual bool isEnabled() const; virtual bool isEnabled() const;
virtual QString disabledReason() const; virtual QString disabledReason() const;

2
src/plugins/projectexplorer/runsettingspropertiespage.cpp
View File

@@ -496,7 +496,7 @@ void RunSettingsWidget::updateDeployConfiguration(DeployConfiguration *dc)
m_deployConfigurationCombo->setCurrentIndex(actDc.row()); m_deployConfigurationCombo->setCurrentIndex(actDc.row());
m_ignoreChange = false; m_ignoreChange = false;
m_deployConfigurationWidget = dc->configurationWidget(); m_deployConfigurationWidget = dc->createConfigWidget();
if (m_deployConfigurationWidget) { if (m_deployConfigurationWidget) {
m_deployConfigurationWidget->init(dc); m_deployConfigurationWidget->init(dc);
m_deployLayout->addWidget(m_deployConfigurationWidget); m_deployLayout->addWidget(m_deployConfigurationWidget);

2
src/plugins/qnx/blackberrydeployconfiguration.cpp
View File

@@ -159,7 +159,7 @@ BlackBerryDeployInformation *BlackBerryDeployConfiguration::deploymentInfo() con
return info; return info;
} }
ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::configurationWidget() const ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::createConfigWidget()
{ {
return new BlackBerryDeployConfigurationWidget; return new BlackBerryDeployConfigurationWidget;
} }

2
src/plugins/qnx/blackberrydeployconfiguration.h
View File

@@ -54,7 +54,7 @@ public:
explicit BlackBerryDeployConfiguration(ProjectExplorer::Target *parent); explicit BlackBerryDeployConfiguration(ProjectExplorer::Target *parent);
virtual ~BlackBerryDeployConfiguration(); virtual ~BlackBerryDeployConfiguration();
ProjectExplorer::DeployConfigurationWidget *configurationWidget() const; ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
BlackBerryDeployInformation *deploymentInfo() const; BlackBerryDeployInformation *deploymentInfo() const;

2
src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
View File

@@ -51,7 +51,7 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::
: DeployConfiguration(target, source) : DeployConfiguration(target, source)
{ } { }
DeployConfigurationWidget *RemoteLinuxDeployConfiguration::configurationWidget() const DeployConfigurationWidget *RemoteLinuxDeployConfiguration::createConfigWidget()
{ {
return new RemoteLinuxDeployConfigurationWidget; return new RemoteLinuxDeployConfigurationWidget;
} }

2
src/plugins/remotelinux/remotelinuxdeployconfiguration.h
View File

@@ -51,7 +51,7 @@ public:
RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target,
RemoteLinuxDeployConfiguration *source); RemoteLinuxDeployConfiguration *source);
ProjectExplorer::DeployConfigurationWidget *configurationWidget() const; ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
template<class T> T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const template<class T> T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const
{ {