From 5ac19328fd784b169a1856b667481ec1b4d4529c Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 19 Oct 2023 12:07:25 +0200 Subject: [PATCH] Ios: Remove unused methods Change-Id: I57ac8a80218811ebb1be6f217d37fe925de23395 Reviewed-by: Eike Ziller --- src/plugins/ios/createsimulatordialog.cpp | 4 ++-- src/plugins/ios/simulatorcontrol.cpp | 23 ++++------------------- src/plugins/ios/simulatorcontrol.h | 6 ++---- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/plugins/ios/createsimulatordialog.cpp b/src/plugins/ios/createsimulatordialog.cpp index aff8a673dfc..32884c5e426 100644 --- a/src/plugins/ios/createsimulatordialog.cpp +++ b/src/plugins/ios/createsimulatordialog.cpp @@ -60,10 +60,10 @@ CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent) enableOk(); }); - m_futureSync.addFuture(Utils::onResultReady(SimulatorControl::updateDeviceTypes(this), this, + m_futureSync.addFuture(Utils::onResultReady(SimulatorControl::updateDeviceTypes(), this, &CreateSimulatorDialog::populateDeviceTypes)); - QFuture> runtimesfuture = SimulatorControl::updateRuntimes(this); + QFuture> runtimesfuture = SimulatorControl::updateRuntimes(); Utils::onResultReady(runtimesfuture, this, [this](const QList &runtimes) { m_runtimes = runtimes; }); diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 0832a5faf37..f7f3804983a 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -190,8 +190,6 @@ static void takeSceenshot(QPromise &promise, const QString &filePath); static QList s_availableDevices; -static QList s_availableDeviceTypes; -static QList s_availableRuntimes; QList SimulatorControl::availableSimulators() { @@ -234,27 +232,14 @@ static QList getAvailableSimulators() return availableDevices; } -QFuture> SimulatorControl::updateDeviceTypes(QObject *context) +QFuture> SimulatorControl::updateDeviceTypes() { - QFuture> future = Utils::asyncRun(getAvailableDeviceTypes); - Utils::onResultReady(future, context, [](const QList &deviceTypes) { - s_availableDeviceTypes = deviceTypes; - }); - return future; + return Utils::asyncRun(getAvailableDeviceTypes); } -QList SimulatorControl::availableRuntimes() +QFuture> SimulatorControl::updateRuntimes() { - return s_availableRuntimes; -} - -QFuture> SimulatorControl::updateRuntimes(QObject *context) -{ - QFuture> future = Utils::asyncRun(getAvailableRuntimes); - Utils::onResultReady(future, context, [](const QList &runtimes) { - s_availableRuntimes = runtimes; - }); - return future; + return Utils::asyncRun(getAvailableRuntimes); } QFuture> SimulatorControl::updateAvailableSimulators(QObject *context) diff --git a/src/plugins/ios/simulatorcontrol.h b/src/plugins/ios/simulatorcontrol.h index 402100fbeac..1e5d9375ad8 100644 --- a/src/plugins/ios/simulatorcontrol.h +++ b/src/plugins/ios/simulatorcontrol.h @@ -64,10 +64,8 @@ public: }; public: - static QList availableDeviceTypes(); - static QFuture> updateDeviceTypes(QObject *context); - static QList availableRuntimes(); - static QFuture> updateRuntimes(QObject *context); + static QFuture> updateDeviceTypes(); + static QFuture> updateRuntimes(); static QList availableSimulators(); static QFuture> updateAvailableSimulators(QObject *context); static bool isSimulatorRunning(const QString &simUdid);