diff options
Diffstat (limited to 'src/sdk/tabcontroller.cpp')
-rw-r--r-- | src/sdk/tabcontroller.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp index 32accb50f..1ebdbdbeb 100644 --- a/src/sdk/tabcontroller.cpp +++ b/src/sdk/tabcontroller.cpp @@ -89,7 +89,7 @@ TabController::~TabController() void TabController::setGui(QInstaller::PackageManagerGui *gui) { d->m_gui = gui; - connect(d->m_gui, SIGNAL(gotRestarted()), this, SLOT(restartWizard())); + connect(d->m_gui, &PackageManagerGui::gotRestarted, this, &TabController::restartWizard); } void TabController::setControlScript(const QString &script) @@ -119,8 +119,9 @@ int TabController::init() qDebug() << "Using control script:" << d->m_controlScript; } - connect(d->m_gui, SIGNAL(currentIdChanged(int)), this, SLOT(onCurrentIdChanged(int))); - connect(d->m_gui, SIGNAL(settingsButtonClicked()), this, SLOT(onSettingsButtonClicked())); + connect(d->m_gui, &QWizard::currentIdChanged, this, &TabController::onCurrentIdChanged); + connect(d->m_gui, &PackageManagerGui::settingsButtonClicked, + this, &TabController::onSettingsButtonClicked); } IntroductionPage *page = @@ -132,7 +133,7 @@ int TabController::init() } d->m_gui->restart(); - d->m_gui->show(); + d->m_gui->setVisible(!d->m_gui->isSilent()); onCurrentIdChanged(d->m_gui->currentId()); return PackageManagerCore::Success; @@ -163,14 +164,14 @@ void TabController::restartWizard() d->m_core->writeMaintenanceTool(); // restart and switch back to intro page - QTimer::singleShot(0, this, SLOT(init())); + QTimer::singleShot(0, this, &TabController::init); } void TabController::onSettingsButtonClicked() { SettingsDialog dialog(d->m_core); - connect (&dialog, SIGNAL(networkSettingsChanged(QInstaller::Settings)), this, - SLOT(onNetworkSettingsChanged(QInstaller::Settings))); + connect(&dialog, &SettingsDialog::networkSettingsChanged, + this, &TabController::onNetworkSettingsChanged); dialog.exec(); if (d->m_networkSettingsChanged) { @@ -198,3 +199,8 @@ void TabController::onNetworkSettingsChanged(const QInstaller::Settings &setting d->m_settings = settings; d->m_networkSettingsChanged = true; } + +void TabController::updateManagerParams(const QString &key, const QString &value) +{ + d->m_params.insert(key, value); +} |