From 2c69ef8ddf6c9d1863bb01cea38722724e491e5f Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 16 Aug 2024 10:58:42 +0200
Subject: [PATCH] Android: Replace RunWorker arg with RunControl

Change-Id: Ic3072d3ce7d1c36a2ff333f729a4e9784e62222a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidrunner.cpp       | 2 +-
 src/plugins/android/androidrunnerworker.cpp | 5 ++---
 src/plugins/android/androidrunnerworker.h   | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 00ed796e1df..a60156bacfe 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -103,7 +103,7 @@ void AndroidRunner::startImpl(const QString &deviceSerialNumber, int apiLevel)
     if (m_worker)
         m_worker->deleteLater();
 
-    m_worker = new AndroidRunnerWorker(this, deviceSerialNumber, apiLevel);
+    m_worker = new AndroidRunnerWorker(runControl(), deviceSerialNumber, apiLevel);
     m_worker->moveToThread(&m_thread);
     QObject::connect(&m_thread, &QThread::finished, m_worker, &QObject::deleteLater);
 
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index ad973b0cf2a..8fefb71a131 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -130,14 +130,13 @@ static FilePath debugServer(bool useLldb, const Target *target)
     return {};
 }
 
-AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &deviceSerialNumber,
+AndroidRunnerWorker::AndroidRunnerWorker(RunControl *runControl, const QString &deviceSerialNumber,
                                          int apiLevel)
 {
-    auto runControl = runner->runControl();
     m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit())
                     == Debugger::LldbEngineType;
     auto aspect = runControl->aspectData<Debugger::DebuggerRunConfigurationAspect>();
-    Utils::Id runMode = runControl->runMode();
+    const Id runMode = runControl->runMode();
     const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE;
     m_useCppDebugger = debuggingMode && aspect->useCppDebugger;
     if (debuggingMode && aspect->useQmlDebugger)
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h
index 585ba5eff29..310bb59cc5f 100644
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -12,7 +12,7 @@
 #include <utils/environment.h>
 
 namespace Android { class AndroidDeviceInfo; }
-namespace ProjectExplorer { class RunWorker; }
+namespace ProjectExplorer { class RunControl; }
 namespace Utils { class Port; }
 
 namespace Android::Internal {
@@ -21,7 +21,7 @@ class AndroidRunnerWorker : public QObject
 {
     Q_OBJECT
 public:
-    AndroidRunnerWorker(ProjectExplorer::RunWorker *runner, const QString &deviceSerialNumber,
+    AndroidRunnerWorker(ProjectExplorer::RunControl *runControl, const QString &deviceSerialNumber,
                         int apiLevel);
     ~AndroidRunnerWorker() override;