From bd7949f852376d488aa3939faa65349de3d8455b Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 21 Mar 2022 17:47:24 +0100
Subject: [PATCH] AndroidDeployQtStep: Make m_process local

There is no need to keep m_process as a class member,
since it's only used in just one function.

Change-Id: I156b978a18ab25a41b0e52d00fcb90c0f7f12ddd
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/android/androiddeployqtstep.cpp | 34 ++++++++++-----------
 src/plugins/android/androiddeployqtstep.h   |  1 -
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 6cfe8d9f806..f57b716a975 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -324,53 +324,51 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy()
         cmd.addArgs({"install", "-r", m_apkPath.toString()});
     }
 
-    m_process = new QtcProcess;
-    m_process->setCommand(cmd);
-    m_process->setWorkingDirectory(m_workingDirectory);
-    m_process->setEnvironment(m_environment);
-    m_process->setUseCtrlCStub(true);
+    QtcProcess process;
+    process.setCommand(cmd);
+    process.setWorkingDirectory(m_workingDirectory);
+    process.setEnvironment(m_environment);
+    process.setUseCtrlCStub(true);
 
     DeployErrorCode deployError = NoError;
 
-    m_process->setStdOutLineCallback([this, &deployError](const QString &line) {
+    process.setStdOutLineCallback([this, &deployError](const QString &line) {
         deployError |= parseDeployErrors(line);
         stdOutput(line);
     });
-    m_process->setStdErrLineCallback([this, &deployError](const QString &line) {
+    process.setStdErrLineCallback([this, &deployError](const QString &line) {
         deployError |= parseDeployErrors(line);
         stdError(line);
     });
 
-    m_process->start();
+    process.start();
 
     emit addOutput(tr("Starting: \"%1\"").arg(cmd.toUserOutput()), OutputFormat::NormalMessage);
 
-    while (!m_process->waitForFinished(200)) {
-        if (m_process->state() == QProcess::NotRunning)
+    while (!process.waitForFinished(200)) {
+        if (process.state() == QProcess::NotRunning)
             break;
 
         if (isCanceled()) {
-            m_process->kill();
-            m_process->waitForFinished();
+            process.kill();
+            process.waitForFinished();
         }
     }
 
-    QString line = QString::fromLocal8Bit(m_process->readAllStandardError());
+    QString line = QString::fromLocal8Bit(process.readAllStandardError());
     if (!line.isEmpty()) {
         deployError |= parseDeployErrors(line);
         stdError(line);
     }
 
-    line = QString::fromLocal8Bit(m_process->readAllStandardOutput());
+    line = QString::fromLocal8Bit(process.readAllStandardOutput());
     if (!line.isEmpty()) {
         deployError |= parseDeployErrors(line);
         stdOutput(line);
     }
 
-    QProcess::ExitStatus exitStatus = m_process->exitStatus();
-    int exitCode = m_process->exitCode();
-    delete m_process;
-    m_process = nullptr;
+    const QProcess::ExitStatus exitStatus = process.exitStatus();
+    const int exitCode = process.exitCode();
 
     if (exitStatus == QProcess::NormalExit && exitCode == 0) {
         emit addOutput(tr("The process \"%1\" exited normally.").arg(m_command.toUserOutput()),
diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h
index db9648df808..26c6af58aae 100644
--- a/src/plugins/android/androiddeployqtstep.h
+++ b/src/plugins/android/androiddeployqtstep.h
@@ -112,7 +112,6 @@ private:
     Utils::FilePath m_command;
     Utils::FilePath m_workingDirectory;
     Utils::Environment m_environment;
-    Utils::QtcProcess *m_process = nullptr;
     AndroidDeviceInfo m_deviceInfo;
 };