diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-11-24 20:55:54 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-11-25 09:28:41 +0000 |
commit | 0a925009a1c9cdc722dbc578749da303d5d22b34 (patch) | |
tree | 03751b181b56b5e7c5035894aebd9e775495b940 | |
parent | 4ad9f539890d78a40e38cad61b2cbe364abcc15e (diff) | |
download | qt-creator-0a925009a1c9cdc722dbc578749da303d5d22b34.tar.gz |
RemoteLinux: Fix const correctness
Amends c88a82905921565053a43beec0ca50c4e0d7f583
Amends f9b4bcd3d83825eb5a41713d1e04fe7fa30c21ea
Change-Id: Ia9817d4f7ba7df495e55e8729ba34258c907a545
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-rw-r--r-- | src/plugins/remotelinux/rsyncdeploystep.cpp | 12 | ||||
-rw-r--r-- | src/plugins/remotelinux/tarpackagedeploystep.cpp | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 3a406cff95..9b4cbe591a 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -63,7 +63,7 @@ bool RsyncDeployService::isDeploymentNecessary() const TaskItem RsyncDeployService::mkdirTask() { - auto setupHandler = [this](QtcProcess &process) { + const auto setupHandler = [this](QtcProcess &process) { QStringList remoteDirs; for (const FileToTransfer &file : std::as_const(m_files)) remoteDirs << file.m_target.parentDir().path(); @@ -75,7 +75,7 @@ TaskItem RsyncDeployService::mkdirTask() emit stdErrData(QString::fromLocal8Bit(proc->readAllStandardError())); }); }; - auto errorHandler = [this](const QtcProcess &process) { + const auto errorHandler = [this](const QtcProcess &process) { QString finalMessage = process.errorString(); const QString stdErr = process.cleanedStdErr(); if (!stdErr.isEmpty()) { @@ -91,14 +91,14 @@ TaskItem RsyncDeployService::mkdirTask() TaskItem RsyncDeployService::transferTask() { - auto setupHandler = [this](FileTransfer &transfer) { + const auto setupHandler = [this](FileTransfer &transfer) { transfer.setTransferMethod(FileTransferMethod::Rsync); transfer.setRsyncFlags(m_flags); transfer.setFilesToTransfer(m_files); connect(&transfer, &FileTransfer::progress, this, &AbstractRemoteLinuxDeployService::stdOutData); }; - auto errorHandler = [this](const FileTransfer &transfer) { + const auto errorHandler = [this](const FileTransfer &transfer) { const ProcessResultData result = transfer.resultData(); if (result.m_error == QProcess::FailedToStart) emit errorMessage(Tr::tr("rsync failed to start: %1").arg(result.m_errorString)); @@ -112,12 +112,12 @@ TaskItem RsyncDeployService::transferTask() void RsyncDeployService::doDeploy() { - auto finishHandler = [this] { + const auto finishHandler = [this] { m_taskTree.release()->deleteLater(); stopDeployment(); }; - Group root { + const Group root { mkdirTask(), transferTask(), OnGroupDone(finishHandler), diff --git a/src/plugins/remotelinux/tarpackagedeploystep.cpp b/src/plugins/remotelinux/tarpackagedeploystep.cpp index 58dc346e0d..a64aeb0e4e 100644 --- a/src/plugins/remotelinux/tarpackagedeploystep.cpp +++ b/src/plugins/remotelinux/tarpackagedeploystep.cpp @@ -59,7 +59,7 @@ bool TarPackageDeployService::isDeploymentNecessary() const TaskItem TarPackageDeployService::uploadTask() { - auto setupHandler = [this](FileTransfer &transfer) { + const auto setupHandler = [this](FileTransfer &transfer) { const FilesToTransfer files {{m_packageFilePath, deviceConfiguration()->filePath(remoteFilePath())}}; transfer.setFilesToTransfer(files); @@ -67,10 +67,10 @@ TaskItem TarPackageDeployService::uploadTask() this, &TarPackageDeployService::progressMessage); 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.")); }; - auto errorHandler = [this](const FileTransfer &transfer) { + const auto errorHandler = [this](const FileTransfer &transfer) { const ProcessResultData result = transfer.resultData(); emit errorMessage(result.m_errorString); }; @@ -79,7 +79,7 @@ TaskItem TarPackageDeployService::uploadTask() TaskItem TarPackageDeployService::installTask() { - auto setupHandler = [this](QtcProcess &process) { + const auto setupHandler = [this](QtcProcess &process) { const QString cmdLine = QLatin1String("cd / && tar xvf ") + remoteFilePath() + " && (rm " + remoteFilePath() + " || :)"; process.setCommand({deviceConfiguration()->filePath("/bin/sh"), {"-c", cmdLine}}); @@ -92,11 +92,11 @@ TaskItem TarPackageDeployService::installTask() }); emit progressMessage(Tr::tr("Installing package to device...")); }; - auto doneHandler = [this](const QtcProcess &) { + const auto doneHandler = [this](const QtcProcess &) { saveDeploymentTimeStamp(DeployableFile(m_packageFilePath, {}), {}); 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()); }; return Process(setupHandler, doneHandler, errorHandler); @@ -106,11 +106,11 @@ void TarPackageDeployService::doDeploy() { QTC_ASSERT(!m_taskTree, return); - auto finishHandler = [this] { + const auto finishHandler = [this] { m_taskTree.release()->deleteLater(); stopDeployment(); }; - Group root { + const Group root { uploadTask(), installTask(), OnGroupDone(finishHandler), |