From 9a354271135031b577b09937ef0f632365d08450 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 27 Mar 2020 15:14:37 +0100 Subject: [PATCH] [netinstall] Remove unused m_jobs - Netinstall doesn't make any jobs itself, so drop the member variable - Use type alias, and simplify jobs() --- src/modules/netinstall/NetInstallViewStep.cpp | 4 ++-- src/modules/netinstall/NetInstallViewStep.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index 9c8b186de..8515d537a 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/src/modules/netinstall/NetInstallViewStep.cpp @@ -111,10 +111,10 @@ NetInstallViewStep::isAtEnd() const } -QList< Calamares::job_ptr > +Calamares::JobList NetInstallViewStep::jobs() const { - return m_jobs; + return Calamares::JobList(); } diff --git a/src/modules/netinstall/NetInstallViewStep.h b/src/modules/netinstall/NetInstallViewStep.h index ad796b8b2..ffcc785c8 100644 --- a/src/modules/netinstall/NetInstallViewStep.h +++ b/src/modules/netinstall/NetInstallViewStep.h @@ -47,7 +47,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; @@ -63,7 +63,6 @@ private: NetInstallPage* m_widget; bool m_nextEnabled; CalamaresUtils::Locale::TranslatedString* m_sidebarLabel; // As it appears in the sidebar - QList< Calamares::job_ptr > m_jobs; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( NetInstallViewStepFactory )