ProjectExplorer: Remove RunWorker::setDisplayName

It has been an obsolete alias for setId for a while and downstream
uses have been adapted.

Change-Id: I467370aa67054599c7771e8275d28e62ddc461fa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2018-08-21 08:28:27 +02:00
parent 98f3b961c6
commit 263cf4c608
20 changed files with 27 additions and 28 deletions

View File

@@ -102,7 +102,7 @@ static QString toNdkArch(const QString &arch)
AndroidDebugSupport::AndroidDebugSupport(RunControl *runControl, const QString &intentName) AndroidDebugSupport::AndroidDebugSupport(RunControl *runControl, const QString &intentName)
: Debugger::DebuggerRunTool(runControl) : Debugger::DebuggerRunTool(runControl)
{ {
setDisplayName("AndroidDebugger"); setId("AndroidDebugger");
m_runner = new AndroidRunner(runControl, intentName); m_runner = new AndroidRunner(runControl, intentName);
addStartDependency(m_runner); addStartDependency(m_runner);
} }

View File

@@ -35,7 +35,7 @@ AndroidQmlToolingSupport::AndroidQmlToolingSupport(RunControl *runControl,
const QString &intentName) const QString &intentName)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("AndroidQmlToolingSupport"); setId("AndroidQmlToolingSupport");
auto runner = new AndroidRunner(runControl, intentName); auto runner = new AndroidRunner(runControl, intentName);
addStartDependency(runner); addStartDependency(runner);

View File

@@ -121,7 +121,7 @@ namespace Internal {
AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName) AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
: RunWorker(runControl), m_target(runControl->runConfiguration()->target()) : RunWorker(runControl), m_target(runControl->runConfiguration()->target())
{ {
setDisplayName("AndroidRunner"); setId("AndroidRunner");
static const int metaTypes[] = { static const int metaTypes[] = {
qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"), qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"),
qRegisterMetaType<Utils::Port>("Utils::Port"), qRegisterMetaType<Utils::Port>("Utils::Port"),

View File

@@ -41,7 +41,7 @@ ClangTidyClazyRunControl::ClangTidyClazyRunControl(
: ClangToolRunControl(runControl, target, fileInfos) : ClangToolRunControl(runControl, target, fileInfos)
, m_diagnosticConfig(diagnosticConfig) , m_diagnosticConfig(diagnosticConfig)
{ {
setDisplayName("ClangTidyClazyRunner"); setId("ClangTidyClazyRunner");
init(); init();
} }

View File

@@ -119,7 +119,7 @@ public:
ProjectBuilder(RunControl *runControl, Project *project, ClangToolRunControl *parent) ProjectBuilder(RunControl *runControl, Project *project, ClangToolRunControl *parent)
: RunWorker(runControl), m_project(project), m_parent(parent) : RunWorker(runControl), m_project(project), m_parent(parent)
{ {
setDisplayName("ProjectBuilder"); setId("ProjectBuilder");
} }
void setEnabled(bool enabled) { m_enabled = enabled; } void setEnabled(bool enabled) { m_enabled = enabled; }

View File

@@ -1684,7 +1684,7 @@ public:
: DebuggerRunTool(runControl, kit) : DebuggerRunTool(runControl, kit)
{ {
IDevice::ConstPtr device = DeviceKitInformation::device(kit); IDevice::ConstPtr device = DeviceKitInformation::device(kit);
setDisplayName("AttachToRunningProcess"); setId("AttachToRunningProcess");
setUsePortsGatherer(true, false); setUsePortsGatherer(true, false);
portsGatherer()->setDevice(device); portsGatherer()->setDevice(device);

View File

@@ -878,7 +878,7 @@ Internal::TerminalRunner *DebuggerRunTool::terminalRunner() const
DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTerminal) DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTerminal)
: RunWorker(runControl), d(new DebuggerRunToolPrivate) : RunWorker(runControl), d(new DebuggerRunToolPrivate)
{ {
setDisplayName("DebuggerRunTool"); setId("DebuggerRunTool");
RunConfiguration *runConfig = runControl->runConfiguration(); RunConfiguration *runConfig = runControl->runConfiguration();
@@ -1027,7 +1027,7 @@ void DebuggerRunTool::showMessage(const QString &msg, int channel, int timeout)
GdbServerPortsGatherer::GdbServerPortsGatherer(RunControl *runControl) GdbServerPortsGatherer::GdbServerPortsGatherer(RunControl *runControl)
: ChannelProvider(runControl, 2) : ChannelProvider(runControl, 2)
{ {
setDisplayName("GdbServerPortsGatherer"); setId("GdbServerPortsGatherer");
m_device = runControl->device(); m_device = runControl->device();
} }
@@ -1065,7 +1065,7 @@ void GdbServerPortsGatherer::setDevice(IDevice::ConstPtr device)
GdbServerRunner::GdbServerRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer) GdbServerRunner::GdbServerRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer)
: SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer) : SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer)
{ {
setDisplayName("GdbServerRunner"); setId("GdbServerRunner");
m_runnable = runControl->runnable(); m_runnable = runControl->runnable();
addStartDependency(m_portsGatherer); addStartDependency(m_portsGatherer);
} }

View File

@@ -171,7 +171,7 @@ void Terminal::onSlaveReaderActivated(int fd)
TerminalRunner::TerminalRunner(RunControl *runControl, const Runnable &stubRunnable) TerminalRunner::TerminalRunner(RunControl *runControl, const Runnable &stubRunnable)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("TerminalRunner"); setId("TerminalRunner");
m_stubRunnable = stubRunnable; m_stubRunnable = stubRunnable;

View File

@@ -381,7 +381,7 @@ void IosRunSupport::stop()
IosQmlProfilerSupport::IosQmlProfilerSupport(RunControl *runControl) IosQmlProfilerSupport::IosQmlProfilerSupport(RunControl *runControl)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("IosAnalyzeSupport"); setId("IosAnalyzeSupport");
auto iosRunConfig = qobject_cast<IosRunConfiguration *>(runControl->runConfiguration()); auto iosRunConfig = qobject_cast<IosRunConfiguration *>(runControl->runConfiguration());
Runnable runnable; Runnable runnable;

View File

@@ -177,7 +177,7 @@ void DeviceUsedPortsGatherer::handleRemoteStdErr()
PortsGatherer::PortsGatherer(RunControl *runControl) PortsGatherer::PortsGatherer(RunControl *runControl)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("PortGatherer"); setId("PortGatherer");
connect(&m_portsGatherer, &DeviceUsedPortsGatherer::error, this, &PortsGatherer::reportFailure); connect(&m_portsGatherer, &DeviceUsedPortsGatherer::error, this, &PortsGatherer::reportFailure);
connect(&m_portsGatherer, &DeviceUsedPortsGatherer::portListReady, this, [this] { connect(&m_portsGatherer, &DeviceUsedPortsGatherer::portListReady, this, [this] {
@@ -257,7 +257,7 @@ public:
SubChannelProvider(RunControl *runControl, RunWorker *sharedEndpointGatherer) SubChannelProvider(RunControl *runControl, RunWorker *sharedEndpointGatherer)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("SubChannelProvider"); setId("SubChannelProvider");
m_portGatherer = qobject_cast<PortsGatherer *>(sharedEndpointGatherer); m_portGatherer = qobject_cast<PortsGatherer *>(sharedEndpointGatherer);
if (m_portGatherer) { if (m_portGatherer) {
@@ -334,7 +334,7 @@ private:
ChannelProvider::ChannelProvider(RunControl *runControl, int requiredChannels) ChannelProvider::ChannelProvider(RunControl *runControl, int requiredChannels)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("ChannelProvider"); setId("ChannelProvider");
RunWorker *sharedEndpoints = nullptr; RunWorker *sharedEndpoints = nullptr;
if (auto sharedEndpointGatherer = device()->workerCreator("SharedEndpointGatherer")) { if (auto sharedEndpointGatherer = device()->workerCreator("SharedEndpointGatherer")) {

View File

@@ -1637,7 +1637,7 @@ void RunControl::appendMessage(const QString &msg, Utils::OutputFormat format)
SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl) SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("SimpleTargetRunner"); setId("SimpleTargetRunner");
m_runnable = runControl->runnable(); // Default value. Can be overridden using setRunnable. m_runnable = runControl->runnable(); // Default value. Can be overridden using setRunnable.
m_device = runControl->device(); // Default value. Can be overridden using setDevice. m_device = runControl->device(); // Default value. Can be overridden using setDevice.
if (auto runConfig = runControl->runConfiguration()) { if (auto runConfig = runControl->runConfiguration()) {

View File

@@ -372,7 +372,6 @@ public:
void addStartDependency(RunWorker *dependency); void addStartDependency(RunWorker *dependency);
void addStopDependency(RunWorker *dependency); void addStopDependency(RunWorker *dependency);
void setDisplayName(const QString &id) { setId(id); } // FIXME: Obsoleted by setId.
void setId(const QString &id); void setId(const QString &id);
void setStartTimeout(int ms, const std::function<void()> &callback = {}); void setStartTimeout(int ms, const std::function<void()> &callback = {});

View File

@@ -76,7 +76,7 @@ QmlProfilerRunner::QmlProfilerRunner(RunControl *runControl)
: RunWorker(runControl) : RunWorker(runControl)
, d(new QmlProfilerRunnerPrivate) , d(new QmlProfilerRunnerPrivate)
{ {
setDisplayName("QmlProfilerRunner"); setId("QmlProfilerRunner");
runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR); runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
setSupportsReRunning(false); setSupportsReRunning(false);
} }
@@ -229,7 +229,7 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(QmlProfilerTool *profilerTool,
RunControl *runControl, const QUrl &serverUrl) RunControl *runControl, const QUrl &serverUrl)
: SimpleTargetRunner(runControl) : SimpleTargetRunner(runControl)
{ {
setDisplayName("LocalQmlProfilerSupport"); setId("LocalQmlProfilerSupport");
QmlProfilerRunner *profiler = new QmlProfilerRunner(runControl); QmlProfilerRunner *profiler = new QmlProfilerRunner(runControl);
profiler->setServerUrl(serverUrl); profiler->setServerUrl(serverUrl);

View File

@@ -50,7 +50,7 @@ namespace Internal {
QnxQmlProfilerSupport::QnxQmlProfilerSupport(RunControl *runControl) QnxQmlProfilerSupport::QnxQmlProfilerSupport(RunControl *runControl)
: SimpleTargetRunner(runControl) : SimpleTargetRunner(runControl)
{ {
setDisplayName("QnxQmlProfilerSupport"); setId("QnxQmlProfilerSupport");
appendMessage(tr("Preparing remote side..."), Utils::LogMessageFormat); appendMessage(tr("Preparing remote side..."), Utils::LogMessageFormat);
m_portsGatherer = new PortsGatherer(runControl); m_portsGatherer = new PortsGatherer(runControl);

View File

@@ -99,7 +99,7 @@ public:
QnxDebuggeeRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer) QnxDebuggeeRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer)
: SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer) : SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer)
{ {
setDisplayName("QnxDebuggeeRunner"); setId("QnxDebuggeeRunner");
} }
private: private:
@@ -133,7 +133,7 @@ private:
QnxDebugSupport::QnxDebugSupport(RunControl *runControl) QnxDebugSupport::QnxDebugSupport(RunControl *runControl)
: DebuggerRunTool(runControl) : DebuggerRunTool(runControl)
{ {
setDisplayName("QnxDebugSupport"); setId("QnxDebugSupport");
appendMessage(tr("Preparing remote side..."), LogMessageFormat); appendMessage(tr("Preparing remote side..."), LogMessageFormat);
setUsePortsGatherer(isCppDebugging(), isQmlDebugging()); setUsePortsGatherer(isCppDebugging(), isQmlDebugging());
@@ -202,7 +202,7 @@ public:
PDebugRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer) PDebugRunner(RunControl *runControl, GdbServerPortsGatherer *portsGatherer)
: SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer) : SimpleTargetRunner(runControl), m_portsGatherer(portsGatherer)
{ {
setDisplayName("PDebugRunner"); setId("PDebugRunner");
addStartDependency(m_portsGatherer); addStartDependency(m_portsGatherer);
} }
@@ -225,7 +225,7 @@ private:
QnxAttachDebugSupport::QnxAttachDebugSupport(RunControl *runControl) QnxAttachDebugSupport::QnxAttachDebugSupport(RunControl *runControl)
: DebuggerRunTool(runControl) : DebuggerRunTool(runControl)
{ {
setDisplayName("QnxAttachDebugSupport"); setId("QnxAttachDebugSupport");
setUsePortsGatherer(isCppDebugging(), isQmlDebugging()); setUsePortsGatherer(isCppDebugging(), isQmlDebugging());

View File

@@ -44,7 +44,7 @@ namespace Internal {
Slog2InfoRunner::Slog2InfoRunner(RunControl *runControl) Slog2InfoRunner::Slog2InfoRunner(RunControl *runControl)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("Slog2InfoRunner"); setId("Slog2InfoRunner");
m_applicationId = runControl->runConfiguration()->extraAspect<ExecutableAspect>()->executable().fileName(); m_applicationId = runControl->runConfiguration()->extraAspect<ExecutableAspect>()->executable().fileName();
// See QTCREATORBUG-10712 for details. // See QTCREATORBUG-10712 for details.

View File

@@ -36,7 +36,7 @@ namespace Internal {
LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl) LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
: DebuggerRunTool(runControl) : DebuggerRunTool(runControl)
{ {
setDisplayName("LinuxDeviceDebugSupport"); setId("LinuxDeviceDebugSupport");
setUsePortsGatherer(isCppDebugging(), isQmlDebugging()); setUsePortsGatherer(isCppDebugging(), isQmlDebugging());
addQmlServerInferiorCommandLineArgumentIfNeeded(); addQmlServerInferiorCommandLineArgumentIfNeeded();

View File

@@ -41,7 +41,7 @@ RemoteLinuxQmlToolingSupport::RemoteLinuxQmlToolingSupport(
RunControl *runControl, QmlDebug::QmlDebugServicesPreset services) RunControl *runControl, QmlDebug::QmlDebugServicesPreset services)
: SimpleTargetRunner(runControl), m_services(services) : SimpleTargetRunner(runControl), m_services(services)
{ {
setDisplayName("RemoteLinuxQmlToolingSupport"); setId("RemoteLinuxQmlToolingSupport");
m_portsGatherer = new PortsGatherer(runControl); m_portsGatherer = new PortsGatherer(runControl);
addStartDependency(m_portsGatherer); addStartDependency(m_portsGatherer);

View File

@@ -47,7 +47,7 @@ void setupCallgrindRunner(CallgrindToolRunner *);
CallgrindToolRunner::CallgrindToolRunner(RunControl *runControl) CallgrindToolRunner::CallgrindToolRunner(RunControl *runControl)
: ValgrindToolRunner(runControl) : ValgrindToolRunner(runControl)
{ {
setDisplayName("CallgrindToolRunner"); setId("CallgrindToolRunner");
connect(&m_runner, &ValgrindRunner::finished, connect(&m_runner, &ValgrindRunner::finished,
this, &CallgrindToolRunner::slotFinished); this, &CallgrindToolRunner::slotFinished);

View File

@@ -1120,7 +1120,7 @@ MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl)
m_withGdb(runControl->runMode() == MEMCHECK_WITH_GDB_RUN_MODE), m_withGdb(runControl->runMode() == MEMCHECK_WITH_GDB_RUN_MODE),
m_localServerAddress(QHostAddress::LocalHost) m_localServerAddress(QHostAddress::LocalHost)
{ {
setDisplayName("MemcheckToolRunner"); setId("MemcheckToolRunner");
connect(m_runner.parser(), &XmlProtocol::ThreadedParser::error, connect(m_runner.parser(), &XmlProtocol::ThreadedParser::error,
this, &MemcheckToolRunner::parserError); this, &MemcheckToolRunner::parserError);
connect(m_runner.parser(), &XmlProtocol::ThreadedParser::suppressionCount, connect(m_runner.parser(), &XmlProtocol::ThreadedParser::suppressionCount,