feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GenericLinuxDeviceTester: Reuse LoopList

Browse Source 
Instead of LoopRepeat + container capture.

Change-Id: Ie021c618808dad3ac3e0ba5993009074aa9a8313
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-01-25 01:12:19 +01:00
parent 84315d5988
commit 3932cdf8d4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/remotelinux/linuxdevicetester.cpp
View File

@@ -243,18 +243,17 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTasks() const
GroupItem GenericLinuxDeviceTesterPrivate::commandTasks() const GroupItem GenericLinuxDeviceTesterPrivate::commandTasks() const
{ {
const QStringList commands = commandsToTest(); const LoopList iterator(commandsToTest());
const LoopRepeat repeater(commands.size());
const auto onSetup = [this, commands, repeater](Process &process) { const auto onSetup = [this, iterator](Process &process) {
const QString commandName = commands.at(repeater.iteration()); const QString &commandName = *iterator;
emit q->progressMessage(Tr::tr("%1...").arg(commandName)); emit q->progressMessage(Tr::tr("%1...").arg(commandName));
CommandLine command{m_device->filePath("/bin/sh"), {"-c"}}; CommandLine command{m_device->filePath("/bin/sh"), {"-c"}};
command.addArgs(QLatin1String("\"command -v %1\"").arg(commandName), CommandLine::Raw); command.addArgs(QLatin1String("\"command -v %1\"").arg(commandName), CommandLine::Raw);
process.setCommand(command); process.setCommand(command);
}; };
const auto onDone = [this, commands, repeater](const Process &process, DoneWith result) { const auto onDone = [this, iterator](const Process &process, DoneWith result) {
const QString commandName = commands.at(repeater.iteration()); const QString &commandName = *iterator;
if (result == DoneWith::Success) { if (result == DoneWith::Success) {
emit q->progressMessage(Tr::tr("%1 found.").arg(commandName)); emit q->progressMessage(Tr::tr("%1 found.").arg(commandName));
return; return;
@@ -271,7 +270,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::commandTasks() const
onGroupSetup([this] { onGroupSetup([this] {
emit q->progressMessage(Tr::tr("Checking if required commands are available...")); emit q->progressMessage(Tr::tr("Checking if required commands are available..."));
}), }),
repeater, iterator,
ProcessTask(onSetup, onDone) ProcessTask(onSetup, onDone)
}; };
return root; return root;