From b98c071f94574094eb392914c4c3b20725d7144d Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 8 Jul 2014 14:02:21 +0200 Subject: [PATCH] Prepare for late enqueuing of jobs to the JobQueue. --- src/libcalamaresui/viewpages/ViewStep.h | 3 +++ src/modules/greeting/GreetingViewStep.cpp | 7 +++++++ src/modules/greeting/GreetingViewStep.h | 2 ++ src/modules/keyboard/KeyboardViewStep.cpp | 7 +++++++ src/modules/keyboard/KeyboardViewStep.h | 2 ++ src/modules/locale/LocaleViewStep.cpp | 7 +++++++ src/modules/locale/LocaleViewStep.h | 2 ++ src/modules/partition/PartitionViewStep.cpp | 7 +++++++ src/modules/partition/PartitionViewStep.h | 2 ++ 9 files changed, 39 insertions(+) diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h index 5382c0d5e..0b464a51a 100644 --- a/src/libcalamaresui/viewpages/ViewStep.h +++ b/src/libcalamaresui/viewpages/ViewStep.h @@ -22,6 +22,7 @@ #include #include "../UiDllMacro.h" +#include "Typedefs.h" namespace Calamares { @@ -46,6 +47,8 @@ public: virtual bool isAtBeginning() const = 0; virtual bool isAtEnd() const = 0; + virtual QList< Calamares::job_ptr > jobs() const = 0; + signals: void nextStatusChanged( bool status ); void done(); diff --git a/src/modules/greeting/GreetingViewStep.cpp b/src/modules/greeting/GreetingViewStep.cpp index bc1f5a16d..58961b6f6 100644 --- a/src/modules/greeting/GreetingViewStep.cpp +++ b/src/modules/greeting/GreetingViewStep.cpp @@ -81,3 +81,10 @@ GreetingViewStep::isAtEnd() const return true; } + +QList< Calamares::job_ptr > +GreetingViewStep::jobs() const +{ + return QList< Calamares::job_ptr >(); +} + diff --git a/src/modules/greeting/GreetingViewStep.h b/src/modules/greeting/GreetingViewStep.h index ef2c5adad..bde4077b8 100644 --- a/src/modules/greeting/GreetingViewStep.h +++ b/src/modules/greeting/GreetingViewStep.h @@ -49,6 +49,8 @@ public: bool isAtBeginning() const override; bool isAtEnd() const override; + QList< Calamares::job_ptr > jobs() const override; + private: GreetingPage* m_widget; }; diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp index 677eb90a0..808c82208 100644 --- a/src/modules/keyboard/KeyboardViewStep.cpp +++ b/src/modules/keyboard/KeyboardViewStep.cpp @@ -85,3 +85,10 @@ KeyboardViewStep::isAtEnd() const { return true; } + + +QList< Calamares::job_ptr > +KeyboardViewStep::jobs() const +{ + return QList< Calamares::job_ptr >(); +} diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h index 7d0452360..3c9b57b36 100644 --- a/src/modules/keyboard/KeyboardViewStep.h +++ b/src/modules/keyboard/KeyboardViewStep.h @@ -49,6 +49,8 @@ public: bool isAtBeginning() const override; bool isAtEnd() const override; + QList< Calamares::job_ptr > jobs() const override; + private: KeyboardPage* m_widget; bool m_nextEnabled; diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp index efc1d47ec..62500d459 100644 --- a/src/modules/locale/LocaleViewStep.cpp +++ b/src/modules/locale/LocaleViewStep.cpp @@ -142,3 +142,10 @@ LocaleViewStep::isAtEnd() const { return true; } + + +QList< Calamares::job_ptr > +LocaleViewStep::jobs() const +{ + return QList< Calamares::job_ptr >(); +} diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h index 02d7cf7a7..93f79343d 100644 --- a/src/modules/locale/LocaleViewStep.h +++ b/src/modules/locale/LocaleViewStep.h @@ -51,6 +51,8 @@ public: bool isAtBeginning() const override; bool isAtEnd() const override; + QList< Calamares::job_ptr > jobs() const override; + private: QWidget* m_widget; QFutureWatcher< void > m_initWatcher; diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index 744bc99f1..4f3f6df0f 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -78,3 +78,10 @@ PartitionViewStep::isAtEnd() const { return true; } + + +QList< Calamares::job_ptr > +PartitionViewStep::jobs() const +{ + return QList< Calamares::job_ptr >(); +} diff --git a/src/modules/partition/PartitionViewStep.h b/src/modules/partition/PartitionViewStep.h index c2dd7af36..6a3055564 100644 --- a/src/modules/partition/PartitionViewStep.h +++ b/src/modules/partition/PartitionViewStep.h @@ -48,6 +48,8 @@ public: bool isAtBeginning() const override; bool isAtEnd() const override; + QList< Calamares::job_ptr > jobs() const override; + private: PartitionCoreModule* m_core; PartitionPage* m_widget;