From 461ef791707c4f878c36924b3139ce633124d699 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 9 Sep 2015 19:03:10 +0200 Subject: [PATCH] ViewStep should know their own instance keys. --- src/libcalamaresui/viewpages/ViewStep.cpp | 7 +++++++ src/libcalamaresui/viewpages/ViewStep.h | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/libcalamaresui/viewpages/ViewStep.cpp b/src/libcalamaresui/viewpages/ViewStep.cpp index 2629560d4..6d5a5f746 100644 --- a/src/libcalamaresui/viewpages/ViewStep.cpp +++ b/src/libcalamaresui/viewpages/ViewStep.cpp @@ -52,6 +52,13 @@ ViewStep::onLeave() {} +void +ViewStep::setModuleInstanceKey( const QString& instanceKey ) +{ + m_instanceKey = instanceKey; +} + + void ViewStep::setConfigurationMap( const QVariantMap& configurationMap ) {} diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h index 1de6d037c..c9dadb18d 100644 --- a/src/libcalamaresui/viewpages/ViewStep.h +++ b/src/libcalamaresui/viewpages/ViewStep.h @@ -69,17 +69,21 @@ public: */ virtual void onLeave(); - virtual QList< Calamares::job_ptr > jobs() const = 0; + virtual QList< job_ptr > jobs() const = 0; + + void setModuleInstanceKey( const QString& instanceKey ); + QString moduleInstanceKey() const { return m_instanceKey; } virtual void setConfigurationMap( const QVariantMap& configurationMap ); signals: void nextStatusChanged( bool status ); void done(); + +protected: + QString m_instanceKey; }; } -Q_DECLARE_INTERFACE( Calamares::ViewStep, "calamares.ViewModule/1.0" ) - #endif // VIEWSTEP_H