From 4fb63e4c9d0d86b7ee18ed289c62d6791b44850a Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 23 Jul 2024 12:10:40 +0200
Subject: [PATCH] iOS: Remove unused variable

It was set, but nobody was actually using it.

Change-Id: I99c6fcd4605591d65e5f3fb3f489a3de0c61fb24
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
---
 src/plugins/ios/simulatorcontrol.cpp | 61 +++++++++++++---------------
 src/plugins/ios/simulatorcontrol.h   |  1 -
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp
index 53b41d67828..36814f9d2dd 100644
--- a/src/plugins/ios/simulatorcontrol.cpp
+++ b/src/plugins/ios/simulatorcontrol.cpp
@@ -480,14 +480,14 @@ void installApp(QPromise<SimulatorControl::Response> &promise,
         return;
     }
 
-    expected_str<void> result = runSimCtlCommand({"install", simUdid, bundlePath.toString()},
-                                                 nullptr,
-                                                 &response.commandOutput,
-                                                 [&promise] { return promise.isCanceled(); });
+    QString allOutput;
+    expected_str<void> result = runSimCtlCommand(
+        {"install", simUdid, bundlePath.toString()}, nullptr, &allOutput, [&promise] {
+            return promise.isCanceled();
+        });
     if (!result) {
-        const QString error = result.error().isEmpty()
-                                  ? response.commandOutput
-                                  : (result.error() + "\n" + response.commandOutput);
+        const QString error = result.error().isEmpty() ? allOutput
+                                                       : (result.error() + "\n" + allOutput);
         promise.addResult(make_unexpected(error));
     } else {
         promise.addResult(response);
@@ -527,10 +527,9 @@ void launchApp(QPromise<SimulatorControl::Response> &promise,
     }
 
     QString stdOutput;
-    expected_str<void> result = runSimCtlCommand(args,
-                                                 &stdOutput,
-                                                 &response.commandOutput,
-                                                 [&promise] { return promise.isCanceled(); });
+    expected_str<void> result = runSimCtlCommand(args, &stdOutput, nullptr, [&promise] {
+        return promise.isCanceled();
+    });
 
     if (!result) {
         promise.addResult(make_unexpected(result.error()));
@@ -553,10 +552,9 @@ void launchApp(QPromise<SimulatorControl::Response> &promise,
 void deleteSimulator(QPromise<SimulatorControl::Response> &promise, const QString &simUdid)
 {
     SimulatorControl::ResponseData response(simUdid);
-    expected_str<void> result = runSimCtlCommand({"delete", simUdid},
-                                                 nullptr,
-                                                 &response.commandOutput,
-                                                 [&promise] { return promise.isCanceled(); });
+    expected_str<void> result = runSimCtlCommand({"delete", simUdid}, nullptr, nullptr, [&promise] {
+        return promise.isCanceled();
+    });
 
     if (!result)
         promise.addResult(make_unexpected(result.error()));
@@ -567,10 +565,9 @@ void deleteSimulator(QPromise<SimulatorControl::Response> &promise, const QStrin
 void resetSimulator(QPromise<SimulatorControl::Response> &promise, const QString &simUdid)
 {
     SimulatorControl::ResponseData response(simUdid);
-    expected_str<void> result = runSimCtlCommand({"erase", simUdid},
-                                                 nullptr,
-                                                 &response.commandOutput,
-                                                 [&promise] { return promise.isCanceled(); });
+    expected_str<void> result = runSimCtlCommand({"erase", simUdid}, nullptr, nullptr, [&promise] {
+        return promise.isCanceled();
+    });
 
     if (!result)
         promise.addResult(make_unexpected(result.error()));
@@ -583,10 +580,10 @@ void renameSimulator(QPromise<SimulatorControl::Response> &promise,
                      const QString &newName)
 {
     SimulatorControl::ResponseData response(simUdid);
-    expected_str<void> result = runSimCtlCommand({"rename", simUdid, newName},
-                                                 nullptr,
-                                                 &response.commandOutput,
-                                                 [&promise] { return promise.isCanceled(); });
+    expected_str<void> result
+        = runSimCtlCommand({"rename", simUdid, newName}, nullptr, nullptr, [&promise] {
+              return promise.isCanceled();
+          });
     if (!result)
         promise.addResult(make_unexpected(result.error()));
     else
@@ -606,11 +603,11 @@ void createSimulator(QPromise<SimulatorControl::Response> &promise,
     }
 
     QString stdOutput;
-    expected_str<void> result
-        = runSimCtlCommand({"create", name, deviceType.identifier, runtime.identifier},
-                           &stdOutput,
-                           &response.commandOutput,
-                           [&promise] { return promise.isCanceled(); });
+    expected_str<void> result = runSimCtlCommand(
+        {"create", name, deviceType.identifier, runtime.identifier},
+        &stdOutput,
+        nullptr,
+        [&promise] { return promise.isCanceled(); });
 
     if (result)
         response.simUdid = stdOutput.trimmed();
@@ -626,10 +623,10 @@ void takeSceenshot(QPromise<SimulatorControl::Response> &promise,
                    const QString &filePath)
 {
     SimulatorControl::ResponseData response(simUdid);
-    expected_str<void> result = runSimCtlCommand({"io", simUdid, "screenshot", filePath},
-                                                 nullptr,
-                                                 &response.commandOutput,
-                                                 [&promise] { return promise.isCanceled(); });
+    expected_str<void> result
+        = runSimCtlCommand({"io", simUdid, "screenshot", filePath}, nullptr, nullptr, [&promise] {
+              return promise.isCanceled();
+          });
 
     if (!result)
         promise.addResult(make_unexpected(result.error()));
diff --git a/src/plugins/ios/simulatorcontrol.h b/src/plugins/ios/simulatorcontrol.h
index 914e71b8f69..b18e5061d40 100644
--- a/src/plugins/ios/simulatorcontrol.h
+++ b/src/plugins/ios/simulatorcontrol.h
@@ -60,7 +60,6 @@ public:
 
         QString simUdid;
         qint64 inferiorPid{-1};
-        QString commandOutput;
     };
 
     using Response = Utils::expected_str<ResponseData>;