summaryrefslogtreecommitdiffstats
path: root/src/sdk
diff options
context:
space:
mode:
Diffstat (limited to 'src/sdk')
-rw-r--r--src/sdk/installerbase.cpp12
-rw-r--r--src/sdk/tabcontroller.cpp12
-rw-r--r--src/sdk/tabcontroller.h2
3 files changed, 3 insertions, 23 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 5d5028be1..872600f19 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -243,13 +243,11 @@ int InstallerBase::run()
.isSet(QLatin1String(CommandLineOptions::CreateLocalRepository))
|| m_core->settings().createLocalRepository());
- QHash<QString, QString> params;
const QStringList positionalArguments = parser.positionalArguments();
foreach (const QString &argument, positionalArguments) {
if (argument.contains(QLatin1Char('='))) {
const QString name = argument.section(QLatin1Char('='), 0, 0);
const QString value = argument.section(QLatin1Char('='), 1, 1);
- params.insert(name, value);
m_core->setValue(name, value);
}
}
@@ -308,17 +306,11 @@ int InstallerBase::run()
//create the wizard GUI
TabController controller(0);
controller.setManager(m_core);
- controller.setManagerParams(params);
controller.setControlScript(controlScript);
- if (m_core->isInstaller()) {
+ if (m_core->isInstaller())
controller.setGui(new InstallerGui(m_core));
- }
- else {
+ else
controller.setGui(new MaintenanceGui(m_core));
- //Start listening to setValue changes that newly installed components might have
- connect(m_core, &QInstaller::PackageManagerCore::valueChanged, &controller,
- &TabController::updateManagerParams);
- }
QInstaller::PackageManagerCore::Status status =
QInstaller::PackageManagerCore::Status(controller.init());
diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp
index 760e7dc38..dc4549d50 100644
--- a/src/sdk/tabcontroller.cpp
+++ b/src/sdk/tabcontroller.cpp
@@ -102,11 +102,6 @@ void TabController::setManager(QInstaller::PackageManagerCore *core)
d->m_core = core;
}
-void TabController::setManagerParams(const QHash<QString, QString> &params)
-{
- d->m_params = params;
-}
-
// -- public slots
int TabController::init()
@@ -143,8 +138,8 @@ int TabController::init()
void TabController::restartWizard()
{
+ d->m_core->reset();
if (d->m_networkSettingsChanged) {
- d->m_core->reset(d->m_params);
d->m_networkSettingsChanged = false;
d->m_core->settings().setFtpProxy(d->m_settings.ftpProxy());
@@ -199,8 +194,3 @@ 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);
-}
diff --git a/src/sdk/tabcontroller.h b/src/sdk/tabcontroller.h
index a314cb15b..5fc63aff3 100644
--- a/src/sdk/tabcontroller.h
+++ b/src/sdk/tabcontroller.h
@@ -51,13 +51,11 @@ public:
void setGui(QInstaller::PackageManagerGui *gui);
void setManager(QInstaller::PackageManagerCore *core);
- void setManagerParams(const QHash<QString, QString> &params);
void setControlScript(const QString &script);
public Q_SLOTS:
int init();
- void updateManagerParams(const QString &key, const QString &value);
private Q_SLOTS:
void restartWizard();