diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 0cb44f0a4be..c918e1fd023 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -102,7 +102,7 @@ static QString toNdkArch(const QString &arch) AndroidDebugSupport::AndroidDebugSupport(RunControl *runControl, const QString &intentName) : Debugger::DebuggerRunTool(runControl) { - setDisplayName("AndroidDebugger"); + setId("AndroidDebugger"); m_runner = new AndroidRunner(runControl, intentName); addStartDependency(m_runner); } diff --git a/src/plugins/android/androidqmltoolingsupport.cpp b/src/plugins/android/androidqmltoolingsupport.cpp index 001ad3d2d70..b304fbde72e 100644 --- a/src/plugins/android/androidqmltoolingsupport.cpp +++ b/src/plugins/android/androidqmltoolingsupport.cpp @@ -35,7 +35,7 @@ AndroidQmlToolingSupport::AndroidQmlToolingSupport(RunControl *runControl, const QString &intentName) : RunWorker(runControl) { - setDisplayName("AndroidQmlToolingSupport"); + setId("AndroidQmlToolingSupport"); auto runner = new AndroidRunner(runControl, intentName); addStartDependency(runner); diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index a70c9f04dc2..6e876aa5481 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -121,7 +121,7 @@ namespace Internal { AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName) : RunWorker(runControl), m_target(runControl->runConfiguration()->target()) { - setDisplayName("AndroidRunner"); + setId("AndroidRunner"); static const int metaTypes[] = { qRegisterMetaType >("QVector"), qRegisterMetaType("Utils::Port"), diff --git a/src/plugins/clangtools/clangtidyclazyruncontrol.cpp b/src/plugins/clangtools/clangtidyclazyruncontrol.cpp index 42a0af5cdf5..38d8d82094e 100644 --- a/src/plugins/clangtools/clangtidyclazyruncontrol.cpp +++ b/src/plugins/clangtools/clangtidyclazyruncontrol.cpp @@ -41,7 +41,7 @@ ClangTidyClazyRunControl::ClangTidyClazyRunControl( : ClangToolRunControl(runControl, target, fileInfos) , m_diagnosticConfig(diagnosticConfig) { - setDisplayName("ClangTidyClazyRunner"); + setId("ClangTidyClazyRunner"); init(); } diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 0b4c2524337..e824d7a0c08 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -119,7 +119,7 @@ public: ProjectBuilder(RunControl *runControl, Project *project, ClangToolRunControl *parent) : RunWorker(runControl), m_project(project), m_parent(parent) { - setDisplayName("ProjectBuilder"); + setId("ProjectBuilder"); } void setEnabled(bool enabled) { m_enabled = enabled; } diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 2df8a751410..730bc0b780c 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1684,7 +1684,7 @@ public: : DebuggerRunTool(runControl, kit) { IDevice::ConstPtr device = DeviceKitInformation::device(kit); - setDisplayName("AttachToRunningProcess"); + setId("AttachToRunningProcess"); setUsePortsGatherer(true, false); portsGatherer()->setDevice(device); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 3209087a1eb..df36c40bf3f 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -878,7 +878,7 @@ Internal::TerminalRunner *DebuggerRunTool::terminalRunner() const DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTerminal) : RunWorker(runControl), d(new DebuggerRunToolPrivate) { - setDisplayName("DebuggerRunTool"); + setId("DebuggerRunTool"); RunConfiguration *runConfig = runControl->runConfiguration(); @@ -1027,7 +1027,7 @@ void DebuggerRunTool::showMessage(const QString &msg, int channel, int timeout) GdbServerPortsGatherer::GdbServerPortsGatherer(RunControl *runControl) : ChannelProvider(runControl, 2) { - setDisplayName("GdbServerPortsGatherer"); + setId("GdbServerPortsGatherer"); m_device = runControl->device(); } @@ -1065,7 +1065,7 @@ void GdbServerPortsGatherer::setDevice(IDevice::ConstPtr device) GdbServerRunner::GdbServerRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer) : SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer) { - setDisplayName("GdbServerRunner"); + setId("GdbServerRunner"); m_runnable = runControl->runnable(); addStartDependency(m_portsGatherer); } diff --git a/src/plugins/debugger/terminal.cpp b/src/plugins/debugger/terminal.cpp index 12dd4664220..5b2262e8fad 100644 --- a/src/plugins/debugger/terminal.cpp +++ b/src/plugins/debugger/terminal.cpp @@ -171,7 +171,7 @@ void Terminal::onSlaveReaderActivated(int fd) TerminalRunner::TerminalRunner(RunControl *runControl, const Runnable &stubRunnable) : RunWorker(runControl) { - setDisplayName("TerminalRunner"); + setId("TerminalRunner"); m_stubRunnable = stubRunnable; diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 136647d3b4b..26c314398e5 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -381,7 +381,7 @@ void IosRunSupport::stop() IosQmlProfilerSupport::IosQmlProfilerSupport(RunControl *runControl) : RunWorker(runControl) { - setDisplayName("IosAnalyzeSupport"); + setId("IosAnalyzeSupport"); auto iosRunConfig = qobject_cast(runControl->runConfiguration()); Runnable runnable; diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp index 975ca592177..0176369ddc1 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp @@ -177,7 +177,7 @@ void DeviceUsedPortsGatherer::handleRemoteStdErr() PortsGatherer::PortsGatherer(RunControl *runControl) : RunWorker(runControl) { - setDisplayName("PortGatherer"); + setId("PortGatherer"); connect(&m_portsGatherer, &DeviceUsedPortsGatherer::error, this, &PortsGatherer::reportFailure); connect(&m_portsGatherer, &DeviceUsedPortsGatherer::portListReady, this, [this] { @@ -257,7 +257,7 @@ public: SubChannelProvider(RunControl *runControl, RunWorker *sharedEndpointGatherer) : RunWorker(runControl) { - setDisplayName("SubChannelProvider"); + setId("SubChannelProvider"); m_portGatherer = qobject_cast(sharedEndpointGatherer); if (m_portGatherer) { @@ -334,7 +334,7 @@ private: ChannelProvider::ChannelProvider(RunControl *runControl, int requiredChannels) : RunWorker(runControl) { - setDisplayName("ChannelProvider"); + setId("ChannelProvider"); RunWorker *sharedEndpoints = nullptr; if (auto sharedEndpointGatherer = device()->workerCreator("SharedEndpointGatherer")) { diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 52cd91751ef..73f25b2b1bd 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -1637,7 +1637,7 @@ void RunControl::appendMessage(const QString &msg, Utils::OutputFormat format) SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl) : RunWorker(runControl) { - setDisplayName("SimpleTargetRunner"); + setId("SimpleTargetRunner"); m_runnable = runControl->runnable(); // Default value. Can be overridden using setRunnable. m_device = runControl->device(); // Default value. Can be overridden using setDevice. if (auto runConfig = runControl->runConfiguration()) { diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 08797804c06..2e54c9caecf 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -372,7 +372,6 @@ public: void addStartDependency(RunWorker *dependency); void addStopDependency(RunWorker *dependency); - void setDisplayName(const QString &id) { setId(id); } // FIXME: Obsoleted by setId. void setId(const QString &id); void setStartTimeout(int ms, const std::function &callback = {}); diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index f4d9d7cfa73..4565e3e8e29 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -76,7 +76,7 @@ QmlProfilerRunner::QmlProfilerRunner(RunControl *runControl) : RunWorker(runControl) , d(new QmlProfilerRunnerPrivate) { - setDisplayName("QmlProfilerRunner"); + setId("QmlProfilerRunner"); runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR); setSupportsReRunning(false); } @@ -229,7 +229,7 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(QmlProfilerTool *profilerTool, RunControl *runControl, const QUrl &serverUrl) : SimpleTargetRunner(runControl) { - setDisplayName("LocalQmlProfilerSupport"); + setId("LocalQmlProfilerSupport"); QmlProfilerRunner *profiler = new QmlProfilerRunner(runControl); profiler->setServerUrl(serverUrl); diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp index 85a5cf8cc08..3f732f8805a 100644 --- a/src/plugins/qnx/qnxanalyzesupport.cpp +++ b/src/plugins/qnx/qnxanalyzesupport.cpp @@ -50,7 +50,7 @@ namespace Internal { QnxQmlProfilerSupport::QnxQmlProfilerSupport(RunControl *runControl) : SimpleTargetRunner(runControl) { - setDisplayName("QnxQmlProfilerSupport"); + setId("QnxQmlProfilerSupport"); appendMessage(tr("Preparing remote side..."), Utils::LogMessageFormat); m_portsGatherer = new PortsGatherer(runControl); diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index bb7b8097d85..30f569b8265 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -99,7 +99,7 @@ public: QnxDebuggeeRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer) : SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer) { - setDisplayName("QnxDebuggeeRunner"); + setId("QnxDebuggeeRunner"); } private: @@ -133,7 +133,7 @@ private: QnxDebugSupport::QnxDebugSupport(RunControl *runControl) : DebuggerRunTool(runControl) { - setDisplayName("QnxDebugSupport"); + setId("QnxDebugSupport"); appendMessage(tr("Preparing remote side..."), LogMessageFormat); setUsePortsGatherer(isCppDebugging(), isQmlDebugging()); @@ -202,7 +202,7 @@ public: PDebugRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer) : SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer) { - setDisplayName("PDebugRunner"); + setId("PDebugRunner"); addStartDependency(m_portsGatherer); } @@ -225,7 +225,7 @@ private: QnxAttachDebugSupport::QnxAttachDebugSupport(RunControl *runControl) : DebuggerRunTool(runControl) { - setDisplayName("QnxAttachDebugSupport"); + setId("QnxAttachDebugSupport"); setUsePortsGatherer(isCppDebugging(), isQmlDebugging()); diff --git a/src/plugins/qnx/slog2inforunner.cpp b/src/plugins/qnx/slog2inforunner.cpp index 0d649401637..e7648899a49 100644 --- a/src/plugins/qnx/slog2inforunner.cpp +++ b/src/plugins/qnx/slog2inforunner.cpp @@ -44,7 +44,7 @@ namespace Internal { Slog2InfoRunner::Slog2InfoRunner(RunControl *runControl) : RunWorker(runControl) { - setDisplayName("Slog2InfoRunner"); + setId("Slog2InfoRunner"); m_applicationId = runControl->runConfiguration()->extraAspect()->executable().fileName(); // See QTCREATORBUG-10712 for details. diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp index 71aff795568..d098e92493e 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp @@ -36,7 +36,7 @@ namespace Internal { LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl) : DebuggerRunTool(runControl) { - setDisplayName("LinuxDeviceDebugSupport"); + setId("LinuxDeviceDebugSupport"); setUsePortsGatherer(isCppDebugging(), isQmlDebugging()); addQmlServerInferiorCommandLineArgumentIfNeeded(); diff --git a/src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp b/src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp index 3bd7777a317..49f68510687 100644 --- a/src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp +++ b/src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp @@ -41,7 +41,7 @@ RemoteLinuxQmlToolingSupport::RemoteLinuxQmlToolingSupport( RunControl *runControl, QmlDebug::QmlDebugServicesPreset services) : SimpleTargetRunner(runControl), m_services(services) { - setDisplayName("RemoteLinuxQmlToolingSupport"); + setId("RemoteLinuxQmlToolingSupport"); m_portsGatherer = new PortsGatherer(runControl); addStartDependency(m_portsGatherer); diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp index 4557a8a02c3..1ad1c0317e4 100644 --- a/src/plugins/valgrind/callgrindengine.cpp +++ b/src/plugins/valgrind/callgrindengine.cpp @@ -47,7 +47,7 @@ void setupCallgrindRunner(CallgrindToolRunner *); CallgrindToolRunner::CallgrindToolRunner(RunControl *runControl) : ValgrindToolRunner(runControl) { - setDisplayName("CallgrindToolRunner"); + setId("CallgrindToolRunner"); connect(&m_runner, &ValgrindRunner::finished, this, &CallgrindToolRunner::slotFinished); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 59f8a95f7e3..b42090f3efb 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -1120,7 +1120,7 @@ MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl) m_withGdb(runControl->runMode() == MEMCHECK_WITH_GDB_RUN_MODE), m_localServerAddress(QHostAddress::LocalHost) { - setDisplayName("MemcheckToolRunner"); + setId("MemcheckToolRunner"); connect(m_runner.parser(), &XmlProtocol::ThreadedParser::error, this, &MemcheckToolRunner::parserError); connect(m_runner.parser(), &XmlProtocol::ThreadedParser::suppressionCount,