From 7853297f77a664db324f6d93c29a75339a614c19 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Jun 2012 14:50:00 +0200 Subject: [PATCH] runconfig: consolidate createConfigurationWidget implementations Most derived classes used essentially identical 'return 0;' implementations. Use a base class implementation doing that instead. Change-Id: I99727ac2230a5d9f168b4b0eb5927f8efff44e64 Reviewed-by: Daniel Teske --- src/plugins/android/androidrunfactories.cpp | 6 ------ src/plugins/android/androidrunfactories.h | 1 - src/plugins/madde/maemorunfactories.cpp | 6 ------ src/plugins/madde/maemorunfactories.h | 1 - src/plugins/projectexplorer/localapplicationruncontrol.cpp | 6 ------ src/plugins/projectexplorer/localapplicationruncontrol.h | 1 - src/plugins/projectexplorer/runconfiguration.cpp | 5 +++++ src/plugins/projectexplorer/runconfiguration.h | 2 +- src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp | 6 ------ src/plugins/qmlprojectmanager/qmlprojectruncontrol.h | 2 -- .../qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp | 5 ----- .../qt4projectmanager/qt-s60/s60devicedebugruncontrol.h | 1 - src/plugins/qt4projectmanager/qt-s60/s60manager.cpp | 4 ---- .../qt4projectmanager/qt-s60/s60runcontrolfactory.cpp | 6 ------ src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.h | 2 -- src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp | 6 ------ src/plugins/remotelinux/remotelinuxruncontrolfactory.h | 1 - 17 files changed, 6 insertions(+), 55 deletions(-) diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp index 2df6eb973f..1feeb410c7 100644 --- a/src/plugins/android/androidrunfactories.cpp +++ b/src/plugins/android/androidrunfactories.cpp @@ -190,11 +190,5 @@ QString AndroidRunControlFactory::displayName() const return tr("Run on Android device/emulator"); } -RunConfigWidget *AndroidRunControlFactory::createConfigurationWidget(RunConfiguration *config) -{ - Q_UNUSED(config) - return 0; -} - } // namespace Internal } // namespace Qt4ProjectManager diff --git a/src/plugins/android/androidrunfactories.h b/src/plugins/android/androidrunfactories.h index 859298fd86..fb4ffd40a2 100644 --- a/src/plugins/android/androidrunfactories.h +++ b/src/plugins/android/androidrunfactories.h @@ -80,7 +80,6 @@ public: ~AndroidRunControlFactory(); QString displayName() const; - RunConfigWidget *createConfigurationWidget(RunConfiguration *runConfiguration); bool canRun(RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; diff --git a/src/plugins/madde/maemorunfactories.cpp b/src/plugins/madde/maemorunfactories.cpp index 8b52801216..d10ca6ea67 100644 --- a/src/plugins/madde/maemorunfactories.cpp +++ b/src/plugins/madde/maemorunfactories.cpp @@ -191,11 +191,5 @@ QString MaemoRunControlFactory::displayName() const return tr("Run on device"); } -RunConfigWidget *MaemoRunControlFactory::createConfigurationWidget(RunConfiguration *config) -{ - Q_UNUSED(config) - return 0; -} - } // namespace Internal } // namespace Madde diff --git a/src/plugins/madde/maemorunfactories.h b/src/plugins/madde/maemorunfactories.h index f5d97822a0..797bacc6da 100644 --- a/src/plugins/madde/maemorunfactories.h +++ b/src/plugins/madde/maemorunfactories.h @@ -78,7 +78,6 @@ public: ~MaemoRunControlFactory(); QString displayName() const; - RunConfigWidget *createConfigurationWidget(RunConfiguration *runConfiguration); bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode); diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp index 007c90b476..866f77e4d7 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp +++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp @@ -73,12 +73,6 @@ RunControl *LocalApplicationRunControlFactory::create(RunConfiguration *runConfi return new LocalApplicationRunControl(localRunConfiguration, mode); } -RunConfigWidget *LocalApplicationRunControlFactory::createConfigurationWidget(RunConfiguration *runConfiguration) -{ - Q_UNUSED(runConfiguration) - return 0; -} - // ApplicationRunControl LocalApplicationRunControl::LocalApplicationRunControl(LocalApplicationRunConfiguration *rc, RunMode mode) diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.h b/src/plugins/projectexplorer/localapplicationruncontrol.h index 0e18b2ec13..fa356b33df 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.h +++ b/src/plugins/projectexplorer/localapplicationruncontrol.h @@ -51,7 +51,6 @@ public: virtual bool canRun(RunConfiguration *runConfiguration, RunMode mode) const; virtual QString displayName() const; virtual RunControl* create(RunConfiguration *runConfiguration, RunMode mode); - virtual RunConfigWidget *createConfigurationWidget(RunConfiguration *runConfiguration); }; class LocalApplicationRunControl : public RunControl diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 06e44481d7..7aa69f2fbb 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -574,6 +574,11 @@ IRunConfigurationAspect *IRunControlFactory::createRunConfigurationAspect() return 0; } +RunConfigWidget *IRunControlFactory::createConfigurationWidget(RunConfiguration *) +{ + return 0; +} + /*! \class ProjectExplorer::RunControl \brief Each instance of this class represents one item that is run. diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 19667451c2..78a523e4b9 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -235,7 +235,7 @@ public: virtual QString displayName() const = 0; virtual IRunConfigurationAspect *createRunConfigurationAspect(); - virtual RunConfigWidget *createConfigurationWidget(RunConfiguration *runConfiguration) = 0; + virtual RunConfigWidget *createConfigurationWidget(RunConfiguration *runConfiguration); }; class PROJECTEXPLORER_EXPORT RunConfigWidget diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index 316b7cb117..bd0f1405db 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp @@ -196,12 +196,6 @@ QString QmlProjectRunControlFactory::displayName() const return tr("Run"); } -ProjectExplorer::RunConfigWidget *QmlProjectRunControlFactory::createConfigurationWidget(RunConfiguration *runConfiguration) -{ - Q_UNUSED(runConfiguration) - return 0; -} - RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConfiguration *runConfig) { Debugger::DebuggerStartParameters params; diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h index 3ead49a29e..c1e0f19ae9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h @@ -81,8 +81,6 @@ public: virtual bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; virtual ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode); virtual QString displayName() const; - virtual ProjectExplorer::RunConfigWidget *createConfigurationWidget(ProjectExplorer::RunConfiguration - *runConfiguration); private: ProjectExplorer::RunControl *createDebugRunControl(QmlProjectRunConfiguration *runConfig); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp index 31d5ca064e..924ab78920 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp @@ -246,8 +246,3 @@ QString S60DeviceDebugRunControlFactory::displayName() const { return S60DeviceDebugRunControl::tr("Debug on Device"); } - -ProjectExplorer::RunConfigWidget *S60DeviceDebugRunControlFactory::createConfigurationWidget(RunConfiguration* /*runConfiguration */) -{ - return 0; -} diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h index c86ac0823c..0eec13e87e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h @@ -78,7 +78,6 @@ public: ProjectExplorer::RunControl* create(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode); QString displayName() const; - ProjectExplorer::RunConfigWidget *createConfigurationWidget(ProjectExplorer::RunConfiguration * /*runConfiguration */); }; } // namespace Internal diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp index 2b6ca72fc2..8350960c86 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp @@ -97,10 +97,6 @@ public: return m_name; } - ProjectExplorer::RunConfigWidget *createConfigurationWidget(ProjectExplorer::RunConfiguration *) { - return 0; - } - private: const ProjectExplorer::RunMode m_mode; const QString m_name; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.cpp index 4a253a12e3..f1f96795f8 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.cpp @@ -76,9 +76,3 @@ QString S60RunControlFactory::displayName() const { return m_name; } - -ProjectExplorer::RunConfigWidget *S60RunControlFactory::createConfigurationWidget(RunConfiguration *runConfiguration) -{ - Q_UNUSED(runConfiguration); - return 0; -} diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.h b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.h index 9ec41cc976..ddf2ab55e9 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolfactory.h @@ -53,8 +53,6 @@ public: QString displayName() const; - ProjectExplorer::RunConfigWidget *createConfigurationWidget(ProjectExplorer::RunConfiguration *runConfiguration); - private: const ProjectExplorer::RunMode m_mode; const QString m_name; diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp index 9df855da89..28b40a4e87 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp @@ -101,11 +101,5 @@ QString RemoteLinuxRunControlFactory::displayName() const return tr("Run on remote Linux device"); } -RunConfigWidget *RemoteLinuxRunControlFactory::createConfigurationWidget(RunConfiguration *config) -{ - Q_UNUSED(config) - return 0; -} - } // namespace Internal } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.h b/src/plugins/remotelinux/remotelinuxruncontrolfactory.h index 6f265449cf..aa46345dee 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.h +++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.h @@ -44,7 +44,6 @@ public: ~RemoteLinuxRunControlFactory(); QString displayName() const; - ProjectExplorer::RunConfigWidget *createConfigurationWidget(ProjectExplorer::RunConfiguration *runConfiguration); bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; -- GitLab