From 36718cae2c38ecc766a416bb9999d592af74c8b7 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Thu, 8 Nov 2012 15:37:31 +0100 Subject: [PATCH] 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 --- src/plugins/madde/qt4maemodeployconfiguration.cpp | 2 +- src/plugins/madde/qt4maemodeployconfiguration.h | 2 +- src/plugins/projectexplorer/deployconfiguration.cpp | 9 +-------- src/plugins/projectexplorer/deployconfiguration.h | 12 ++---------- .../projectexplorer/runsettingspropertiespage.h | 4 ++-- src/plugins/qnx/blackberrydeployconfiguration.cpp | 2 +- src/plugins/qnx/blackberrydeployconfiguration.h | 2 +- .../qnx/blackberrydeployconfigurationwidget.cpp | 2 +- .../qnx/blackberrydeployconfigurationwidget.h | 2 +- .../remotelinux/remotelinuxdeployconfiguration.cpp | 2 +- .../remotelinux/remotelinuxdeployconfiguration.h | 2 +- .../remotelinuxdeployconfigurationwidget.cpp | 2 +- .../remotelinuxdeployconfigurationwidget.h | 2 +- 13 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/plugins/madde/qt4maemodeployconfiguration.cpp b/src/plugins/madde/qt4maemodeployconfiguration.cpp index 9e7c2ef6465..809479c25e6 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::createConfigWidget() +NamedWidget *Qt4MaemoDeployConfiguration::createConfigWidget() { return new RemoteLinuxDeployConfigurationWidget(this); } diff --git a/src/plugins/madde/qt4maemodeployconfiguration.h b/src/plugins/madde/qt4maemodeployconfiguration.h index 68d16a2cb56..989536e392b 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 *createConfigWidget(); + ProjectExplorer::NamedWidget *createConfigWidget(); static Core::Id fremantleWithPackagingId(); static Core::Id fremantleWithoutPackagingId(); diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index 4094d1aec76..67af8c9aaaa 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::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) -{ } diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index ec571629193..cccbab08665 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -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 *) diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h index d16b98fad91..ada616eea8a 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.h +++ b/src/plugins/projectexplorer/runsettingspropertiespage.h @@ -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; diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp index ef16e6a6ada..4bee5328885 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::createConfigWidget() +ProjectExplorer::NamedWidget *BlackBerryDeployConfiguration::createConfigWidget() { return new BlackBerryDeployConfigurationWidget(this); } diff --git a/src/plugins/qnx/blackberrydeployconfiguration.h b/src/plugins/qnx/blackberrydeployconfiguration.h index 6432718eff6..c6238eb27b4 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 *createConfigWidget(); + ProjectExplorer::NamedWidget *createConfigWidget(); BlackBerryDeployInformation *deploymentInfo() const; diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp index 8cfb92b63d0..0f62570ead1 100644 --- a/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp +++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp @@ -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) { diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.h b/src/plugins/qnx/blackberrydeployconfigurationwidget.h index 294d43ab2e5..093ed698461 100644 --- a/src/plugins/qnx/blackberrydeployconfigurationwidget.h +++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.h @@ -43,7 +43,7 @@ class BlackBerryDeployConfigurationWidget; class BlackBerryDeployConfiguration; -class BlackBerryDeployConfigurationWidget : public ProjectExplorer::DeployConfigurationWidget +class BlackBerryDeployConfigurationWidget : public ProjectExplorer::NamedWidget { Q_OBJECT public: diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index 4fefd16139d..d5f5bc8b73a 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::createConfigWidget() +NamedWidget *RemoteLinuxDeployConfiguration::createConfigWidget() { return new RemoteLinuxDeployConfigurationWidget(this); } diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index fe129c13191..410cd42c394 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 *createConfigWidget(); + ProjectExplorer::NamedWidget *createConfigWidget(); template T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const { diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp index 9a0efb915c4..05197c3a937 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp @@ -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); diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h index fa9a7379595..2571e4284c5 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h @@ -41,7 +41,7 @@ class RemoteLinuxDeployConfigurationWidgetPrivate; } // namespace Internal class REMOTELINUX_EXPORT RemoteLinuxDeployConfigurationWidget - : public ProjectExplorer::DeployConfigurationWidget + : public ProjectExplorer::NamedWidget { Q_OBJECT