RemoteLinux: Fix const correctness

Amends c88a829059
Amends f9b4bcd3d8

Change-Id: Ia9817d4f7ba7df495e55e8729ba34258c907a545
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-11-24 20:55:54 +01:00
parent 4ad9f53989
commit 0a925009a1
2 changed files with 14 additions and 14 deletions

View File

@@ -63,7 +63,7 @@ bool RsyncDeployService::isDeploymentNecessary() const
TaskItem RsyncDeployService::mkdirTask() TaskItem RsyncDeployService::mkdirTask()
{ {
auto setupHandler = [this](QtcProcess &process) { const auto setupHandler = [this](QtcProcess &process) {
QStringList remoteDirs; QStringList remoteDirs;
for (const FileToTransfer &file : std::as_const(m_files)) for (const FileToTransfer &file : std::as_const(m_files))
remoteDirs << file.m_target.parentDir().path(); remoteDirs << file.m_target.parentDir().path();
@@ -75,7 +75,7 @@ TaskItem RsyncDeployService::mkdirTask()
emit stdErrData(QString::fromLocal8Bit(proc->readAllStandardError())); emit stdErrData(QString::fromLocal8Bit(proc->readAllStandardError()));
}); });
}; };
auto errorHandler = [this](const QtcProcess &process) { const auto errorHandler = [this](const QtcProcess &process) {
QString finalMessage = process.errorString(); QString finalMessage = process.errorString();
const QString stdErr = process.cleanedStdErr(); const QString stdErr = process.cleanedStdErr();
if (!stdErr.isEmpty()) { if (!stdErr.isEmpty()) {
@@ -91,14 +91,14 @@ TaskItem RsyncDeployService::mkdirTask()
TaskItem RsyncDeployService::transferTask() TaskItem RsyncDeployService::transferTask()
{ {
auto setupHandler = [this](FileTransfer &transfer) { const auto setupHandler = [this](FileTransfer &transfer) {
transfer.setTransferMethod(FileTransferMethod::Rsync); transfer.setTransferMethod(FileTransferMethod::Rsync);
transfer.setRsyncFlags(m_flags); transfer.setRsyncFlags(m_flags);
transfer.setFilesToTransfer(m_files); transfer.setFilesToTransfer(m_files);
connect(&transfer, &FileTransfer::progress, connect(&transfer, &FileTransfer::progress,
this, &AbstractRemoteLinuxDeployService::stdOutData); this, &AbstractRemoteLinuxDeployService::stdOutData);
}; };
auto errorHandler = [this](const FileTransfer &transfer) { const auto errorHandler = [this](const FileTransfer &transfer) {
const ProcessResultData result = transfer.resultData(); const ProcessResultData result = transfer.resultData();
if (result.m_error == QProcess::FailedToStart) if (result.m_error == QProcess::FailedToStart)
emit errorMessage(Tr::tr("rsync failed to start: %1").arg(result.m_errorString)); emit errorMessage(Tr::tr("rsync failed to start: %1").arg(result.m_errorString));
@@ -112,12 +112,12 @@ TaskItem RsyncDeployService::transferTask()
void RsyncDeployService::doDeploy() void RsyncDeployService::doDeploy()
{ {
auto finishHandler = [this] { const auto finishHandler = [this] {
m_taskTree.release()->deleteLater(); m_taskTree.release()->deleteLater();
stopDeployment(); stopDeployment();
}; };
Group root { const Group root {
mkdirTask(), mkdirTask(),
transferTask(), transferTask(),
OnGroupDone(finishHandler), OnGroupDone(finishHandler),

View File

@@ -59,7 +59,7 @@ bool TarPackageDeployService::isDeploymentNecessary() const
TaskItem TarPackageDeployService::uploadTask() TaskItem TarPackageDeployService::uploadTask()
{ {
auto setupHandler = [this](FileTransfer &transfer) { const auto setupHandler = [this](FileTransfer &transfer) {
const FilesToTransfer files {{m_packageFilePath, const FilesToTransfer files {{m_packageFilePath,
deviceConfiguration()->filePath(remoteFilePath())}}; deviceConfiguration()->filePath(remoteFilePath())}};
transfer.setFilesToTransfer(files); transfer.setFilesToTransfer(files);
@@ -67,10 +67,10 @@ TaskItem TarPackageDeployService::uploadTask()
this, &TarPackageDeployService::progressMessage); this, &TarPackageDeployService::progressMessage);
emit progressMessage(Tr::tr("Uploading package to device...")); emit progressMessage(Tr::tr("Uploading package to device..."));
}; };
auto doneHandler = [this](const FileTransfer &) { const auto doneHandler = [this](const FileTransfer &) {
emit progressMessage(Tr::tr("Successfully uploaded package file.")); emit progressMessage(Tr::tr("Successfully uploaded package file."));
}; };
auto errorHandler = [this](const FileTransfer &transfer) { const auto errorHandler = [this](const FileTransfer &transfer) {
const ProcessResultData result = transfer.resultData(); const ProcessResultData result = transfer.resultData();
emit errorMessage(result.m_errorString); emit errorMessage(result.m_errorString);
}; };
@@ -79,7 +79,7 @@ TaskItem TarPackageDeployService::uploadTask()
TaskItem TarPackageDeployService::installTask() TaskItem TarPackageDeployService::installTask()
{ {
auto setupHandler = [this](QtcProcess &process) { const auto setupHandler = [this](QtcProcess &process) {
const QString cmdLine = QLatin1String("cd / && tar xvf ") + remoteFilePath() const QString cmdLine = QLatin1String("cd / && tar xvf ") + remoteFilePath()
+ " && (rm " + remoteFilePath() + " || :)"; + " && (rm " + remoteFilePath() + " || :)";
process.setCommand({deviceConfiguration()->filePath("/bin/sh"), {"-c", cmdLine}}); process.setCommand({deviceConfiguration()->filePath("/bin/sh"), {"-c", cmdLine}});
@@ -92,11 +92,11 @@ TaskItem TarPackageDeployService::installTask()
}); });
emit progressMessage(Tr::tr("Installing package to device...")); emit progressMessage(Tr::tr("Installing package to device..."));
}; };
auto doneHandler = [this](const QtcProcess &) { const auto doneHandler = [this](const QtcProcess &) {
saveDeploymentTimeStamp(DeployableFile(m_packageFilePath, {}), {}); saveDeploymentTimeStamp(DeployableFile(m_packageFilePath, {}), {});
emit progressMessage(Tr::tr("Successfully installed package file.")); emit progressMessage(Tr::tr("Successfully installed package file."));
}; };
auto errorHandler = [this](const QtcProcess &process) { const auto errorHandler = [this](const QtcProcess &process) {
emit errorMessage(Tr::tr("Installing package failed.") + process.errorString()); emit errorMessage(Tr::tr("Installing package failed.") + process.errorString());
}; };
return Process(setupHandler, doneHandler, errorHandler); return Process(setupHandler, doneHandler, errorHandler);
@@ -106,11 +106,11 @@ void TarPackageDeployService::doDeploy()
{ {
QTC_ASSERT(!m_taskTree, return); QTC_ASSERT(!m_taskTree, return);
auto finishHandler = [this] { const auto finishHandler = [this] {
m_taskTree.release()->deleteLater(); m_taskTree.release()->deleteLater();
stopDeployment(); stopDeployment();
}; };
Group root { const Group root {
uploadTask(), uploadTask(),
installTask(), installTask(),
OnGroupDone(finishHandler), OnGroupDone(finishHandler),