forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -78,7 +78,7 @@ Qt4MaemoDeployConfiguration::Qt4MaemoDeployConfiguration(ProjectExplorer::Target
|
||||
cloneSteps(source);
|
||||
}
|
||||
|
||||
DeployConfigurationWidget *Qt4MaemoDeployConfiguration::configurationWidget() const
|
||||
DeployConfigurationWidget *Qt4MaemoDeployConfiguration::createConfigWidget()
|
||||
{
|
||||
return new RemoteLinuxDeployConfigurationWidget;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -91,7 +91,7 @@ QVariantMap DeployConfiguration::toMap() const
|
||||
return map;
|
||||
}
|
||||
|
||||
DeployConfigurationWidget *DeployConfiguration::configurationWidget() const
|
||||
DeployConfigurationWidget *DeployConfiguration::createConfigWidget()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
|
||||
virtual QVariantMap toMap() const;
|
||||
|
||||
virtual DeployConfigurationWidget *configurationWidget() const;
|
||||
virtual DeployConfigurationWidget *createConfigWidget();
|
||||
|
||||
virtual bool isEnabled() const;
|
||||
virtual QString disabledReason() const;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -159,7 +159,7 @@ BlackBerryDeployInformation *BlackBerryDeployConfiguration::deploymentInfo() con
|
||||
return info;
|
||||
}
|
||||
|
||||
ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::configurationWidget() const
|
||||
ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::createConfigWidget()
|
||||
{
|
||||
return new BlackBerryDeployConfigurationWidget;
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ public:
|
||||
explicit BlackBerryDeployConfiguration(ProjectExplorer::Target *parent);
|
||||
virtual ~BlackBerryDeployConfiguration();
|
||||
|
||||
ProjectExplorer::DeployConfigurationWidget *configurationWidget() const;
|
||||
ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
|
||||
|
||||
BlackBerryDeployInformation *deploymentInfo() const;
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::
|
||||
: DeployConfiguration(target, source)
|
||||
{ }
|
||||
|
||||
DeployConfigurationWidget *RemoteLinuxDeployConfiguration::configurationWidget() const
|
||||
DeployConfigurationWidget *RemoteLinuxDeployConfiguration::createConfigWidget()
|
||||
{
|
||||
return new RemoteLinuxDeployConfigurationWidget;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user