From 3932cdf8d4a52e8fc0e4907003cb1fae46669fae Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 25 Jan 2024 01:12:19 +0100 Subject: [PATCH] GenericLinuxDeviceTester: Reuse LoopList Instead of LoopRepeat + container capture. Change-Id: Ie021c618808dad3ac3e0ba5993009074aa9a8313 Reviewed-by: hjk --- src/plugins/remotelinux/linuxdevicetester.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index 49628ccfd74..3d6c41cd657 100644 --- a/src/plugins/remotelinux/linuxdevicetester.cpp +++ b/src/plugins/remotelinux/linuxdevicetester.cpp @@ -243,18 +243,17 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTasks() const GroupItem GenericLinuxDeviceTesterPrivate::commandTasks() const { - const QStringList commands = commandsToTest(); - const LoopRepeat repeater(commands.size()); + const LoopList iterator(commandsToTest()); - const auto onSetup = [this, commands, repeater](Process &process) { - const QString commandName = commands.at(repeater.iteration()); + const auto onSetup = [this, iterator](Process &process) { + const QString &commandName = *iterator; emit q->progressMessage(Tr::tr("%1...").arg(commandName)); CommandLine command{m_device->filePath("/bin/sh"), {"-c"}}; command.addArgs(QLatin1String("\"command -v %1\"").arg(commandName), CommandLine::Raw); process.setCommand(command); }; - const auto onDone = [this, commands, repeater](const Process &process, DoneWith result) { - const QString commandName = commands.at(repeater.iteration()); + const auto onDone = [this, iterator](const Process &process, DoneWith result) { + const QString &commandName = *iterator; if (result == DoneWith::Success) { emit q->progressMessage(Tr::tr("%1 found.").arg(commandName)); return; @@ -271,7 +270,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::commandTasks() const onGroupSetup([this] { emit q->progressMessage(Tr::tr("Checking if required commands are available...")); }), - repeater, + iterator, ProcessTask(onSetup, onDone) }; return root;