From 316909303cf0c94d068fb4b1eaaf5b82c46c35c8 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 9 Sep 2015 18:51:51 +0200 Subject: [PATCH] PluginFactory in Summary module. --- src/modules/summary/SummaryViewStep.cpp | 4 +++- src/modules/summary/SummaryViewStep.h | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/modules/summary/SummaryViewStep.cpp b/src/modules/summary/SummaryViewStep.cpp index 10528bd28..da4aa1cb6 100644 --- a/src/modules/summary/SummaryViewStep.cpp +++ b/src/modules/summary/SummaryViewStep.cpp @@ -20,9 +20,11 @@ #include "SummaryPage.h" +CALAMARES_PLUGIN_FACTORY_DEFINITION( SummaryViewStepFactory, registerPlugin(); ) + SummaryViewStep::SummaryViewStep( QObject* parent ) : Calamares::ViewStep( parent ) - , m_widget( new SummaryPage() ) + , m_widget( new SummaryPage( this ) ) { emit nextStatusChanged( true ); } diff --git a/src/modules/summary/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h index 4c7590bfa..144541c69 100644 --- a/src/modules/summary/SummaryViewStep.h +++ b/src/modules/summary/SummaryViewStep.h @@ -21,17 +21,16 @@ #include -#include "viewpages/ViewStep.h" -#include "PluginDllMacro.h" +#include +#include + +#include class SummaryPage; class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep { Q_OBJECT - Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" ) - - Q_INTERFACES( Calamares::ViewStep ) public: explicit SummaryViewStep( QObject* parent = nullptr ); @@ -58,4 +57,6 @@ private: SummaryPage* m_widget; }; +CALAMARES_PLUGIN_FACTORY_DECLARATION( SummaryViewStepFactory ) + #endif // SUMMARYPAGEPLUGIN_H