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

45
src/plugins/ios/iossettingswidget.cpp
View File

@@ -63,8 +63,7 @@ static void onSimOperation(const SimulatorInfo &simInfo, SimulatorOperationDialo
}
IosSettingsWidget::IosSettingsWidget()
: m_ui(new Ui::IosSettingsWidget),
m_simControl(new SimulatorControl(this))
: m_ui(new Ui::IosSettingsWidget)
{
m_ui->setupUi(this);
auto proxyModel = new QSortFilterProxyModel(this);
@@ -134,9 +133,9 @@ void IosSettingsWidget::onStart()
.arg(info.name).arg(info.runtimeName).arg(info.state),
Utils::StdErrFormat);
} else {
futureList << QFuture<void>(Utils::onResultReady(m_simControl->startSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog,
tr("simulator start"), _1)));
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::startSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog, tr("simulator start"), _1)));
}
}
@@ -167,12 +166,11 @@ void IosSettingsWidget::onCreate()
CreateSimulatorDialog createDialog(this);
if (createDialog.exec() == QDialog::Accepted) {
QFuture<void> f = QFuture<void>(Utils::onResultReady(
m_simControl->createSimulator(
createDialog.name(),
createDialog.deviceType(),
createDialog.runtime()),
std::bind(onSimulatorCreate, createDialog.name(), _1)));
QFuture<void> f = QFuture<void>(
Utils::onResultReady(SimulatorControl::createSimulator(createDialog.name(),
createDialog.deviceType(),
createDialog.runtime()),
std::bind(onSimulatorCreate, createDialog.name(), _1)));
statusDialog->addFutures({ f });
statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
}
@@ -201,9 +199,9 @@ void IosSettingsWidget::onReset()
QList<QFuture<void>> futureList;
foreach (const SimulatorInfo &info, simulatorInfoList) {
futureList << QFuture<void>(Utils::onResultReady(m_simControl->resetSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog,
tr("simulator reset"), _1)));
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::resetSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog, tr("simulator reset"), _1)));
}
statusDialog->addFutures(futureList);
@@ -229,9 +227,9 @@ void IosSettingsWidget::onRename()
QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
statusDialog->setAttribute(Qt::WA_DeleteOnClose);
statusDialog->addMessage(tr("Renaming simulator device..."), Utils::NormalMessageFormat);
QFuture<void> f = QFuture<void>(Utils::onResultReady(m_simControl->renameSimulator(simInfo.identifier, newName),
std::bind(onSimOperation, simInfo, statusDialog,
tr("simulator rename"), _1)));
QFuture<void> f = QFuture<void>(Utils::onResultReady(
SimulatorControl::renameSimulator(simInfo.identifier, newName),
std::bind(onSimOperation, simInfo, statusDialog, tr("simulator rename"), _1)));
statusDialog->addFutures({f});
statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
}
@@ -258,9 +256,9 @@ void IosSettingsWidget::onDelete()
Utils::NormalMessageFormat);
QList<QFuture<void>> futureList;
foreach (const SimulatorInfo &info, simulatorInfoList) {
futureList << QFuture<void>(Utils::onResultReady(m_simControl->deleteSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog,
tr("simulator delete"), _1)));
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::deleteSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog, tr("simulator delete"), _1)));
}
statusDialog->addFutures(futureList);
@@ -289,10 +287,9 @@ void IosSettingsWidget::onScreenshot()
simulatorInfoList.count()), Utils::NormalMessageFormat);
QList<QFuture<void>> futureList;
foreach (const SimulatorInfo &info, simulatorInfoList) {
futureList << QFuture<void>(Utils::onResultReady(m_simControl->takeSceenshot(info.identifier,
generatePath(info)),
std::bind(onSimOperation, info, statusDialog,
tr("simulator screenshot"), _1)));
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::takeSceenshot(info.identifier, generatePath(info)),
std::bind(onSimOperation, info, statusDialog, tr("simulator screenshot"), _1)));
}
statusDialog->addFutures(futureList);