From 287047fe1ab46cd61ab00302e312e4629ca306cf Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 23:52:12 +0100 Subject: [PATCH] [users] Tidy up job creation -- leave it to Config --- src/modules/users/UsersViewStep.cpp | 5 ++--- src/modules/users/UsersViewStep.h | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp index df823df06..683673459 100644 --- a/src/modules/users/UsersViewStep.cpp +++ b/src/modules/users/UsersViewStep.cpp @@ -88,10 +88,10 @@ UsersViewStep::isAtEnd() const } -QList< Calamares::job_ptr > +Calamares::JobList UsersViewStep::jobs() const { - return m_jobs; + return m_config->createJobs(); } @@ -108,7 +108,6 @@ UsersViewStep::onActivate() void UsersViewStep::onLeave() { - m_jobs = m_config->createJobs(); m_config->finalizeGlobalStorage(); } diff --git a/src/modules/users/UsersViewStep.h b/src/modules/users/UsersViewStep.h index abafc1b23..8d5abe48f 100644 --- a/src/modules/users/UsersViewStep.h +++ b/src/modules/users/UsersViewStep.h @@ -39,7 +39,7 @@ public: bool isAtBeginning() const override; bool isAtEnd() const override; - QList< Calamares::job_ptr > jobs() const override; + Calamares::JobList jobs() const override; void onActivate() override; void onLeave() override; @@ -48,8 +48,6 @@ public: private: UsersPage* m_widget; - Calamares::JobList m_jobs; - Config* m_config; };