feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iOS: Make SimulatorControl static

Browse Source 
It already contained only static members, so creating instances didn't
serve a purpose.

Change-Id: I261503b606c21cf498dcd8470d5645d92d97c325
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2021-05-25 12:14:56 +02:00
parent 69b3c6c1fd
commit fcf9c42e40
7 changed files with 153 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/ios/iostoolhandler.cpp
View File

@@ -307,7 +307,6 @@ class IosSimulatorToolHandlerPrivate : public IosToolHandlerPrivate
{
public:
explicit IosSimulatorToolHandlerPrivate(const IosDeviceType &devType, IosToolHandler *q);
~IosSimulatorToolHandlerPrivate() override;
// IosToolHandlerPrivate overrides
public:
@@ -327,7 +326,6 @@ private:
private:
qint64 m_pid = -1;
SimulatorControl *simCtl;
LogTailFiles outputLogger;
Utils::FutureSynchronizer futureSynchronizer;
};
@@ -802,20 +800,14 @@ void IosDeviceToolHandlerPrivate::stop(int errorCode)
// IosSimulatorToolHandlerPrivate
IosSimulatorToolHandlerPrivate::IosSimulatorToolHandlerPrivate(const IosDeviceType &devType,
IosToolHandler *q)
: IosToolHandlerPrivate(devType, q),
simCtl(new SimulatorControl)
IosToolHandler *q)
: IosToolHandlerPrivate(devType, q)
{
QObject::connect(&outputLogger, &LogTailFiles::logMessage,
std::bind(&IosToolHandlerPrivate::appOutput, this, _1));
futureSynchronizer.setCancelOnWait(true);
}
IosSimulatorToolHandlerPrivate::~IosSimulatorToolHandlerPrivate()
{
futureSynchronizer.waitForFinished();
delete simCtl;
}
void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundlePath,
const QString &deviceIdentifier, int timeout)
{
@@ -840,7 +832,8 @@ void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundle
if (SimulatorControl::isSimulatorRunning(m_deviceId))
installAppOnSimulator();
else
futureSynchronizer.addFuture(Utils::onResultReady(simCtl->startSimulator(m_deviceId), onSimulatorStart));
futureSynchronizer.addFuture(
Utils::onResultReady(SimulatorControl::startSimulator(m_deviceId), onSimulatorStart));
}
void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
@@ -876,7 +869,8 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
if (SimulatorControl::isSimulatorRunning(m_deviceId))
launchAppOnSimulator(extraArgs);
else
futureSynchronizer.addFuture(Utils::onResultReady(simCtl->startSimulator(m_deviceId), onSimulatorStart));
futureSynchronizer.addFuture(
Utils::onResultReady(SimulatorControl::startSimulator(m_deviceId), onSimulatorStart));
}
void IosSimulatorToolHandlerPrivate::requestDeviceInfo(const QString &deviceId, int timeout)
@@ -926,7 +920,8 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
};
isTransferringApp(m_bundlePath, m_deviceId, 20, 100, "");
auto installFuture = simCtl->installApp(m_deviceId, Utils::FilePath::fromString(m_bundlePath));
auto installFuture = SimulatorControl::installApp(m_deviceId,
Utils::FilePath::fromString(m_bundlePath));
futureSynchronizer.addFuture(Utils::onResultReady(installFuture, onResponseAppInstall));
}
@@ -990,11 +985,16 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
}
};
futureSynchronizer.addFuture(Utils::onResultReady(
simCtl->launchApp(m_deviceId, bundleId, debugRun, extraArgs,
captureConsole ? stdoutFile->fileName() : QString(),
captureConsole ? stderrFile->fileName() : QString()),
onResponseAppLaunch));
futureSynchronizer.addFuture(
Utils::onResultReady(SimulatorControl::launchApp(m_deviceId,
bundleId,
debugRun,
extraArgs,
captureConsole ? stdoutFile->fileName()
: QString(),
captureConsole ? stderrFile->fileName()
: QString()),
onResponseAppLaunch));
}
bool IosSimulatorToolHandlerPrivate::isResponseValid(const SimulatorControl::ResponseData &responseData)