From d91f00f334a5506d426c4d2b9347698a014df6ad Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 9 Sep 2015 18:45:52 +0200 Subject: [PATCH] PluginFactory in Finished module. --- src/modules/finished/FinishedViewStep.cpp | 3 ++- src/modules/finished/FinishedViewStep.h | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index a5a77919b..640e7402f 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -40,7 +40,7 @@ FinishedViewStep::~FinishedViewStep() QString FinishedViewStep::prettyName() const { - return tr( "All done" ); + return tr( "Finish" ); } @@ -129,3 +129,4 @@ FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } } +CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin(); ) diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index ba1f887d8..30151dffb 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -21,17 +21,16 @@ #include -#include "viewpages/ViewStep.h" -#include "PluginDllMacro.h" +#include +#include + +#include class FinishedPage; class PLUGINDLLEXPORT FinishedViewStep : public Calamares::ViewStep { Q_OBJECT - Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" ) - - Q_INTERFACES( Calamares::ViewStep ) public: explicit FinishedViewStep( QObject* parent = nullptr ); @@ -60,4 +59,6 @@ private: FinishedPage* m_widget; }; +CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedViewStepFactory ) + #endif // FINISHEDPAGEPLUGIN_H