forked from qt-creator/qt-creator
DeployConfigurationWidget: Remove class
It is the same as NamedWidget. If we need to add additional functionality then we can always reintroduce the class. Change-Id: I684b5215e732e480e4e73e4cac3753bb92afd0d4 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::createConfigWidget()
|
||||
NamedWidget *Qt4MaemoDeployConfiguration::createConfigWidget()
|
||||
{
|
||||
return new RemoteLinuxDeployConfigurationWidget(this);
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ class Qt4MaemoDeployConfiguration : public RemoteLinux::RemoteLinuxDeployConfigu
|
||||
public:
|
||||
~Qt4MaemoDeployConfiguration();
|
||||
|
||||
ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
|
||||
ProjectExplorer::NamedWidget *createConfigWidget();
|
||||
|
||||
static Core::Id fremantleWithPackagingId();
|
||||
static Core::Id fremantleWithoutPackagingId();
|
||||
|
||||
@@ -91,7 +91,7 @@ QVariantMap DeployConfiguration::toMap() const
|
||||
return map;
|
||||
}
|
||||
|
||||
DeployConfigurationWidget *DeployConfiguration::createConfigWidget()
|
||||
NamedWidget *DeployConfiguration::createConfigWidget()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -273,10 +273,3 @@ bool DeployConfigurationFactory::canHandle(Target *parent) const
|
||||
return false;
|
||||
return DeviceTypeKitInformation::deviceTypeId(parent->kit()) == Constants::DESKTOP_DEVICE_TYPE;
|
||||
}
|
||||
|
||||
///
|
||||
// DeployConfigurationWidget
|
||||
///
|
||||
|
||||
DeployConfigurationWidget::DeployConfigurationWidget(QWidget *parent) : NamedWidget(parent)
|
||||
{ }
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace ProjectExplorer {
|
||||
class BuildStepList;
|
||||
class Target;
|
||||
class DeployConfigurationFactory;
|
||||
class DeployConfigurationWidget;
|
||||
class NamedWidget;
|
||||
|
||||
class PROJECTEXPLORER_EXPORT DeployConfiguration : public ProjectConfiguration
|
||||
{
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
|
||||
virtual QVariantMap toMap() const;
|
||||
|
||||
virtual DeployConfigurationWidget *createConfigWidget();
|
||||
virtual NamedWidget *createConfigWidget();
|
||||
|
||||
virtual bool isEnabled() const;
|
||||
virtual QString disabledReason() const;
|
||||
@@ -124,14 +124,6 @@ protected:
|
||||
private:
|
||||
};
|
||||
|
||||
class PROJECTEXPLORER_EXPORT DeployConfigurationWidget : public NamedWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DeployConfigurationWidget(QWidget *parent = 0);
|
||||
};
|
||||
|
||||
} // namespace ProjectExplorer
|
||||
|
||||
Q_DECLARE_METATYPE(ProjectExplorer::DeployConfiguration *)
|
||||
|
||||
@@ -47,8 +47,8 @@ QT_END_NAMESPACE
|
||||
namespace ProjectExplorer {
|
||||
|
||||
class DeployConfiguration;
|
||||
class DeployConfigurationWidget;
|
||||
class DeployConfigurationModel;
|
||||
class NamedWidget;
|
||||
class RunConfiguration;
|
||||
class RunConfigurationModel;
|
||||
class RunConfigWidget;
|
||||
@@ -107,7 +107,7 @@ private:
|
||||
DeployConfigurationModel *m_deployConfigurationModel;
|
||||
QWidget *m_runConfigurationWidget;
|
||||
QVBoxLayout *m_runLayout;
|
||||
DeployConfigurationWidget *m_deployConfigurationWidget;
|
||||
NamedWidget *m_deployConfigurationWidget;
|
||||
QVBoxLayout *m_deployLayout;
|
||||
BuildStepListWidget *m_deploySteps;
|
||||
QMenu *m_addRunMenu;
|
||||
|
||||
@@ -159,7 +159,7 @@ BlackBerryDeployInformation *BlackBerryDeployConfiguration::deploymentInfo() con
|
||||
return info;
|
||||
}
|
||||
|
||||
ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::createConfigWidget()
|
||||
ProjectExplorer::NamedWidget *BlackBerryDeployConfiguration::createConfigWidget()
|
||||
{
|
||||
return new BlackBerryDeployConfigurationWidget(this);
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ public:
|
||||
explicit BlackBerryDeployConfiguration(ProjectExplorer::Target *parent);
|
||||
virtual ~BlackBerryDeployConfiguration();
|
||||
|
||||
ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
|
||||
ProjectExplorer::NamedWidget *createConfigWidget();
|
||||
|
||||
BlackBerryDeployInformation *deploymentInfo() const;
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ using namespace Qnx::Internal;
|
||||
|
||||
BlackBerryDeployConfigurationWidget::BlackBerryDeployConfigurationWidget(BlackBerryDeployConfiguration *dc,
|
||||
QWidget *parent)
|
||||
: ProjectExplorer::DeployConfigurationWidget(parent)
|
||||
: ProjectExplorer::NamedWidget(parent)
|
||||
, m_ui(new Ui::BlackBerryDeployConfigurationWidget)
|
||||
, m_deployConfiguration(0)
|
||||
{
|
||||
|
||||
@@ -43,7 +43,7 @@ class BlackBerryDeployConfigurationWidget;
|
||||
|
||||
class BlackBerryDeployConfiguration;
|
||||
|
||||
class BlackBerryDeployConfigurationWidget : public ProjectExplorer::DeployConfigurationWidget
|
||||
class BlackBerryDeployConfigurationWidget : public ProjectExplorer::NamedWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
@@ -51,7 +51,7 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::
|
||||
: DeployConfiguration(target, source)
|
||||
{ }
|
||||
|
||||
DeployConfigurationWidget *RemoteLinuxDeployConfiguration::createConfigWidget()
|
||||
NamedWidget *RemoteLinuxDeployConfiguration::createConfigWidget()
|
||||
{
|
||||
return new RemoteLinuxDeployConfigurationWidget(this);
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ public:
|
||||
RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target,
|
||||
RemoteLinuxDeployConfiguration *source);
|
||||
|
||||
ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
|
||||
ProjectExplorer::NamedWidget *createConfigWidget();
|
||||
|
||||
template<class T> T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const
|
||||
{
|
||||
|
||||
@@ -55,7 +55,7 @@ using namespace Internal;
|
||||
|
||||
RemoteLinuxDeployConfigurationWidget::RemoteLinuxDeployConfigurationWidget(RemoteLinuxDeployConfiguration *dc,
|
||||
QWidget *parent) :
|
||||
DeployConfigurationWidget(parent), d(new RemoteLinuxDeployConfigurationWidgetPrivate)
|
||||
NamedWidget(parent), d(new RemoteLinuxDeployConfigurationWidgetPrivate)
|
||||
{
|
||||
d->ui.setupUi(this);
|
||||
d->ui.deploymentDataView->setTextElideMode(Qt::ElideMiddle);
|
||||
|
||||
@@ -41,7 +41,7 @@ class RemoteLinuxDeployConfigurationWidgetPrivate;
|
||||
} // namespace Internal
|
||||
|
||||
class REMOTELINUX_EXPORT RemoteLinuxDeployConfigurationWidget
|
||||
: public ProjectExplorer::DeployConfigurationWidget
|
||||
: public ProjectExplorer::NamedWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
Reference in New Issue
Block a user