diff --git a/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp b/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp index 4d6b8362ce437c4ca6d9a95399e60c0f49e54a56..38dcbc67031bf6e2f5bba10c11ceffe76f6e0c5d 100644 --- a/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp +++ b/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp @@ -48,11 +48,6 @@ AnalyzerRunControlFactory::AnalyzerRunControlFactory(QObject *parent) : { } -QString AnalyzerRunControlFactory::displayName() const -{ - return tr("Analyzer"); -} - bool AnalyzerRunControlFactory::canRun(RunConfiguration *runConfiguration, RunMode mode) const { IAnalyzerTool *tool = AnalyzerManager::toolFromRunMode(mode); diff --git a/src/plugins/analyzerbase/analyzerruncontrolfactory.h b/src/plugins/analyzerbase/analyzerruncontrolfactory.h index 9c29c32ae987152666febd6971fa97ad3de6c090..1a041c222db3943fc4817157d704928dc5a7ecc3 100644 --- a/src/plugins/analyzerbase/analyzerruncontrolfactory.h +++ b/src/plugins/analyzerbase/analyzerruncontrolfactory.h @@ -44,7 +44,6 @@ public: explicit AnalyzerRunControlFactory(QObject *parent = 0); // IRunControlFactory implementation - QString displayName() const; bool canRun(RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; ProjectExplorer::RunControl *create(RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode, diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp index 8b3b6a6b3165c55b1549acd424d8c6772615a7dc..2dd93bc6b4d8930dfafb94c851d4e82f58abe8d0 100644 --- a/src/plugins/android/androidrunfactories.cpp +++ b/src/plugins/android/androidrunfactories.cpp @@ -167,10 +167,5 @@ RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig, return AndroidDebugSupport::createDebugRunControl(rc, errorMessage); } -QString AndroidRunControlFactory::displayName() const -{ - return tr("Run on Android device or emulator."); -} - } // namespace Internal } // namespace Qt4ProjectManager diff --git a/src/plugins/android/androidrunfactories.h b/src/plugins/android/androidrunfactories.h index 66f95f719315676e09ee2033815e2148cb00eade..3fa64f60e5efcd0810a9166b1d02ec6a6175c9b3 100644 --- a/src/plugins/android/androidrunfactories.h +++ b/src/plugins/android/androidrunfactories.h @@ -78,8 +78,6 @@ class AndroidRunControlFactory : public ProjectExplorer::IRunControlFactory public: explicit AndroidRunControlFactory(QObject *parent = 0); - QString displayName() const; - bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, diff --git a/src/plugins/debugger/debuggerruncontrolfactory.h b/src/plugins/debugger/debuggerruncontrolfactory.h index 883fce96dc4c6065647425a8b4f94fede584f185..70a9adf2d568f185e2fd6f47a6aadd6fb53ef99f 100644 --- a/src/plugins/debugger/debuggerruncontrolfactory.h +++ b/src/plugins/debugger/debuggerruncontrolfactory.h @@ -68,9 +68,6 @@ public: ProjectExplorer::IRunConfigurationAspect *createRunConfigurationAspect( ProjectExplorer::RunConfiguration *rc); - -private: - QString displayName() const; }; } // namespace Internal diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 5090f97485e0bdb19c022775880a7ba36858277d..9f18893ff5dff8d39b5167b8332eee58e5c29ddb 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -325,11 +325,6 @@ bool DebuggerRunControlFactory::canRun(RunConfiguration *runConfiguration, RunMo && qobject_cast(runConfiguration); } -QString DebuggerRunControlFactory::displayName() const -{ - return DebuggerPlugin::tr("Debug"); -} - static DebuggerStartParameters localStartParameters(RunConfiguration *runConfiguration, QString *errorMessage) { DebuggerStartParameters sp; diff --git a/src/plugins/madde/maemorunfactories.cpp b/src/plugins/madde/maemorunfactories.cpp index d675fb543b3f1e4a09bd19a15edc064ed1e5e3d7..cbd84ddbc6b9afde54fe95e344a458ba01713d1b 100644 --- a/src/plugins/madde/maemorunfactories.cpp +++ b/src/plugins/madde/maemorunfactories.cpp @@ -239,10 +239,5 @@ RunControl* MaemoRunControlFactory::create(RunConfiguration *runConfig, RunMode QTC_ASSERT(false, return 0); } -QString MaemoRunControlFactory::displayName() const -{ - return tr("Run on device"); -} - } // namespace Internal } // namespace Madde diff --git a/src/plugins/madde/maemorunfactories.h b/src/plugins/madde/maemorunfactories.h index ce7782fb86b71df403715d24f50efc349188cdae..84d779099acf69aec6c24f5e7c0aebb49786e35b 100644 --- a/src/plugins/madde/maemorunfactories.h +++ b/src/plugins/madde/maemorunfactories.h @@ -82,8 +82,6 @@ public: explicit MaemoRunControlFactory(QObject *parent = 0); ~MaemoRunControlFactory(); - QString displayName() const; - 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 429649df6c1e77fcf4bc2c058b52135017588212..4d8a5efd34885d3024918c3f8b8c7269f0497734 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp +++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp @@ -53,11 +53,6 @@ bool LocalApplicationRunControlFactory::canRun(RunConfiguration *runConfiguratio return mode == NormalRunMode && qobject_cast(runConfiguration); } -QString LocalApplicationRunControlFactory::displayName() const -{ - return tr("Run"); -} - RunControl *LocalApplicationRunControlFactory::create(RunConfiguration *runConfiguration, RunMode mode, QString *errorMessage) { QTC_ASSERT(canRun(runConfiguration, mode), return 0); diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.h b/src/plugins/projectexplorer/localapplicationruncontrol.h index 4a7bbb38e233267d9979b4e4295e55b65ab3ae17..0904f3d5296ab38be80ad8eca9a3113db01fc60e 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.h +++ b/src/plugins/projectexplorer/localapplicationruncontrol.h @@ -45,7 +45,6 @@ public: LocalApplicationRunControlFactory (); virtual ~LocalApplicationRunControlFactory(); virtual bool canRun(RunConfiguration *runConfiguration, RunMode mode) const; - virtual QString displayName() const; virtual RunControl* create(RunConfiguration *runConfiguration, RunMode mode, QString *errorMessage); }; diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index b656107f4981243870ceaa4db5f78221bfb74573..f51f8006b38975a903a948e3d9fb831e8f5a462f 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -186,8 +186,6 @@ public: virtual bool canRun(RunConfiguration *runConfiguration, RunMode mode) const = 0; virtual RunControl *create(RunConfiguration *runConfiguration, RunMode mode, QString *errorMessage) = 0; - virtual QString displayName() const = 0; - virtual IRunConfigurationAspect *createRunConfigurationAspect(RunConfiguration *rc); }; diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index 84af07b3b00c6b3ed33fb767319ea460752dfb53..f54e185c6293ee2d84f520b137f6da83eb033bf1 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp @@ -192,11 +192,6 @@ RunControl *QmlProjectRunControlFactory::create(RunConfiguration *runConfigurati return runControl; } -QString QmlProjectRunControlFactory::displayName() const -{ - return tr("Run"); -} - RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConfiguration *runConfig, QString *errorMessage) { Debugger::DebuggerStartParameters params; diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h index 0af1343cbe9cfc406ff160ec57efc427677b4e6f..9eea9736d5502c4aed09e6ffc552f98af6af5574 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h @@ -78,8 +78,6 @@ public: virtual bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; virtual ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode, QString *errorMessage); - virtual QString displayName() const; - private: ProjectExplorer::RunControl *createDebugRunControl(QmlProjectRunConfiguration *runConfig, QString *errorMessage); }; diff --git a/src/plugins/qnx/blackberryruncontrolfactory.cpp b/src/plugins/qnx/blackberryruncontrolfactory.cpp index aa3e2c93aab4c4f841425c95c4b5d932537cac28..3db7911f9d10bc535488aced909663073fa1d4ea 100644 --- a/src/plugins/qnx/blackberryruncontrolfactory.cpp +++ b/src/plugins/qnx/blackberryruncontrolfactory.cpp @@ -125,11 +125,6 @@ ProjectExplorer::RunControl *BlackBerryRunControlFactory::create(ProjectExplorer return runControl; } -QString BlackBerryRunControlFactory::displayName() const -{ - return tr("Run on BlackBerry Device"); -} - Debugger::DebuggerStartParameters BlackBerryRunControlFactory::startParameters( const BlackBerryRunConfiguration *runConfig) { diff --git a/src/plugins/qnx/blackberryruncontrolfactory.h b/src/plugins/qnx/blackberryruncontrolfactory.h index c31191f20752149d4fa33b9ffe4fd79d57d42a2a..b66319e91505a514521e5d238f872fbe8b3c40f1 100644 --- a/src/plugins/qnx/blackberryruncontrolfactory.h +++ b/src/plugins/qnx/blackberryruncontrolfactory.h @@ -58,8 +58,6 @@ public: ProjectExplorer::RunMode mode, QString *errorMessage); - QString displayName() const; - private: static Debugger::DebuggerStartParameters startParameters( const BlackBerryRunConfiguration *runConfig); diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp index 34794d46ee91a5f7e249c3f06368ada2a0d14ecc..989f38ff15806afcce96d17ec322613ceea42c9e 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.cpp +++ b/src/plugins/qnx/qnxruncontrolfactory.cpp @@ -154,8 +154,3 @@ RunControl *QnxRunControlFactory::create(RunConfiguration *runConfig, RunMode mo return runControl; } - -QString QnxRunControlFactory::displayName() const -{ - return tr("Run on remote QNX device"); -} diff --git a/src/plugins/qnx/qnxruncontrolfactory.h b/src/plugins/qnx/qnxruncontrolfactory.h index 5f00138cb8d482db863587835b4e1971b0f4f4ae..2f1773a44e6c5a30b4f9b5e4b74acf34d0ca73b6 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.h +++ b/src/plugins/qnx/qnxruncontrolfactory.h @@ -44,8 +44,6 @@ class QnxRunControlFactory : public ProjectExplorer::IRunControlFactory public: explicit QnxRunControlFactory(QObject *parent = 0); - QString displayName() const; - bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp index 8cd5be8e448974c1c78b80478d7c48738a930f08..8682e540559a27e81cfc9e27ff71a5fbad4e6649 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp @@ -108,10 +108,5 @@ RunControl *RemoteLinuxRunControlFactory::create(RunConfiguration *runConfig, Ru QTC_ASSERT(false, return 0); } -QString RemoteLinuxRunControlFactory::displayName() const -{ - return tr("Run on remote Linux device"); -} - } // namespace Internal } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.h b/src/plugins/remotelinux/remotelinuxruncontrolfactory.h index 9a5805ddde6854594c9691ce85a9d86f8bfc3445..9a34790d129731dd35a20f523d089a2ec774bec8 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.h +++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.h @@ -41,8 +41,6 @@ public: explicit RemoteLinuxRunControlFactory(QObject *parent = 0); ~RemoteLinuxRunControlFactory(); - QString displayName() const; - bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,