From 6c7e7a6d55cc8d0307a093d6dbed832708f0954d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 20 Jul 2021 14:45:55 +0200 Subject: [PATCH] [summaryq] a handful of code-style fixes --- src/modules/summaryq/SummaryQmlViewStep.cpp | 6 ++++-- src/modules/summaryq/SummaryQmlViewStep.h | 7 ++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/modules/summaryq/SummaryQmlViewStep.cpp b/src/modules/summaryq/SummaryQmlViewStep.cpp index 2ea159984..0be2b1615 100644 --- a/src/modules/summaryq/SummaryQmlViewStep.cpp +++ b/src/modules/summaryq/SummaryQmlViewStep.cpp @@ -57,15 +57,17 @@ SummaryQmlViewStep::isAtEnd() const } -QList< Calamares::job_ptr > +Calamares::JobList SummaryQmlViewStep::jobs() const { - return QList< Calamares::job_ptr >(); + return {}; } void SummaryQmlViewStep::onActivate() { + // Collect the steps before this one: those need to have their + // summary (text or widget) displayed. m_config->init(); } diff --git a/src/modules/summaryq/SummaryQmlViewStep.h b/src/modules/summaryq/SummaryQmlViewStep.h index 42febd145..8668d0afe 100644 --- a/src/modules/summaryq/SummaryQmlViewStep.h +++ b/src/modules/summaryq/SummaryQmlViewStep.h @@ -12,14 +12,11 @@ #define SUMMARYQMLVIEWSTEP_H #include "Config.h" + #include "DllMacro.h" #include "utils/PluginFactory.h" #include "viewpages/QmlViewStep.h" -#include - -class SummaryPage; - class PLUGINDLLEXPORT SummaryQmlViewStep : public Calamares::QmlViewStep { Q_OBJECT @@ -37,7 +34,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;